Merge branch 'master' into daily

Directory.Build.props

@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 	</PropertyGroup>
 	-->
 	

Examples/base_entity/ModAsTableImpl.cs

@@ -42,4 +42,9 @@ class ModAsTableImpl : IAsTable
         if (tables.Any() == false) return AllTables;
         return tables;
     }
+
+	public IAsTable SetTableName(int index, string tableName)
+	{
+		throw new NotImplementedException();
+	}
 }

Examples/base_entity/Program.cs

@@ -109,7 +109,7 @@ namespace base_entity
             public B B { get; set; }
         }
 
-        [Table(Name = "as_table_log_{yyyyMMddHH}", AsTable = "createtime=2022-1-1 11(1 month)")]
+        [Table(Name = "as_table_log_{yyyyMMddHH}", AsTable = "createtime=2022-1-1 11(12,1 month)")]
         class AsTableLog
         {
             public Guid id { get; set; }
@@ -561,8 +561,8 @@ 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;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
 
-                //.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")
-
+                .UseAdoConnectionPool(false)
                 //.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=toc;Pooling=true;Maximum Pool Size=2")
                 //.UseNameConvert(FreeSql.Internal.NameConvertType.ToLower)
@@ -600,6 +600,124 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
 			#endregion
 
+			fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Now && a.createtime < DateTime.Now.AddMonths(1)).ToList();
+            //var table = fsql.CodeFirst.GetTableByEntity(typeof(AsTableLog));
+            //table.SetAsTable(new ModAsTableImpl(fsql), table.ColumnsByCs[nameof(AsTableLog.click)]);
+
+            fsql.CodeFirst.GetTableByEntity(typeof(AsTableLog)).AsTableImpl
+                .SetTableName(0, "AsTableLog1")
+                .SetTableName(1, "AsTableLog2");
+
+			var testitems = new[]
+			{
+				new AsTableLog{ msg = "msg01", createtime = DateTime.Parse("2022-1-1 13:00:11"), click = 1 },
+				new AsTableLog{ msg = "msg02", createtime = DateTime.Parse("2022-1-2 14:00:12"), click = 2 },
+				new AsTableLog{ msg = "msg03", createtime = DateTime.Parse("2022-2-2 15:00:13"), click = 3 },
+				new AsTableLog{ msg = "msg04", createtime = DateTime.Parse("2022-2-8 15:00:13"), click = 4 },
+				new AsTableLog{ msg = "msg05", createtime = DateTime.Parse("2022-3-8 15:00:13"), click = 5 },
+				new AsTableLog{ msg = "msg06", createtime = DateTime.Parse("2022-4-8 15:00:13"), click = 6 },
+				new AsTableLog{ msg = "msg07", createtime = DateTime.Parse("2022-6-8 15:00:13"), click = 7 },
+				new AsTableLog{ msg = "msg08", createtime = DateTime.Parse("2022-7-1"), click = 9},
+				new AsTableLog{ msg = "msg09", createtime = DateTime.Parse("2022-7-1 11:00:00"), click = 10},
+				new AsTableLog{ msg = "msg10", createtime = DateTime.Parse("2022-7-1 12:00:00"), click = 10}
+			};
+			var sqlatb = fsql.Insert(testitems).NoneParameter();
+			var sqlat = sqlatb.ToSql();
+			var sqlatr = sqlatb.ExecuteAffrows();
+
+			//var sqlatc1 = fsql.Delete<AsTableLog>().Where(a => a.click < 0);
+			//var sqlatca1 = sqlatc1.ToSql();
+			//var sqlatcr1 = sqlatc1.ExecuteAffrows();
+
+			var sqlatc1 = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime == DateTime.Parse("2022-3-8 15:00:13"));
+			var sqlatca1 = sqlatc1.ToSql();
+			var sqlatcr1 = sqlatc1.ExecuteAffrows();
+
+			var sqlatc2 = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime == DateTime.Parse("2021-3-8 15:00:13"));
+			var sqlatca2 = sqlatc2.ToSql();
+			var sqlatcr2 = sqlatc2.ExecuteAffrows();
+
+			var sqlatc = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
+			var sqlatca = sqlatc.ToSql();
+			var sqlatcr = sqlatc.ExecuteAffrows();
+
+			var sqlatd1 = fsql.Update<AsTableLog>().SetSource(testitems[0]);
+			var sqlatd101 = sqlatd1.ToSql();
+			var sqlatd102 = sqlatd1.ExecuteAffrows();
+
+			var sqlatd2 = fsql.Update<AsTableLog>().SetSource(testitems[5]);
+			var sqlatd201 = sqlatd2.ToSql();
+			var sqlatd202 = sqlatd2.ExecuteAffrows();
+
+			var sqlatd3 = fsql.Update<AsTableLog>().SetSource(testitems);
+			var sqlatd301 = sqlatd3.ToSql();
+			var sqlatd302 = sqlatd3.ExecuteAffrows();
+
+			var sqlatd4 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg");
+			var sqlatd401 = sqlatd4.ToSql();
+			var sqlatd402 = sqlatd4.ExecuteAffrows();
+
+			var sqlatd5 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
+			var sqlatd501 = sqlatd5.ToSql();
+			var sqlatd502 = sqlatd5.ExecuteAffrows();
+
+			var sqlatd6 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1") && a.createtime < DateTime.Parse("2022-5-1"));
+			var sqlatd601 = sqlatd6.ToSql();
+			var sqlatd602 = sqlatd6.ExecuteAffrows();
+
+			var sqlatd7 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1"));
+			var sqlatd701 = sqlatd7.ToSql();
+			var sqlatd702 = sqlatd7.ExecuteAffrows();
+
+			var sqlatd8 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime < DateTime.Parse("2022-5-1"));
+			var sqlatd801 = sqlatd8.ToSql();
+			var sqlatd802 = sqlatd8.ExecuteAffrows();
+
+			var sqlatd12 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems[0]);
+			var sqlatd1201 = sqlatd12.ToSql();
+			var sqlatd1202 = sqlatd12.ExecuteAffrows();
+
+			var sqlatd22 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems[5]);
+			var sqlatd2201 = sqlatd22.ToSql();
+			var sqlatd2202 = sqlatd22.ExecuteAffrows();
+
+			var sqlatd32 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems);
+			var sqlatd3201 = sqlatd32.ToSql();
+			var sqlatd3202 = sqlatd32.ExecuteAffrows();
+
+			var sqls1 = fsql.Select<AsTableLog>().OrderBy(a => a.createtime).Limit(10);
+			var sqls101 = sqls1.ToSql();
+			var sqls102 = sqls1.ToList();
+
+			var sqls2 = fsql.Select<AsTableLog>().Where(a => a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
+			var sqls201 = sqls2.ToSql();
+			var sqls202 = sqls2.ToList();
+
+			var sqls3 = fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Parse("2022-3-1") && a.createtime < DateTime.Parse("2022-5-1"));
+			var sqls301 = sqls3.ToSql();
+			var sqls302 = sqls3.ToList();
+
+			var sqls4 = fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Parse("2022-3-1"));
+			var sqls401 = sqls4.ToSql();
+			var sqls402 = sqls4.ToList();
+
+			var sqls5 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1"));
+			var sqls501 = sqls5.ToSql();
+			var sqls502 = sqls5.ToList();
+
+			var sqls6 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1")).Limit(10).OrderBy(a => a.createtime);
+			var sqls601 = sqls6.ToSql();
+			var sqls602 = sqls6.ToList();
+
+			var sqls7 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1")).ToAggregate(g => new
+			{
+				sum1 = g.Sum(g.Key.click),
+				cou1 = g.Count(),
+				avg1 = g.Avg(g.Key.click),
+				min = g.Min(g.Key.click),
+				max = g.Max(g.Key.click)
+			});
+
 			var x01sql01 = fsql.Select<Main1>()
                 .Include(a => a.Test1)
                 .Include(a => a.Test2)
@@ -728,7 +846,6 @@ namespace base_entity
                 title = "one plus pro"
             }.Save();
 
-            fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Now && a.createtime < DateTime.Now.AddMonths(1)).ToList();
 
             using (var uow = fsql.CreateUnitOfWork())
             {
@@ -879,118 +996,7 @@ namespace base_entity
                 .ToSql();
 
 
-            //var table = fsql.CodeFirst.GetTableByEntity(typeof(AsTableLog));
-            //table.SetAsTable(new ModAsTableImpl(fsql), table.ColumnsByCs[nameof(AsTableLog.click)]);
 			
-            var testitems = new[]
-            {
-                new AsTableLog{ msg = "msg01", createtime = DateTime.Parse("2022-1-1 13:00:11"), click = 1 },
-                new AsTableLog{ msg = "msg02", createtime = DateTime.Parse("2022-1-2 14:00:12"), click = 2 },
-                new AsTableLog{ msg = "msg03", createtime = DateTime.Parse("2022-2-2 15:00:13"), click = 3 },
-                new AsTableLog{ msg = "msg04", createtime = DateTime.Parse("2022-2-8 15:00:13"), click = 4 },
-                new AsTableLog{ msg = "msg05", createtime = DateTime.Parse("2022-3-8 15:00:13"), click = 5 },
-                new AsTableLog{ msg = "msg06", createtime = DateTime.Parse("2022-4-8 15:00:13"), click = 6 },
-                new AsTableLog{ msg = "msg07", createtime = DateTime.Parse("2022-6-8 15:00:13"), click = 7 },
-                new AsTableLog{ msg = "msg08", createtime = DateTime.Parse("2022-7-1"), click = 9},
-                new AsTableLog{ msg = "msg09", createtime = DateTime.Parse("2022-7-1 11:00:00"), click = 10},
-                new AsTableLog{ msg = "msg10", createtime = DateTime.Parse("2022-7-1 12:00:00"), click = 10}
-            };
-            var sqlatb = fsql.Insert(testitems).NoneParameter();
-            var sqlat = sqlatb.ToSql();
-            var sqlatr = sqlatb.ExecuteAffrows();
-
-            //var sqlatc1 = fsql.Delete<AsTableLog>().Where(a => a.click < 0);
-            //var sqlatca1 = sqlatc1.ToSql();
-            //var sqlatcr1 = sqlatc1.ExecuteAffrows();
-
-            var sqlatc1 = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime == DateTime.Parse("2022-3-8 15:00:13"));
-            var sqlatca1 = sqlatc1.ToSql();
-            var sqlatcr1 = sqlatc1.ExecuteAffrows();
-
-            var sqlatc2 = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime == DateTime.Parse("2021-3-8 15:00:13"));
-            var sqlatca2 = sqlatc2.ToSql();
-            var sqlatcr2 = sqlatc2.ExecuteAffrows();
-
-            var sqlatc = fsql.Delete<AsTableLog>().Where(a => a.id == Guid.NewGuid() && a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
-            var sqlatca = sqlatc.ToSql();
-            var sqlatcr = sqlatc.ExecuteAffrows();
-
-            var sqlatd1 = fsql.Update<AsTableLog>().SetSource(testitems[0]);
-            var sqlatd101 = sqlatd1.ToSql();
-            var sqlatd102 = sqlatd1.ExecuteAffrows();
-
-            var sqlatd2 = fsql.Update<AsTableLog>().SetSource(testitems[5]);
-            var sqlatd201 = sqlatd2.ToSql();
-            var sqlatd202 = sqlatd2.ExecuteAffrows();
-
-            var sqlatd3 = fsql.Update<AsTableLog>().SetSource(testitems);
-            var sqlatd301 = sqlatd3.ToSql();
-            var sqlatd302 = sqlatd3.ExecuteAffrows();
-
-            var sqlatd4 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg");
-            var sqlatd401 = sqlatd4.ToSql();
-            var sqlatd402 = sqlatd4.ExecuteAffrows();
-
-            var sqlatd5 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
-            var sqlatd501 = sqlatd5.ToSql();
-            var sqlatd502 = sqlatd5.ExecuteAffrows();
-
-            var sqlatd6 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1") && a.createtime < DateTime.Parse("2022-5-1"));
-            var sqlatd601 = sqlatd6.ToSql();
-            var sqlatd602 = sqlatd6.ExecuteAffrows();
-
-            var sqlatd7 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1"));
-            var sqlatd701 = sqlatd7.ToSql();
-            var sqlatd702 = sqlatd7.ExecuteAffrows();
-
-            var sqlatd8 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime < DateTime.Parse("2022-5-1"));
-            var sqlatd801 = sqlatd8.ToSql();
-            var sqlatd802 = sqlatd8.ExecuteAffrows();
-
-            var sqlatd12 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems[0]);
-            var sqlatd1201 = sqlatd12.ToSql();
-            var sqlatd1202 = sqlatd12.ExecuteAffrows();
-
-            var sqlatd22 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems[5]);
-            var sqlatd2201 = sqlatd22.ToSql();
-            var sqlatd2202 = sqlatd22.ExecuteAffrows();
-
-            var sqlatd32 = fsql.InsertOrUpdate<AsTableLog>().SetSource(testitems);
-            var sqlatd3201 = sqlatd32.ToSql();
-            var sqlatd3202 = sqlatd32.ExecuteAffrows();
-
-            var sqls1 = fsql.Select<AsTableLog>().OrderBy(a => a.createtime);
-            var sqls101 = sqls1.ToSql();
-            var sqls102 = sqls1.ToList();
-
-            var sqls2 = fsql.Select<AsTableLog>().Where(a => a.createtime.Between(DateTime.Parse("2022-3-1"), DateTime.Parse("2022-5-1")));
-            var sqls201 = sqls2.ToSql();
-            var sqls202 = sqls2.ToList();
-
-            var sqls3 = fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Parse("2022-3-1") && a.createtime < DateTime.Parse("2022-5-1"));
-            var sqls301 = sqls3.ToSql();
-            var sqls302 = sqls3.ToList();
-
-            var sqls4 = fsql.Select<AsTableLog>().Where(a => a.createtime > DateTime.Parse("2022-3-1"));
-            var sqls401 = sqls4.ToSql();
-            var sqls402 = sqls4.ToList();
-
-            var sqls5 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1"));
-            var sqls501 = sqls5.ToSql();
-            var sqls502 = sqls5.ToList();
-
-            var sqls6 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1")).Limit(10).OrderBy(a => a.createtime);
-            var sqls601 = sqls6.ToSql();
-            var sqls602 = sqls6.ToList();
-
-            var sqls7 = fsql.Select<AsTableLog>().Where(a => a.createtime < DateTime.Parse("2022-5-1")).ToAggregate(g => new
-            {
-                sum1 = g.Sum(g.Key.click),
-                cou1 = g.Count(),
-                avg1 = g.Avg(g.Key.click),
-                min = g.Min(g.Key.click),
-                max = g.Max(g.Key.click)
-            });
 
 
             var iouSetSql01 = fsql.InsertOrUpdate<User1>()

Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootUtils.cs

@@ -135,7 +135,7 @@ namespace FreeSql
                 }
                 if (collectionBefore != null && collectionAfter == null)
                 {
-                    //foreach (var item in collectionBefore as IEnumerable)
+                    //foreach (var item in collectionBefore)
                     //{
                     //    changelog.DeleteLog.Add(NativeTuple.Create(elementType, new[] { item }));
                     //    NavigateReader(boundaryName, fsql, elementType, item, (path, tr, ct, stackvs) =>
@@ -148,12 +148,12 @@ namespace FreeSql
                 }
                 Dictionary<string, object> dictBefore = new Dictionary<string, object>();
                 Dictionary<string, object> dictAfter = new Dictionary<string, object>();
-                foreach (var item in collectionBefore as IEnumerable)
+                foreach (var item in collectionBefore)
                 {
                     var key = fsql.GetEntityKeyString(elementType, item, false);
                     if (key != null) dictBefore.Add(key, item);
                 }
-                foreach (var item in collectionAfter as IEnumerable)
+                foreach (var item in collectionAfter)
                 {
                     var key = fsql.GetEntityKeyString(elementType, item, false);
                     if (key != null)
@@ -385,7 +385,7 @@ namespace FreeSql
                     if (propvalFrom == null)
                     {
                         EntityUtilExtensions.SetEntityValueWithPropertyName(fsql, entityType, entityTo, prop.Name, null);
-                        return;
+                        continue;
                     }
                     switch (tbref.RefType)
                     {

Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

FreeSql.All/FreeSql.All.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

FreeSql.DbContext/FreeSql.DbContext.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

FreeSql.Repository/FreeSql.Repository.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs

@@ -17,7 +17,7 @@ namespace FreeSql.Tests.MySql
                 .UseConnectionFactory(FreeSql.DataType.MySql, () => new MySqlConnection(connectionString))
                 .Build())
             {
-                Assert.Equal("server=127.0.0.1;port=3306;user id=root;password=root;database=cccddd;characterset=utf8;sslmode=Disabled;maxpoolsize=51;allowuservariables=True", t2.Ado.ConnectionString);
+                Assert.Equal("server=127.0.0.1;port=3306;user id=root;password=root;database=cccddd;characterset=utf8;sslmode=none;maxpoolsize=51;allowuservariables=True", t2.Ado.ConnectionString);
             }
         }
 

FreeSql/DataAnnotations/TableAttribute.cs

@@ -45,7 +45,7 @@ namespace FreeSql.DataAnnotations
         {
             if (string.IsNullOrEmpty(AsTable) == false)
             {
-                var atm = Regex.Match(AsTable, @"([\w_\d]+)\s*=\s*(\d\d\d\d)\s*\-\s*(\d\d?)\s*\-\s*(\d\d?)\s*( [\d:]+)?\((\d+)\s*(year|month|day|hour)\)", RegexOptions.IgnoreCase);
+                var atm = Regex.Match(AsTable, @"([\w_\d]+)\s*=\s*(\d\d\d\d)\s*\-\s*(\d\d?)\s*\-\s*(\d\d?)\s*( [\d:]+)?\(([\d,]+)\s*(year|month|day|hour)\)", RegexOptions.IgnoreCase);
                 if (atm.Success == false)
                     throw new Exception(CoreStrings.AsTable_PropertyName_FormatError(AsTable));
 
@@ -65,10 +65,11 @@ namespace FreeSql.DataAnnotations
                     else if (hhmmss.Length == 2) beginTime = $"{beginTime} {hhmmss[0]}:{hhmmss[1]}:0";
                     else if (hhmmss.Length == 3) beginTime = $"{beginTime} {hhmmss[0]}:{hhmmss[1]}:{hhmmss[2]}";
                 }
-                int.TryParse(atm.Groups[6].Value, out var atm6);
+                var intervals = atm.Groups[6].Value.Split(',').Select(a => int.TryParse(a, out var atm6) ? atm6 : 0).Where(a => a > 0).ToArray();
                 string atm7 = atm.Groups[7].Value.ToLower();
-                tb.AsTableImpl = new DateTimeAsTableImpl(Name, DateTime.Parse(beginTime), dt =>
+                tb.AsTableImpl = new DateTimeAsTableImpl(Name, DateTime.Parse(beginTime), (dt, idx) =>
                 {
+                    var atm6 = idx >= 0 && idx < intervals.Length ? intervals[idx] : intervals.Last();
 					switch (atm7)
                     {
                         case "year": return dt.AddYears(atm6);
@@ -85,6 +86,7 @@ namespace FreeSql.DataAnnotations
     public interface IAsTable
     {
         string[] AllTables { get; }
+		IAsTable SetTableName(int index, string tableName);
 		string GetTableNameByColumnValue(object columnValue, bool autoExpand = false);
         string[] GetTableNamesByColumnValueRange(object columnValue1, object columnValue2);
         string[] GetTableNamesBySqlWhere(string sqlWhere, List<DbParameter> dbParams, SelectTableInfo tb, CommonUtils commonUtils);
@@ -96,12 +98,12 @@ namespace FreeSql.DataAnnotations
         readonly List<DateTime> _allTablesTime = new List<DateTime>();
         readonly DateTime _beginTime;
         DateTime _lastTime;
-        Func<DateTime, DateTime> _nextTimeFunc;
+        Func<DateTime, int, DateTime> _nextTimeFunc;
         string _tableName;
         Match _tableNameFormat;
         static Regex _regTableNameFormat = new Regex(@"\{([^\\}]+)\}");
 
-        public DateTimeAsTableImpl(string tableName, DateTime beginTime, Func<DateTime, DateTime> nextTimeFunc)
+        public DateTimeAsTableImpl(string tableName, DateTime beginTime, Func<DateTime, int, DateTime> nextTimeFunc)
         {
             if (nextTimeFunc == null) throw new ArgumentException(CoreStrings.Cannot_Be_NULL_Name("nextTimeFunc"));
             //beginTime = beginTime.Date; //日期部分作为开始
@@ -116,7 +118,8 @@ namespace FreeSql.DataAnnotations
         int GetTimestamp(DateTime dt) => (int)dt.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
         void ExpandTable(DateTime beginTime, DateTime endTime)
         {
-            if (beginTime > endTime) endTime = _nextTimeFunc(beginTime);
+            var index = 0;
+            if (beginTime > endTime) endTime = _nextTimeFunc(beginTime, -1);
             lock (_lock)
             {
                 while (beginTime <= endTime)
@@ -127,7 +130,7 @@ namespace FreeSql.DataAnnotations
                     _allTables.Insert(0, name);
                     _allTablesTime.Insert(0, beginTime);
                     _lastTime = beginTime;
-                    beginTime = _nextTimeFunc(beginTime);
+                    beginTime = _nextTimeFunc(beginTime, index++);
                 }
             }
         }
@@ -153,7 +156,7 @@ namespace FreeSql.DataAnnotations
         {
             var dt = ParseColumnValue(columnValue);
             if (dt < _beginTime) throw new Exception(CoreStrings.SubTableFieldValue_CannotLessThen(dt.ToString("yyyy-MM-dd HH:mm:ss"), _beginTime.ToString("yyyy-MM-dd HH:mm:ss")));
-            var tmpTime = _nextTimeFunc(_lastTime);
+            var tmpTime = _nextTimeFunc(_lastTime, -1);
             if (dt >= tmpTime && autoExpand)
             {
                 // 自动建表
@@ -375,5 +378,13 @@ namespace FreeSql.DataAnnotations
                 }
             }
         }
+		public IAsTable SetTableName(int index, string tableName)
+        {
+			lock (_lock)
+			{
+                _allTables[index] = tableName;
+			}
+            return this;
+		}
 	}
 }

FreeSql/DataAnnotations/TableFluent.cs

@@ -45,6 +45,18 @@ namespace FreeSql.DataAnnotations
             _table.DisableSyncStructure = value;
             return this;
         }
+		/// <summary>
+		/// 格式：属性名=开始时间(递增)<para></para>
+		/// 按年分表：[Table(Name = "log_{yyyy}", AsTable = "create_time=2022-1-1(1 year)")]<para></para>
+		/// 按月分表：[Table(Name = "log_{yyyyMM}", AsTable = "create_time=2022-5-1(1 month)")]<para></para>
+		/// 按日分表：[Table(Name = "log_{yyyyMMdd}", AsTable = "create_time=2022-5-1(5 day)")]<para></para>
+		/// 按时分表：[Table(Name = "log_{yyyyMMddHH}", AsTable = "create_time=2022-5-1(6 hour)")]<para></para>
+		/// </summary>
+		public TableFluent AsTable(string value)
+		{
+			_table.AsTable = value;
+			return this;
+		}
 
 		public ColumnFluent Property(string proto)
         {
@@ -126,6 +138,18 @@ namespace FreeSql.DataAnnotations
             _table.DisableSyncStructure = value;
             return this;
 		}
+		/// <summary>
+		/// 格式：属性名=开始时间(递增)<para></para>
+		/// 按年分表：[Table(Name = "log_{yyyy}", AsTable = "create_time=2022-1-1(1 year)")]<para></para>
+		/// 按月分表：[Table(Name = "log_{yyyyMM}", AsTable = "create_time=2022-5-1(1 month)")]<para></para>
+		/// 按日分表：[Table(Name = "log_{yyyyMMdd}", AsTable = "create_time=2022-5-1(5 day)")]<para></para>
+		/// 按时分表：[Table(Name = "log_{yyyyMMddHH}", AsTable = "create_time=2022-5-1(6 hour)")]<para></para>
+		/// </summary>
+		public TableFluent<T> AsTable(string value)
+		{
+			_table.AsTable = value;
+			return this;
+		}
 
 		public ColumnFluent Property<TProto>(Expression<Func<T, TProto>> column)
         {

FreeSql/FreeSql.csproj

@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

FreeSql/FreeSql.xml

@@ -478,6 +478,15 @@
             禁用 CodeFirst 同步结构迁移
             </summary>
         </member>
+        <member name="M:FreeSql.DataAnnotations.TableFluent.AsTable(System.String)">
+            <summary>
+            格式：属性名=开始时间(递增)<para></para>
+            按年分表：[Table(Name = "log_{yyyy}", AsTable = "create_time=2022-1-1(1 year)")]<para></para>
+            按月分表：[Table(Name = "log_{yyyyMM}", AsTable = "create_time=2022-5-1(1 month)")]<para></para>
+            按日分表：[Table(Name = "log_{yyyyMMdd}", AsTable = "create_time=2022-5-1(5 day)")]<para></para>
+            按时分表：[Table(Name = "log_{yyyyMMddHH}", AsTable = "create_time=2022-5-1(6 hour)")]<para></para>
+            </summary>
+        </member>
         <member name="M:FreeSql.DataAnnotations.TableFluent.Navigate(System.String,System.String,System.Type)">
             <summary>
             导航关系Fluent，与 NavigateAttribute 对应
@@ -511,6 +520,15 @@
             禁用 CodeFirst 同步结构迁移
             </summary>
         </member>
+        <member name="M:FreeSql.DataAnnotations.TableFluent`1.AsTable(System.String)">
+            <summary>
+            格式：属性名=开始时间(递增)<para></para>
+            按年分表：[Table(Name = "log_{yyyy}", AsTable = "create_time=2022-1-1(1 year)")]<para></para>
+            按月分表：[Table(Name = "log_{yyyyMM}", AsTable = "create_time=2022-5-1(1 month)")]<para></para>
+            按日分表：[Table(Name = "log_{yyyyMMdd}", AsTable = "create_time=2022-5-1(5 day)")]<para></para>
+            按时分表：[Table(Name = "log_{yyyyMMddHH}", AsTable = "create_time=2022-5-1(6 hour)")]<para></para>
+            </summary>
+        </member>
         <member name="M:FreeSql.DataAnnotations.TableFluent`1.Navigate``1(System.Linq.Expressions.Expression{System.Func{`0,``0}},System.String,System.Type)">
             <summary>
             导航关系Fluent，与 NavigateAttribute 对应
@@ -1086,6 +1104,82 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
+            <summary>
+            动态创建实体类型
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
+            <summary>
+            配置Class
+            </summary>
+            <param name="className">类名</param>
+            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="defaultValue">属性默认值</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
+            <summary>
+            配置父类
+            </summary>
+            <param name="superClass">父类类型</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
+            <summary>
+            Override属性
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
+            <summary>
+            Emit动态创建出Class - Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
+            <summary>
+            首字母小写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
+            <summary>
+            首字母大写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 null
@@ -5769,6 +5863,28 @@
             请使用 fsql.InsertDict(dict) 方法插入字典数据
             </summary>
         </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
+            <summary>
+            动态构建Class Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            根据字典，创建 table 对应的实体对象
+            </summary>
+            <param name="table"></param>
+            <param name="dict"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
+            <summary>
+            根据实体对象，创建 table 对应的字典
+            </summary>
+            <param name="table"></param>
+            <param name="instance"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>
@@ -6285,115 +6401,3 @@
         </member>
     </members>
 </doc>
-`0})">
-            <summary>
-            插入数据，传入实体集合
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.InsertOrUpdate``1">
-            <summary>
-            插入或更新数据，此功能依赖数据库特性（低版本可能不支持），参考如下：<para></para>
-            MySql 5.6+: on duplicate key update<para></para>
-            PostgreSQL 9.4+: on conflict do update<para></para>
-            SqlServer 2008+: merge into<para></para>
-            Oracle 11+: merge into<para></para>
-            Sqlite: replace into<para></para>
-            达梦: merge into<para></para>
-            人大金仓：on conflict do update<para></para>
-            神通：merge into<para></para>
-            MsAccess：不支持<para></para>
-            注意区别：FreeSql.Repository 仓储也有 InsertOrUpdate 方法（不依赖数据库特性）
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1">
-            <summary>
-            修改数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1(System.Object)">
-            <summary>
-            修改数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1">
-            <summary>
-            查询数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1(System.Object)">
-            <summary>
-            查询数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1">
-            <summary>
-            删除数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1(System.Object)">
-            <summary>
-            删除数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="isolationLevel"></param>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="P:IFreeSql.Ado">
-            <summary>
-            数据库访问对象
-            </summary>
-        </member>
-        <member name="P:IFreeSql.Aop">
-            <summary>
-            所有拦截方法都在这里
-            </summary>
-        </member>
-        <member name="P:IFreeSql.CodeFirst">
-            <summary>
-            CodeFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.DbFirst">
-            <summary>
-            DbFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.GlobalFilter">
-            <summary>
-            全局过滤设置，可默认附加为 Select/Update/Delete 条件
-            </summary>
-        </member>
-    </members>
-</doc>

FreeSql/Internal/Model/TableInfo.cs

@@ -26,7 +26,7 @@ namespace FreeSql.Internal.Model
         public bool DisableSyncStructure { get; set; }
         public string Comment { get; set; }
         public bool IsRereadSql { get; internal set; }
-        public bool IsDictionaryType { get; internal set; }
+        public bool IsDictionaryType { get; set; }
 
         public IAsTable AsTableImpl { get; internal set; }
         public ColumnInfo AsTableColumn { get; internal set; }

FreeSql/Internal/ObjectPool/ObjectPool.cs

@@ -352,7 +352,7 @@ namespace FreeSql.Internal.ObjectPool
             }
             catch
             {
-                Return(obj);
+                Return(obj, true);
                 throw;
             }
 
@@ -404,7 +404,7 @@ namespace FreeSql.Internal.ObjectPool
             }
             catch
             {
-                Return(obj);
+                Return(obj, true);
                 throw;
             }
 

FreeSql/Internal/UtilsExpressionTree.cs

@@ -112,15 +112,85 @@ namespace FreeSql.Internal
                     continue;
                 }
                 if (tp == null && colattr != null) colattr.IsIgnore = true; //无法匹配的属性，认定是导航属性，且自动过滤
+
+                var col = ColumnAttributeToInfo(trytb, entityDefault, p.Name, p.PropertyType, setMethod == null, ref colattr, tp, common);
+				if (col == null) continue;
+
+				if (propsComment != null && propsComment.TryGetValue(p.Name, out var trycomment))
+					col.Comment = trycomment;
+				if (string.IsNullOrEmpty(col.Comment) && propsCommentByDescAttr != null && propsCommentByDescAttr.TryGetValue(p.Name, out trycomment))
+					col.Comment = trycomment;
+
+				trytb.Columns.Add(colattr.Name, col);
+                trytb.ColumnsByCs.Add(p.Name, col);
+                columnsList.Add(col);
+            }
+
+            var indexes = common.GetEntityIndexAttribute(trytb.Type);
+			AuditTableInfo(trytb, tbattr, indexes, columnsList, common);
+            tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
+
+            #region 查找导航属性的关系、virtual 属性延时加载，动态产生新的重写类
+            var trytbTypeName = trytb.Type.DisplayCsharp();
+            var trytbTypeLazyName = default(string);
+            StringBuilder cscode = null;
+            if (common.CodeFirst.IsLazyLoading && propsLazy.Any())
+            {
+                if (trytb.Type.IsPublic == false && trytb.Type.IsNestedPublic == false) throw new Exception(CoreStrings.LazyLoading_EntityMustDeclarePublic(trytbTypeName));
+
+                trytbTypeLazyName = $"FreeSqlLazyEntity__{Regex.Replace(trytbTypeName, @"[^\w\d]", "_")}";
+
+                cscode = new StringBuilder();
+                cscode.AppendLine("using System;")
+                    .AppendLine("using FreeSql.DataAnnotations;")
+                    .AppendLine("using System.Collections.Generic;")
+                    .AppendLine("using System.Linq;")
+                    .AppendLine()
+                    .Append("public class ").Append(trytbTypeLazyName).Append(" : ").Append(trytbTypeName).AppendLine(" {")
+                    .AppendLine("	private IFreeSql __fsql_orm__ { get; set; }\r\n");
+            }
+
+            var cscodeLength = cscode?.Length ?? 0;
+            foreach (var pnv in propsNavObjs)
+            {
+                var vp = propsLazy.Where(a => a.Item1 == pnv).FirstOrDefault();
+                var isLazy = vp != null && vp.Item1 != null && !string.IsNullOrEmpty(trytbTypeLazyName);
+
+                AddTableRef(common, trytb, pnv, isLazy, vp, cscode);
+            }
+            if (cscode?.Length > cscodeLength)
+            {
+                cscode.AppendLine("}");
+                Assembly assembly = null;
+                if (MethodLazyLoadingComplier.Value == null) throw new Exception(CoreStrings.Install_FreeSql_Extensions_LazyLoading);
+                try
+                {
+                    assembly = MethodLazyLoadingComplier.Value.Invoke(null, new object[] { cscode.ToString() }) as Assembly;
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(CoreStrings.LazyLoading_CompilationError(trytbTypeName, ex.Message, cscode));
+                }
+                var type = assembly.GetExportedTypes()/*.DefinedTypes*/.Where(a => a.FullName.EndsWith(trytbTypeLazyName)).FirstOrDefault();
+                trytb.TypeLazy = type;
+                trytb.TypeLazySetOrm = type.GetProperty("__fsql_orm__", BindingFlags.Instance | BindingFlags.NonPublic).GetSetMethod(true);
+                tbc.AddOrUpdate(type, trytb, (oldkey, oldval) => trytb);
+            }
+            #endregion
+
+            return tbc.TryGetValue(entity, out var trytb2) ? trytb2 : trytb;
+        }
+        public static ColumnInfo ColumnAttributeToInfo(TableInfo trytb, object entityDefault, string csName, Type mapType, bool isIgnore, ref ColumnAttribute colattr, DbInfoResult tp, CommonUtils common)
+        {
 			var colattrIsNullable = colattr?._IsNullable;
 			var colattrIsNull = colattr == null;
 			if (colattr == null)
 				colattr = new ColumnAttribute
 				{
-                        Name = p.Name,
+					Name = csName,
 					DbType = tp.dbtypeFull,
 					IsNullable = tp.isnullable ?? true,
-                        MapType = p.PropertyType
+					MapType = mapType
 				};
 			if (colattr._IsNullable == null) colattr._IsNullable = tp?.isnullable;
 			if (string.IsNullOrEmpty(colattr.DbType)) colattr.DbType = tp?.dbtypeFull ?? "varchar(255)";
@@ -136,7 +206,7 @@ namespace FreeSql.Internal
 			if (colattrIsNull == false && colattrIsNullable == false && colattr.DbType.Contains("NOT NULL") == false) colattr.DbType = Regex.Replace(colattr.DbType, @"\bNULL\b", "").Trim() + " NOT NULL";
 			if (colattr._IsNullable == null && tp != null && tp.isnullable == null) colattr.IsNullable = tp.dbtypeFull.Contains("NOT NULL") == false;
 			if (colattr.DbType?.Contains("NOT NULL") == true) colattr.IsNullable = false;
-                if (string.IsNullOrEmpty(colattr.Name)) colattr.Name = p.Name;
+			if (string.IsNullOrEmpty(colattr.Name)) colattr.Name = csName;
 			if (common.CodeFirst.IsSyncStructureToLower) colattr.Name = colattr.Name.ToLower();
 			if (common.CodeFirst.IsSyncStructureToUpper) colattr.Name = colattr.Name.ToUpper();
 
@@ -156,31 +226,27 @@ namespace FreeSql.Internal
 			});
 			if (colattr.IsIdentity == true && colattr.MapType.IsNumberType() == false)
 				colattr.IsIdentity = false;
-                if (setMethod == null) colattr.IsIgnore = true;
+			if (isIgnore) colattr.IsIgnore = true;
 
 			var col = new ColumnInfo
 			{
 				Table = trytb,
-                    CsName = p.Name,
+				CsName = csName,
-                    CsType = p.PropertyType,
+				CsType = mapType,
 				Attribute = colattr
 			};
-                if (propsComment != null && propsComment.TryGetValue(p.Name, out var trycomment))
-                    col.Comment = trycomment;
-                if (string.IsNullOrEmpty(col.Comment) && propsCommentByDescAttr != null && propsCommentByDescAttr.TryGetValue(p.Name, out trycomment))
-                    col.Comment = trycomment;
 
 			if (colattr.IsIgnore)
 			{
-                    trytb.ColumnsByCsIgnore.Add(p.Name, col);
+				trytb.ColumnsByCsIgnore.Add(csName, col);
-                    continue;
+                return null;
 			}
 			object defaultValue = null;
-                if (entityDefault != null) defaultValue = trytb.Properties[p.Name].GetValue(entityDefault, null);
+			if (entityDefault != null) defaultValue = trytb.Properties[csName].GetValue(entityDefault, null);
-                if (p.PropertyType.IsEnum)
+			if (defaultValue != null && mapType.IsEnum)
 			{
 				var isEqualsEnumValue = false;
-                    var enumValues = Enum.GetValues(p.PropertyType);
+				var enumValues = Enum.GetValues(mapType);
 				for (var a = 0; a < enumValues.Length; a++)
 					if (object.Equals(defaultValue, enumValues.GetValue(a)))
 					{
@@ -190,7 +256,7 @@ namespace FreeSql.Internal
 				if (isEqualsEnumValue == false && enumValues.Length > 0)
 					defaultValue = enumValues.GetValue(0);
 			}
-                if (defaultValue != null && p.PropertyType != colattr.MapType) defaultValue = Utils.GetDataReaderValue(colattr.MapType, defaultValue);
+			if (defaultValue != null && mapType != colattr.MapType) defaultValue = Utils.GetDataReaderValue(colattr.MapType, defaultValue);
 			if (defaultValue == null) defaultValue = tp?.defaultValue;
 			if (colattr.IsNullable == false && defaultValue == null)
 			{
@@ -406,12 +472,12 @@ namespace FreeSql.Internal
 			}
 
 			if (trytb.Columns.ContainsKey(colattr.Name)) throw new Exception(CoreStrings.Duplicate_ColumnAttribute(colattr.Name));
-                if (trytb.ColumnsByCs.ContainsKey(p.Name)) throw new Exception(CoreStrings.Duplicate_PropertyName(p.Name));
+			if (trytb.ColumnsByCs.ContainsKey(csName)) throw new Exception(CoreStrings.Duplicate_PropertyName(csName));
 
-                trytb.Columns.Add(colattr.Name, col);
+            return col;
-                trytb.ColumnsByCs.Add(p.Name, col);
-                columnsList.Add(col);
 		}
+        public static void AuditTableInfo(TableInfo trytb, TableAttribute tbattr, IEnumerable<IndexAttribute> indexes, List<ColumnInfo> columnsList, CommonUtils common)
+        {
 			trytb.VersionColumn = trytb.Columns.Values.Where(a => a.Attribute.IsVersion == true).LastOrDefault();
 			if (trytb.VersionColumn != null)
 			{
@@ -478,7 +544,6 @@ namespace FreeSql.Internal
 				catch { }
 			}
 			//索引和唯一键
-            var indexes = common.GetEntityIndexAttribute(trytb.Type);
 			foreach (var index in indexes)
 			{
 				var val = index.Fields?.Trim(' ', '\t', ',');
@@ -583,57 +648,6 @@ namespace FreeSql.Internal
 				.Concat(columnsList.Where(a => a.Attribute.Position == 0))
 				.Concat(columnsList.Where(a => a.Attribute.Position < 0).OrderBy(a => a.Attribute.Position)).ToArray();
 			trytb.ColumnsByCanUpdateDbUpdateValue = columnsList.Where(a => a.Attribute.CanUpdate == true && string.IsNullOrEmpty(a.DbUpdateValue) == false).ToArray();
-            tbc.AddOrUpdate(entity, trytb, (oldkey, oldval) => trytb);
-
-            #region 查找导航属性的关系、virtual 属性延时加载，动态产生新的重写类
-            var trytbTypeName = trytb.Type.DisplayCsharp();
-            var trytbTypeLazyName = default(string);
-            StringBuilder cscode = null;
-            if (common.CodeFirst.IsLazyLoading && propsLazy.Any())
-            {
-                if (trytb.Type.IsPublic == false && trytb.Type.IsNestedPublic == false) throw new Exception(CoreStrings.LazyLoading_EntityMustDeclarePublic(trytbTypeName));
-
-                trytbTypeLazyName = $"FreeSqlLazyEntity__{Regex.Replace(trytbTypeName, @"[^\w\d]", "_")}";
-
-                cscode = new StringBuilder();
-                cscode.AppendLine("using System;")
-                    .AppendLine("using FreeSql.DataAnnotations;")
-                    .AppendLine("using System.Collections.Generic;")
-                    .AppendLine("using System.Linq;")
-                    .AppendLine()
-                    .Append("public class ").Append(trytbTypeLazyName).Append(" : ").Append(trytbTypeName).AppendLine(" {")
-                    .AppendLine("	private IFreeSql __fsql_orm__ { get; set; }\r\n");
-            }
-
-            var cscodeLength = cscode?.Length ?? 0;
-            foreach (var pnv in propsNavObjs)
-            {
-                var vp = propsLazy.Where(a => a.Item1 == pnv).FirstOrDefault();
-                var isLazy = vp != null && vp.Item1 != null && !string.IsNullOrEmpty(trytbTypeLazyName);
-
-                AddTableRef(common, trytb, pnv, isLazy, vp, cscode);
-            }
-            if (cscode?.Length > cscodeLength)
-            {
-                cscode.AppendLine("}");
-                Assembly assembly = null;
-                if (MethodLazyLoadingComplier.Value == null) throw new Exception(CoreStrings.Install_FreeSql_Extensions_LazyLoading);
-                try
-                {
-                    assembly = MethodLazyLoadingComplier.Value.Invoke(null, new object[] { cscode.ToString() }) as Assembly;
-                }
-                catch (Exception ex)
-                {
-                    throw new Exception(CoreStrings.LazyLoading_CompilationError(trytbTypeName, ex.Message, cscode));
-                }
-                var type = assembly.GetExportedTypes()/*.DefinedTypes*/.Where(a => a.FullName.EndsWith(trytbTypeLazyName)).FirstOrDefault();
-                trytb.TypeLazy = type;
-                trytb.TypeLazySetOrm = type.GetProperty("__fsql_orm__", BindingFlags.Instance | BindingFlags.NonPublic).GetSetMethod(true);
-                tbc.AddOrUpdate(type, trytb, (oldkey, oldval) => trytb);
-            }
-            #endregion
-
-            return tbc.TryGetValue(entity, out var trytb2) ? trytb2 : trytb;
 		}
         public static void AddTableRef(CommonUtils common, TableInfo trytb, PropertyInfo pnv, bool isLazy, NativeTuple<PropertyInfo, bool, bool, MethodInfo, MethodInfo> vp, StringBuilder cscode)
         {

Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj

@@ -19,7 +19,7 @@
 		<SignAssembly>False</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj

@@ -18,7 +18,7 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

Providers/FreeSql.Provider.Xugu/FreeSql.Provider.Xugu.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.806-preview20231120</Version>
+		<Version>3.2.806-preview20231124</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>