- 优化 ToList<Dto> jsonb 映射；

Examples/base_entity/Program.cs

@@ -130,6 +130,27 @@ namespace base_entity
             public string ShippingAddress { get; set; }
         }
 
+        [Table(Name = "tb_TopicMapTypeToListDto")]
+        class TopicMapTypeToListDto
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+            [Column(MapType = typeof(JArray))]
+            public List<int> CouponIds { get; set; }
+        }
+        class TopicMapTypeToListDtoMap
+        {
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+            public List<int> CouponIds { get; set; }
+        }
+
         static void Main(string[] args)
         {
             #region 初始化 IFreeSql
@@ -144,9 +165,9 @@ namespace base_entity
 
                 //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=2")
 
-                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
+                //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
 
-                //.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
+                .UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
                 //.UseNameConvert(FreeSql.Internal.NameConvertType.ToLower)
 
                 //.UseConnectionString(FreeSql.DataType.Oracle, "user id=user1;password=123456;data source=//127.0.0.1:1521/XE;Pooling=true;Max Pool Size=2")
@@ -172,75 +193,114 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
-//            fsql.Aop.ParseExpression += (_, e) =>
+            //fsql.UseJsonMap();
-//            {
-//                //解析 POCO Jsonb   a.Customer.Name
-//                if (e.Expression is MemberExpression memExp)
-//                {
-//                    var parentMemExps = new Stack<MemberExpression>();
-//                    parentMemExps.Push(memExp);
-//                    while (true)
-//                    {
-//                        switch (memExp.Expression.NodeType)
-//                        {
-//                            case ExpressionType.MemberAccess:
-//                                memExp = memExp.Expression as MemberExpression;
-//                                if (memExp == null) return;
-//                                parentMemExps.Push(memExp);
-//                                break;
-//                            case ExpressionType.Parameter:
-//                                var tb = fsql.CodeFirst.GetTableByEntity(memExp.Expression.Type);
-//                                if (tb == null) return;
-//                                if (tb.ColumnsByCs.TryGetValue(parentMemExps.Pop().Member.Name, out var trycol) == false) return;
-//                                if (new[] { typeof(JToken), typeof(JObject), typeof(JArray) }.Contains(trycol.Attribute.MapType.NullableTypeOrThis()) == false) return;
-//                                var tmpcol = tb.ColumnsByPosition.OrderBy(a => a.Attribute.Name.Length).First();
-//                                var result = e.FreeParse(Expression.MakeMemberAccess(memExp.Expression, tb.Properties[tmpcol.CsName]));
-//                                result = result.Replace(tmpcol.Attribute.Name, trycol.Attribute.Name);
-//                                while (parentMemExps.Any())
-//                                {
-//                                    memExp = parentMemExps.Pop();
-//                                    result = $"{result}->>'{memExp.Member.Name}'";
-//                                }
-//                                e.Result = result;
-//                                return;
-//                        }
-//                    }
-//                }
-//            };
 
-//            var methodJsonConvertDeserializeObject = typeof(JsonConvert).GetMethod("DeserializeObject", new[] { typeof(string), typeof(Type) });
+            fsql.Delete<TopicMapTypeToListDto>().Where("1=1").ExecuteAffrows();
-//            var methodJsonConvertSerializeObject = typeof(JsonConvert).GetMethod("SerializeObject", new[] { typeof(object), typeof(JsonSerializerSettings) });
+            fsql.Insert(new[]
-//            var jsonConvertSettings = JsonConvert.DefaultSettings?.Invoke() ?? new JsonSerializerSettings();
+            {
-//            FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple[typeof(Customer)] = true;
+                new TopicMapTypeToListDto{
-//            FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionObjectToStringIfThenElse.Add((LabelTarget returnTarget, Expression valueExp, Expression elseExp, Type type) =>
+                    Clicks = 100,
-//            {
+                    Title = "testMapTypeTitle1",
-//                return Expression.IfThenElse(
+                    CouponIds = new List<int> { 1, 2, 3, 4 }
-//                    Expression.TypeIs(valueExp, typeof(Customer)),
+                },
-//                    Expression.Return(returnTarget, Expression.Call(methodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object)), Expression.Constant(jsonConvertSettings)), typeof(object)),
+                new TopicMapTypeToListDto{
-//                    elseExp);
+                    Clicks = 101,
-//            });
+                    Title = "testMapTypeTitle2",
-//            FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionSwitchTypeFullName.Add((LabelTarget returnTarget, Expression valueExp, Type type) =>
+                    CouponIds = new List<int> { 1, 2, 3, 1 }
-//            {
+                },
-//                if (type == typeof(Customer)) return Expression.Return(returnTarget, Expression.TypeAs(Expression.Call(methodJsonConvertDeserializeObject, Expression.Convert(valueExp, typeof(string)), Expression.Constant(type)), type));
+                new TopicMapTypeToListDto{
-//                return null;
+                    Clicks = 102,
-//            });
+                    Title = "testMapTypeTitle3",
+                    CouponIds = new List<int> { 1 }
+                },
+                new TopicMapTypeToListDto{
+                    Clicks = 103,
+                    Title = "testMapTypeTitle4",
+                    CouponIds = new List<int>()
+                },
+                new TopicMapTypeToListDto{
+                    Clicks = 103,
+                    Title = "testMapTypeTitle5",
+                },
+            }).ExecuteAffrows();
+            var dtomaplist2 = fsql.Select<TopicMapTypeToListDto>().ToList<TopicMapTypeToListDtoMap>();
+            var dtomaplist0 = fsql.Select<TopicMapTypeToListDto>().ToList();
+            var dtomaplist1 = fsql.Select<TopicMapTypeToListDto>().ToList(a => new TopicMapTypeToListDtoMap
+            {
+                CouponIds = a.CouponIds
+            });
 
-//            var seid = fsql.Insert(new SomeEntity
+            #region pgsql poco
-//            {
+            //            fsql.Aop.ParseExpression += (_, e) =>
-//                Customer = JsonConvert.DeserializeObject<Customer>(@"{
+            //            {
-//    ""Age"": 25,
+            //                //解析 POCO Jsonb   a.Customer.Name
-//    ""Name"": ""Joe"",
+            //                if (e.Expression is MemberExpression memExp)
-//    ""Orders"": [
+            //                {
-//        { ""OrderPrice"": 9, ""ShippingAddress"": ""Some address 1"" },
+            //                    var parentMemExps = new Stack<MemberExpression>();
-//        { ""OrderPrice"": 23, ""ShippingAddress"": ""Some address 2"" }
+            //                    parentMemExps.Push(memExp);
-//    ]
+            //                    while (true)
-//}")
+            //                    {
-//            }).ExecuteIdentity();
+            //                        switch (memExp.Expression.NodeType)
-//            var selist = fsql.Select<SomeEntity>().ToList();
+            //                        {
+            //                            case ExpressionType.MemberAccess:
+            //                                memExp = memExp.Expression as MemberExpression;
+            //                                if (memExp == null) return;
+            //                                parentMemExps.Push(memExp);
+            //                                break;
+            //                            case ExpressionType.Parameter:
+            //                                var tb = fsql.CodeFirst.GetTableByEntity(memExp.Expression.Type);
+            //                                if (tb == null) return;
+            //                                if (tb.ColumnsByCs.TryGetValue(parentMemExps.Pop().Member.Name, out var trycol) == false) return;
+            //                                if (new[] { typeof(JToken), typeof(JObject), typeof(JArray) }.Contains(trycol.Attribute.MapType.NullableTypeOrThis()) == false) return;
+            //                                var tmpcol = tb.ColumnsByPosition.OrderBy(a => a.Attribute.Name.Length).First();
+            //                                var result = e.FreeParse(Expression.MakeMemberAccess(memExp.Expression, tb.Properties[tmpcol.CsName]));
+            //                                result = result.Replace(tmpcol.Attribute.Name, trycol.Attribute.Name);
+            //                                while (parentMemExps.Any())
+            //                                {
+            //                                    memExp = parentMemExps.Pop();
+            //                                    result = $"{result}->>'{memExp.Member.Name}'";
+            //                                }
+            //                                e.Result = result;
+            //                                return;
+            //                        }
+            //                    }
+            //                }
+            //            };
 
-//            var joes = fsql.Select<SomeEntity>()
+            //            var methodJsonConvertDeserializeObject = typeof(JsonConvert).GetMethod("DeserializeObject", new[] { typeof(string), typeof(Type) });
-//                .Where(e => e.Customer.Name == "Joe")
+            //            var methodJsonConvertSerializeObject = typeof(JsonConvert).GetMethod("SerializeObject", new[] { typeof(object), typeof(JsonSerializerSettings) });
-//                .ToSql();
+            //            var jsonConvertSettings = JsonConvert.DefaultSettings?.Invoke() ?? new JsonSerializerSettings();
+            //            FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple[typeof(Customer)] = true;
+            //            FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionObjectToStringIfThenElse.Add((LabelTarget returnTarget, Expression valueExp, Expression elseExp, Type type) =>
+            //            {
+            //                return Expression.IfThenElse(
+            //                    Expression.TypeIs(valueExp, typeof(Customer)),
+            //                    Expression.Return(returnTarget, Expression.Call(methodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object)), Expression.Constant(jsonConvertSettings)), typeof(object)),
+            //                    elseExp);
+            //            });
+            //            FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionSwitchTypeFullName.Add((LabelTarget returnTarget, Expression valueExp, Type type) =>
+            //            {
+            //                if (type == typeof(Customer)) return Expression.Return(returnTarget, Expression.TypeAs(Expression.Call(methodJsonConvertDeserializeObject, Expression.Convert(valueExp, typeof(string)), Expression.Constant(type)), type));
+            //                return null;
+            //            });
+
+            //            var seid = fsql.Insert(new SomeEntity
+            //            {
+            //                Customer = JsonConvert.DeserializeObject<Customer>(@"{
+            //    ""Age"": 25,
+            //    ""Name"": ""Joe"",
+            //    ""Orders"": [
+            //        { ""OrderPrice"": 9, ""ShippingAddress"": ""Some address 1"" },
+            //        { ""OrderPrice"": 23, ""ShippingAddress"": ""Some address 2"" }
+            //    ]
+            //}")
+            //            }).ExecuteIdentity();
+            //            var selist = fsql.Select<SomeEntity>().ToList();
+
+            //            var joes = fsql.Select<SomeEntity>()
+            //                .Where(e => e.Customer.Name == "Joe")
+            //                .ToSql();
+            #endregion
 
             var testitems = new[]
             {

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -538,5 +538,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>

FreeSql/FreeSql.xml

@@ -3249,177 +3249,6 @@
             <param name="parms"></param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.IAdo.ExecuteConnectTestAsync(System.Int32,System.Threading.CancellationToken)">
-            <summary>
-            测试数据库是否连接正确，本方法执行如下命令：<para></para>
-            MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
-            Oracle: SELECT 1 FROM dual<para></para>
-            </summary>
-            <param name="commandTimeout">命令超时设置(秒)</param>
-            <param name="cancellationToken"></param>
-            <returns>true: 成功, false: 失败</returns>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
-            </summary>
-            <param name="readerHander"></param>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="readerHander"></param>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            查询
-            </summary>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            查询
-            </summary>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            查询
-            </summary>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            在【主库】执行
-            </summary>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            在【主库】执行
-            </summary>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-        </member>
-        <member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
-            <summary>
-            执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <typeparam name="T2"></typeparam>
-            <param name="cmdType"></param>
-            <param name="cmdText"></param>
-            <param name="cmdParms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object,System.Threading.CancellationToken)">
-            <summary>
-            执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > @age; select * from address", new { age = 25 })<para></para>
-            提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <typeparam name="T2"></typeparam>
-            <param name="cmdText"></param>
-            <param name="parms"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-        </member>
         <member name="E:FreeSql.IAop.ParseExpression">
             <summary>
             可自定义解析表达式
@@ -4314,12 +4143,6 @@
             <param name="timeout">超时</param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
-            <summary>
-            获取资源
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
             <summary>
             使用完毕后，归还资源
@@ -4395,12 +4218,6 @@
             </summary>
             <param name="obj">资源对象</param>
         </member>
-        <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
-            <summary>
-            从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
-            </summary>
-            <param name="obj">资源对象</param>
-        </member>
         <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
             <summary>
             归还对象给对象池的时候触发

FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs

@@ -218,6 +218,7 @@ namespace FreeSql.Internal.CommonProvider
         /// <returns></returns>
         public NativeTuple<List<T1>[], List<T1>[]> SplitSourceByIdentityValueIsNull(List<T1> source)
         {
+            if (source.Any() == false) return NativeTuple.Create(new List<T1>[0], new List<T1>[0]);
             if (_SplitSourceByIdentityValueIsNullFlag == 1) return NativeTuple.Create(new[] { source }, new List<T1>[0]);
             if (_SplitSourceByIdentityValueIsNullFlag == 2) return NativeTuple.Create(new List<T1>[0], new[] { source });
             if (IdentityColumn == null) return NativeTuple.Create(LocalSplitSourceByAsTable(source), new List<T1>[0]);
@@ -234,6 +235,7 @@ namespace FreeSql.Internal.CommonProvider
 
             List<T1>[] LocalSplitSourceByAsTable(List<T1> loc1)
             {
+                if (loc1.Any() == false) return new List<T1>[0];
                 if (_table.AsTableImpl != null)
                 {
                     var atarr = loc1.Select(a => new

FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs

@@ -255,12 +255,16 @@ namespace FreeSql.Internal.CommonProvider
             }
             return ret;
         }
-        public List<TDto> ToList<TDto>() => ToList(GetToListDtoSelector<TDto>());
+        public List<TDto> ToList<TDto>() => typeof(T1) == typeof(TDto) ? ToList() as List<TDto> : ToList(GetToListDtoSelector<TDto>());
         Expression<Func<T1, TDto>> GetToListDtoSelector<TDto>()
         {
+            var expParam = _tables[0].Parameter ?? Expression.Parameter(typeof(T1), "a");
+            var expBinds = _tables[0].Table.Columns.Where(a => a.Value.CsType != a.Value.Attribute.MapType)
+                .Select(a => Expression.Bind(typeof(TDto).GetProperty(a.Value.CsName), Expression.MakeMemberAccess(expParam, _tables[0].Table.Properties[a.Value.CsName])))
+                .ToArray();
             return Expression.Lambda<Func<T1, TDto>>(
-                typeof(TDto).InternalNewExpression(),
+                Expression.MemberInit(typeof(TDto).InternalNewExpression(), expBinds),
-                _tables[0].Parameter ?? Expression.Parameter(typeof(T1), "a"));
+                expParam);
         }
         public void ToChunk<TReturn>(Expression<Func<T1, TReturn>> select, int size, Action<FetchCallbackArgs<List<TReturn>>> done)
         {
@@ -1284,7 +1288,7 @@ namespace FreeSql.Internal.CommonProvider
             }
             return ret;
         }
-        public Task<List<TDto>> ToListAsync<TDto>(CancellationToken cancellationToken = default) => ToListAsync(GetToListDtoSelector<TDto>(), cancellationToken);
+        async public Task<List<TDto>> ToListAsync<TDto>(CancellationToken cancellationToken = default) => typeof(T1) == typeof(TDto) ? await ToListAsync(false, cancellationToken) as List<TDto> : await ToListAsync(GetToListDtoSelector<TDto>(), cancellationToken);
 
         public Task<int> InsertIntoAsync<TTargetEntity>(string tableName, Expression<Func<T1, TTargetEntity>> select, CancellationToken cancellationToken = default) where TTargetEntity : class => base.InternalInsertIntoAsync<TTargetEntity>(tableName, select, cancellationToken);