diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs
index 366f7640..5a71b8ea 100644
--- a/Examples/base_entity/Program.cs
+++ b/Examples/base_entity/Program.cs
@@ -106,9 +106,12 @@ namespace base_entity
                 .UseAutoSyncStructure(true)
                 .UseNoneCommandParameter(true)
 
-                .UseConnectionString(FreeSql.DataType.Sqlite, "data source=test.db;max pool size=5")
+                .UseConnectionString(FreeSql.DataType.Sqlite, "data source=test1.db;max pool size=5")
+                .UseSlave("data source=test1.db", "data source=test2.db", "data source=test3.db", "data source=test4.db")
+                .UseSlaveWeight(10, 1, 1, 5)
 
-                .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.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")
 
@@ -131,13 +134,58 @@ namespace base_entity
 
                 //.UseConnectionString(FreeSql.DataType.OdbcDameng, "Driver={DM8 ODBC DRIVER};Server=127.0.0.1:5236;Persist Security Info=False;Trusted_Connection=Yes;UID=USER1;PWD=123456789")
 
-                .UseMonitorCommand(umcmd => Console.WriteLine(umcmd.CommandText))
+                .UseMonitorCommand(null, (umcmd, log) => Console.WriteLine(umcmd.Connection.ConnectionString + ":" + umcmd.CommandText))
                 .UseLazyLoading(true)
                 .UseGenerateCommandParameterWithLambda(true)
                 .Build();
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            fsql.Aop.AuditValue += new EventHandler<FreeSql.Aop.AuditValueEventArgs>((_, e) =>
+            {
+                
+            });
+
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sqss = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            var sqss2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            sqss = fsql.InsertDict(dic).AsTable("table1").NoneParameter(false).ToSql();
+            sqss2 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter(false).ToSql();
+
+            var sqlupd1 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").ToSql();
+            var sqlupd2 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").ToSql();
+            var sqlupd11 = fsql.UpdateDict(dic).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
+            var sqlupd22 = fsql.UpdateDict(diclist).AsTable("table1").WherePrimary("id").NoneParameter(false).ToSql();
+
+            var sqldel1 = fsql.DeleteDict(dic).AsTable("table1").ToSql();
+            var sqldel2 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
+            diclist[1]["title"] = "newtitle";
+            var sqldel3 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
+            diclist.Clear();
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 1
+            });
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2
+            });
+            var sqldel4 = fsql.DeleteDict(diclist).AsTable("table1").ToSql();
+
+
+            for (var a = 0; a < 10000; a++)
+                fsql.Select<User1>().First();
+
             for (var a = 0; a < 1000; a++)
             {
                 fsql.Transaction(() =>
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
index 5a301088..3b7c073c 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
+++ b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>2.6.100</Version>
+    <Version>3.2.300</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>
diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
index 8eb3c10a..b39d73a4 100644
--- a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
+++ b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>2.6.100</Version>
+    <Version>3.2.300</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储.</Description>
diff --git a/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs b/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs
index 60b0e0b1..fb901249 100644
--- a/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs
+++ b/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs
@@ -14,6 +14,7 @@ public static class FreeSqlJsonMapCoreExtensions
     static MethodInfo MethodJsonConvertDeserializeObject = typeof(JsonConvert).GetMethod("DeserializeObject", new[] { typeof(string), typeof(Type) });
     static MethodInfo MethodJsonConvertSerializeObject = typeof(JsonConvert).GetMethod("SerializeObject", new[] { typeof(object), typeof(JsonSerializerSettings) });
     static ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>> _dicJsonMapFluentApi = new ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>>();
+    static object _concurrentObj = new object();
 
     public static ColumnFluent JsonMap(this ColumnFluent col)
     {
@@ -52,13 +53,17 @@ public static class FreeSqlJsonMapCoreExtensions
                 e.ModifyResult.StringLength = -2;
                 if (_dicTypes.TryAdd(e.Property.PropertyType, true))
                 {
-                    FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionObjectToStringIfThenElse.Add((LabelTarget returnTarget, Expression valueExp, Expression elseExp, Type type) =>
+                    lock (_concurrentObj)
                     {
-                        return Expression.IfThenElse(
-                            Expression.TypeIs(valueExp, e.Property.PropertyType),
-                            Expression.Return(returnTarget, Expression.Call(MethodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object)), Expression.Constant(settings)), typeof(object)),
-                            elseExp);
-                    });
+                        FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple[e.Property.PropertyType] = true;
+                        FreeSql.Internal.Utils.GetDataReaderValueBlockExpressionObjectToStringIfThenElse.Add((LabelTarget returnTarget, Expression valueExp, Expression elseExp, Type type) =>
+                        {
+                            return Expression.IfThenElse(
+                                Expression.TypeIs(valueExp, e.Property.PropertyType),
+                                Expression.Return(returnTarget, Expression.Call(MethodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object)), Expression.Constant(settings)), typeof(object)),
+                                elseExp);
+                        });
+                    }
                 }
             }
         };
diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
index 2fae56b7..754098f4 100644
--- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
+++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
-    <Version>2.6.100</Version>
+    <Version>3.2.300</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，可实现【延时加载】属性.</Description>
diff --git a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
index f91ba287..8b7ccf1f 100644
--- a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
+++ b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-    <Version>2.6.100</Version>
+    <Version>3.2.300</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>FreeSql;ncc;YeXiangQin</Authors>
     <Description>FreeSql 扩展包，实现 linq queryable 和 linq to sql 语法进行开发.</Description>
diff --git a/Extensions/FreeSql.Generator/ConsoleApp.cs b/Extensions/FreeSql.Generator/ConsoleApp.cs
index 178df09f..e51a1429 100644
--- a/Extensions/FreeSql.Generator/ConsoleApp.cs
+++ b/Extensions/FreeSql.Generator/ConsoleApp.cs
@@ -180,6 +180,7 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
                             case "dameng": ArgsDbType = DataType.Dameng; break;
                             case "kingbasees": ArgsDbType = DataType.KingbaseES; break;
                             case "shentong": ArgsDbType = DataType.ShenTong; break;
+                            case "clickhouse": ArgsDbType = DataType.ClickHouse; break;
                             default: throw new ArgumentException($"-DB 参数错误，不支持的类型：\"{dbargs[0]}\"");
                         }
                         ArgsConnectionString = dbargs[1].Trim();
diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
index 3de0e6bd..db21e74b 100644
--- a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
+++ b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net50</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net60</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
@@ -12,15 +12,15 @@
     <Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
     <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
-    <Version>2.6.100</Version>
+    <Version>3.2.300</Version>
     <PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Colorful.Console" Version="1.2.9" />
     <PackageReference Include="RazorEngine.NetCore" Version="2.2.6" />
-    <PackageReference Include="System.CodeDom" Version="5.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="System.CodeDom" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Extensions/FreeSql.Generator/RazorContentManager.cs b/Extensions/FreeSql.Generator/RazorContentManager.cs
index a52036a6..a9e87243 100644
--- a/Extensions/FreeSql.Generator/RazorContentManager.cs
+++ b/Extensions/FreeSql.Generator/RazorContentManager.cs
@@ -63,9 +63,9 @@ namespace @gen.NameSpace {
 
 	@foreach (var col in gen.columns) {
 
-		if (string.IsNullOrEmpty(col.Coment) == false) {
+		if (string.IsNullOrEmpty(col.Comment) == false) {
 		@:/// <summary>
-		@:/// @col.Coment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n		/// "")
+		@:/// @col.Comment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n		/// "")
 		@:/// </summary>
 		}
 		@:@(""[JsonProperty"" + GetAttributeString(gen.GetColumnAttribute(col, true)) + ""]"")
@@ -154,9 +154,9 @@ namespace @gen.NameSpace {
 		var findfks = fks.Where(fkaa => fkaa.Columns.Where(fkaac1 => fkaac1.Name == col.Name).Any());
 		var csname = gen.GetCsName(col.Name);
 
-		if (string.IsNullOrEmpty(col.Coment) == false) {
+		if (string.IsNullOrEmpty(col.Comment) == false) {
 		@:/// <summary>
-		@:/// @col.Coment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n		/// "")
+		@:/// @col.Comment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n		/// "")
 		@:/// </summary>
 		}
 		@:@(""[JsonProperty"" + GetAttributeString(gen.GetColumnAttribute(col, true)) + ""]"")
diff --git a/FreeSql.All/FreeSql.All.csproj b/FreeSql.All/FreeSql.All.csproj
index 0e0b1e37..9bb53d79 100644
--- a/FreeSql.All/FreeSql.All.csproj
+++ b/FreeSql.All/FreeSql.All.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 全家桶，懒人专用</Description>
diff --git a/FreeSql.DbContext/DbContext/DbContext.cs b/FreeSql.DbContext/DbContext/DbContext.cs
index 901f0b8c..1415eaa1 100644
--- a/FreeSql.DbContext/DbContext/DbContext.cs
+++ b/FreeSql.DbContext/DbContext/DbContext.cs
@@ -217,7 +217,7 @@ namespace FreeSql
         /// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
         /// </summary>
         /// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-        /// <returns></returns>
+        /// <returns>key: 属性名, value: [旧值, 新值]</returns>
         public Dictionary<string, object[]> CompareState<TEntity>(TEntity newdata) where TEntity : class
         {
             CheckEntityTypeOrThrow(typeof(TEntity));
diff --git a/FreeSql.DbContext/DbSet/DbSet.cs b/FreeSql.DbContext/DbSet/DbSet.cs
index 26bdc091..a0326c5f 100644
--- a/FreeSql.DbContext/DbSet/DbSet.cs
+++ b/FreeSql.DbContext/DbSet/DbSet.cs
@@ -223,7 +223,7 @@ namespace FreeSql
         /// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
         /// </summary>
         /// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-        /// <returns></returns>
+        /// <returns>key: 属性名, value: [旧值, 新值]</returns>
         public Dictionary<string, object[]> CompareState(TEntity newdata)
         {
             if (newdata == null) return null;
@@ -305,6 +305,7 @@ namespace FreeSql
                     case DataType.KingbaseES:
                     case DataType.OdbcKingbaseES:
                     case DataType.ShenTong:
+                    case DataType.ClickHouse:
                         return true;
                     default:
                         if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1)
@@ -320,6 +321,7 @@ namespace FreeSql
                     if (isThrow) throw new Exception($"不可添加，已存在于状态管理：{_db.OrmOriginal.GetEntityString(_entityType, data)}");
                     return false;
                 }
+                if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
                 var idval = _db.OrmOriginal.GetEntityIdentityValueWithPrimary(_entityType, data);
                 if (idval > 0)
                 {
diff --git a/FreeSql.DbContext/DbSet/DbSetAsync.cs b/FreeSql.DbContext/DbSet/DbSetAsync.cs
index 8732b890..71b71e55 100644
--- a/FreeSql.DbContext/DbSet/DbSetAsync.cs
+++ b/FreeSql.DbContext/DbSet/DbSetAsync.cs
@@ -274,9 +274,9 @@ namespace FreeSql
                                     var isEquals = true;
                                     for (var midcolidx = tref.Columns.Count; midcolidx < tref.MiddleColumns.Count; midcolidx++)
                                     {
-                                        var refcol = tref.Columns[midcolidx - tref.Columns.Count];
+                                        var refcol = tref.RefColumns[midcolidx - tref.Columns.Count];
                                         var midval = FreeSql.Internal.Utils.GetDataReaderValue(refcol.CsType, _db.OrmOriginal.GetEntityValueWithPropertyName(tref.RefMiddleEntityType, midItem, tref.MiddleColumns[midcolidx].CsName));
-                                        var refval = FreeSql.Internal.Utils.GetDataReaderValue(refcol.CsType, _db.OrmOriginal.GetEntityValueWithPropertyName(tref.RefEntityType, curList[curIdx], tref.Columns[midcolidx - tref.Columns.Count].CsName));
+                                        var refval = FreeSql.Internal.Utils.GetDataReaderValue(refcol.CsType, _db.OrmOriginal.GetEntityValueWithPropertyName(tref.RefEntityType, curList[curIdx], refcol.CsName));
                                         if (object.Equals(midval, refval) == false)
                                         {
                                             isEquals = false;
diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj
index 88ff6b5c..9011be4d 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.csproj
+++ b/FreeSql.DbContext/FreeSql.DbContext.csproj
@@ -2,10 +2,10 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
-		<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>
+		<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 南大通用, 翰高, And Access</Description>
 		<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/DbContext</PackageProjectUrl>
 		<PackageTags>FreeSql ORM DbContext</PackageTags>
 		<RepositoryType>git</RepositoryType>
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 23060b9c..bdd16ff9 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -67,7 +67,7 @@
             比较实体，计算出值发生变化的属性，以及属性变化的前后值
             </summary>
             <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-            <returns></returns>
+            <returns>key: 属性名, value: [旧值, 新值]</returns>
         </member>
         <member name="P:FreeSql.DbContext.EntityChangeReport.ChangeInfo.BeforeObject">
             <summary>
@@ -142,7 +142,7 @@
             比较实体，计算出值发生变化的属性，以及属性变化的前后值
             </summary>
             <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-            <returns></returns>
+            <returns>key: 属性名, value: [旧值, 新值]</returns>
         </member>
         <member name="M:FreeSql.DbSet`1.FlushState">
             <summary>
@@ -333,7 +333,7 @@
             比较实体，计算出值发生变化的属性，以及属性变化的前后值
             </summary>
             <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-            <returns></returns>
+            <returns>key: 属性名, value: [旧值, 新值]</returns>
         </member>
         <member name="M:FreeSql.IBaseRepository`1.SaveMany(`0,System.String)">
             <summary>
diff --git a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
index 8551c248..1faae1a2 100644
--- a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
+++ b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
@@ -40,7 +40,7 @@ namespace FreeSql
             {
                 _dbsetPriv?.Dispose();
                 _dbPriv?.Dispose();
-                this.DataFilter.Dispose();
+                this.DataFilter?.Dispose();
             }
             finally
             {
diff --git a/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs b/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs
index a62092a7..e78a3db6 100644
--- a/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs
+++ b/FreeSql.DbContext/Repository/Repository/IBaseRepository.cs
@@ -62,7 +62,7 @@ namespace FreeSql
         /// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
         /// </summary>
         /// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
-        /// <returns></returns>
+        /// <returns>key: 属性名, value: [旧值, 新值]</returns>
         Dictionary<string, object[]> CompareState(TEntity newdata);
 
         int Update(TEntity entity);
diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj
index 39ebd39a..0c14c767 100644
--- a/FreeSql.Repository/FreeSql.Repository.csproj
+++ b/FreeSql.Repository/FreeSql.Repository.csproj
@@ -2,9 +2,9 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
-		<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/翰高/Access, and read/write separation、and split table.</Description>
+		<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/南大通用/翰高/Access, and read/write separation、and split table.</Description>
 		<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>
 		<PackageTags>FreeSql ORM Repository</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/FreeSql.Tests.VB/g.vb b/FreeSql.Tests.VB/g.vb
index da9cc3a1..a46f3aa1 100644
--- a/FreeSql.Tests.VB/g.vb
+++ b/FreeSql.Tests.VB/g.vb
@@ -3,7 +3,7 @@
 Public Class g
 
     Shared sqlserverLazy As Lazy(Of IFreeSql) = New Lazy(Of IFreeSql)(New Func(Of IFreeSql)(Function() New FreeSqlBuilder() _
-        .UseConnectionString(DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3") _
+        .UseConnectionString(DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true") _
         .UseAutoSyncStructure(True) _
         .UseMonitorCommand(Sub(cmd) Trace.WriteLine(vbCrLf & "线程" & Thread.CurrentThread.ManagedThreadId & ": " & cmd.CommandText)) _
         .UseLazyLoading(True) _
diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext/g.cs b/FreeSql.Tests/FreeSql.Tests.DbContext/g.cs
index 5e6cf923..7775d391 100644
--- a/FreeSql.Tests/FreeSql.Tests.DbContext/g.cs
+++ b/FreeSql.Tests/FreeSql.Tests.DbContext/g.cs
@@ -8,7 +8,7 @@ public class g
 {
 
     static Lazy<IFreeSql> sqlserverLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
-        .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=10")
+        .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=10;TrustServerCertificate=true")
         .UseAutoSyncStructure(true)
         .UseMonitorCommand(
             cmd =>
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/.editorconfig b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/.editorconfig
new file mode 100644
index 00000000..d2f6a096
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# xUnit2000: Constants and literals should be the expected argument
+dotnet_diagnostic.xUnit2000.severity = none
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj
new file mode 100644
index 00000000..a335a9cf
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DocumentationFile>FreeSql.Tests.Provider.GBase.xml</DocumentationFile>
+        <WarningLevel>3</WarningLevel>
+		<NoWarn>1701;1702;1591</NoWarn>
+        <!--<Prefer32Bit>false</Prefer32Bit>
+        <PlatformTarget>x86</PlatformTarget>-->
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+	
+    <ItemGroup>
+      <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" />
+      <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.Linq\FreeSql.Extensions.Linq.csproj" />
+      <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
+      <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+      <ProjectReference Include="..\..\Providers\FreeSql.Provider.GBase\FreeSql.Provider.GBase.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.xml b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.xml
new file mode 100644
index 00000000..dbda2f56
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>FreeSql.Tests.Provider.GBase</name>
+    </assembly>
+    <members>
+        <member name="P:FreeSql.Tests.GBase.GBaseCodeFirstTest.AddUniquesInfo.id">
+            <summary>
+            编号
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs
new file mode 100644
index 00000000..402df561
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs
@@ -0,0 +1,127 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseDeleteTest
+    {
+
+        IDelete<Topic> delete => g.gbase.Delete<Topic>();
+
+        [Table(Name = "tb_topic_del")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void Dywhere()
+        {
+            Assert.Null(g.gbase.Delete<Topic>().ToSql());
+            var sql = g.gbase.Delete<Topic>(new[] { 1, 2 }).ToSql();
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id IN (1,2))", sql);
+
+            sql = g.gbase.Delete<Topic>(new Topic { Id = 1, Title = "test" }).ToSql();
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id = 1)", sql);
+
+            sql = g.gbase.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql();
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id IN (1,2))", sql);
+
+            sql = g.gbase.Delete<Topic>(new { id = 1 }).ToSql();
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id = 1)", sql);
+
+            sql = g.gbase.Delete<MultiPkTopic>(new[] { new { Id1 = 1, Id2 = 10 }, new { Id1 = 2, Id2 = 20 } }).ToSql();
+            Assert.Equal("DELETE FROM MultiPkTopic WHERE (Id1 = 1 AND Id2 = 10 OR Id1 = 2 AND Id2 = 20)", sql);
+        }
+        class MultiPkTopic
+        {
+            [Column(IsPrimary = true)]
+            public int Id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int Id2 { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void Where()
+        {
+            var sql = delete.Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id = 1)", sql);
+
+            sql = delete.Where("id = @id", new { id = 1 }).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (id = @id)", sql);
+
+            var item = new Topic { Id = 1, Title = "newtitle" };
+            sql = delete.Where(item).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            sql = delete.Where(items).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM tb_topic_del WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+
+            var id = g.gbase.Insert<Topic>(new Topic { Title = "xxxx" }).ExecuteIdentity();
+            Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
+        }
+        [Fact]
+        public void ExecuteDeleted()
+        {
+            Assert.Throws<NotImplementedException>(() => delete.Where(a => a.Id > 0).ExecuteDeleted());
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            //var connectionBuilder = new IfxConnectionStringBuilder
+            //{
+            //    Host = "192.168.164.134",
+            //    Service = "9088",
+            //    Server = "gbase01",
+            //    Database = "testdb",
+            //    UID = "gbasedbt",
+            //    Pwd = "GBase123",
+            //    DbLocale = "zh_CN.utf8",
+            //    ClientLocale = "zh_CN.utf8",
+            //    PersistSecurityInfo = true
+            //};
+            //using (IfxConnection conn = new IfxConnection(connectionBuilder.ConnectionString))
+            //{
+            //    conn.Open();
+
+            //    var cmd = conn.CreateCommand();
+            //    cmd.CommandText = "select 1 from dual";
+            //    var val = cmd.ExecuteScalar();
+
+            //    conn.Close();
+            //}
+
+
+            Assert.Null(g.gbase.Delete<Topic>().ToSql());
+            var sql = g.gbase.Delete<Topic>(new[] { 1, 2 }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM TopicAsTable WHERE (Id IN (1,2))", sql);
+
+            sql = g.gbase.Delete<Topic>(new Topic { Id = 1, Title = "test" }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM TopicAsTable WHERE (Id = 1)", sql);
+
+            sql = g.gbase.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM TopicAsTable WHERE (Id IN (1,2))", sql);
+
+            sql = g.gbase.Delete<Topic>(new { id = 1 }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM TopicAsTable WHERE (Id = 1)", sql);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateIfExistsDoNothingTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateIfExistsDoNothingTest.cs
new file mode 100644
index 00000000..dae18691
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateIfExistsDoNothingTest.cs
@@ -0,0 +1,437 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseInsertOrUpdateIfExistsDoNothingTest
+    {
+        IFreeSql fsql => g.gbase;
+
+        [Fact]
+        public void InsertOrUpdate_OnlyPrimary()
+        {
+            fsql.Delete<tbioudb01>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb01>().IfExistsDoNothing().SetSource(new tbioudb01 { id = 1 });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb01 t1 
+USING (SELECT 1 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb01>().IfExistsDoNothing().SetSource(new tbioudb01 { id = 1 });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb01 t1 
+USING (SELECT 1 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb01>().IfExistsDoNothing().SetSource(new tbioudb01 { id = 2 });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb01 t1 
+USING (SELECT 2 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb01>().IfExistsDoNothing().SetSource(new[] { new tbioudb01 { id = 1 }, new tbioudb01 { id = 2 }, new tbioudb01 { id = 3 }, new tbioudb01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb01 t1 
+USING (SELECT 1 as id FROM dual 
+UNION ALL
+ SELECT 2 FROM dual 
+UNION ALL
+ SELECT 3 FROM dual 
+UNION ALL
+ SELECT 4 FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb01>().IfExistsDoNothing().SetSource(new[] { new tbioudb01 { id = 1 }, new tbioudb01 { id = 2 }, new tbioudb01 { id = 3 }, new tbioudb01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb01 t1 
+USING (SELECT 1 as id FROM dual 
+UNION ALL
+ SELECT 2 FROM dual 
+UNION ALL
+ SELECT 3 FROM dual 
+UNION ALL
+ SELECT 4 FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+        }
+        class tbioudb01
+        {
+            public int id { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimary()
+        {
+            fsql.Delete<tbioudb02>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb02 t1 
+USING (SELECT 1 as id, '01' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb02 t1 
+USING (SELECT 1 as id, '011' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb02 t1 
+USING (SELECT 2 as id, '02' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "01" }, new tbioudb02 { id = 2, name = "02" }, new tbioudb02 { id = 3, name = "03" }, new tbioudb02 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb02 t1 
+USING (SELECT 1 as id, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02' FROM dual 
+UNION ALL
+ SELECT 3, '03' FROM dual 
+UNION ALL
+ SELECT 4, '04' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "001" }, new tbioudb02 { id = 2, name = "002" }, new tbioudb02 { id = 3, name = "003" }, new tbioudb02 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb02 t1 
+USING (SELECT 1 as id, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '002' FROM dual 
+UNION ALL
+ SELECT 3, '003' FROM dual 
+UNION ALL
+ SELECT 4, '004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+        }
+        class tbioudb02
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndIdentity()
+        {
+            fsql.Delete<tbioudb022>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 1 as id, '01' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 1 as id, '011' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 2 as id, '02' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "01" }, new tbioudb022 { id = 2, name = "02" }, new tbioudb022 { id = 3, name = "03" }, new tbioudb022 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 1 as id, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02' FROM dual 
+UNION ALL
+ SELECT 3, '03' FROM dual 
+UNION ALL
+ SELECT 4, '04' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "001" }, new tbioudb022 { id = 2, name = "002" }, new tbioudb022 { id = 3, name = "003" }, new tbioudb022 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 1 as id, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '002' FROM dual 
+UNION ALL
+ SELECT 3, '003' FROM dual 
+UNION ALL
+ SELECT 4, '004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            //Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+
+            //--no primary
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "01" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbioudb022(name) VALUES('01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbioudb022(name) VALUES('011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbioudb022(name) VALUES('02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { name = "01" }, new tbioudb022 { name = "02" }, new tbioudb022 { name = "03" }, new tbioudb022 { name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbioudb022(name)
+SELECT * FROM (
+ SELECT '01' FROM dual 
+UNION ALL
+ SELECT '02' FROM dual 
+UNION ALL
+ SELECT '03' FROM dual 
+UNION ALL
+ SELECT '04' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { name = "001" }, new tbioudb022 { name = "002" }, new tbioudb022 { name = "003" }, new tbioudb022 { name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbioudb022(name)
+SELECT * FROM (
+ SELECT '001' FROM dual 
+UNION ALL
+ SELECT '002' FROM dual 
+UNION ALL
+ SELECT '003' FROM dual 
+UNION ALL
+ SELECT '004' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            //--no primary and yes
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "100001" }, new tbioudb022 { name = "00001" }, new tbioudb022 { id = 2, name = "100002" }, new tbioudb022 { name = "00002" }, new tbioudb022 { id = 3, name = "100003" }, new tbioudb022 { name = "00003" }, new tbioudb022 { id = 4, name = "100004" }, new tbioudb022 { name = "00004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb022 t1 
+USING (SELECT 1 as id, '100001' as name FROM dual 
+UNION ALL
+ SELECT 2, '100002' FROM dual 
+UNION ALL
+ SELECT 3, '100003' FROM dual 
+UNION ALL
+ SELECT 4, '100004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)
+
+;
+
+INSERT INTO tbioudb022(name)
+SELECT * FROM (
+ SELECT '00001' FROM dual 
+UNION ALL
+ SELECT '00002' FROM dual 
+UNION ALL
+ SELECT '00003' FROM dual 
+UNION ALL
+ SELECT '00004' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            //Assert.Equal(4, lst.Where(a => a.name == "10000" + a.id).Count());
+        }
+        class tbioudb022
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_TwoPrimary()
+        {
+            fsql.Delete<tbioudb03>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb03 t1 
+USING (SELECT 1 as id1, '01' as id2, '01' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb03 t1 
+USING (SELECT 1 as id1, '01' as id2, '011' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 2, id2 = "02", name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb03 t1 
+USING (SELECT 2 as id1, '02' as id2, '02' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "01" }, new tbioudb03 { id1 = 2, id2 = "02", name = "02" }, new tbioudb03 { id1 = 3, id2 = "03", name = "03" }, new tbioudb03 { id1 = 4, id2 = "04", name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb03 t1 
+USING (SELECT 1 as id1, '01' as id2, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02', '02' FROM dual 
+UNION ALL
+ SELECT 3, '03', '03' FROM dual 
+UNION ALL
+ SELECT 4, '04', '04' FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "001" }, new tbioudb03 { id1 = 2, id2 = "02", name = "002" }, new tbioudb03 { id1 = 3, id2 = "03", name = "003" }, new tbioudb03 { id1 = 4, id2 = "04", name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb03 t1 
+USING (SELECT 1 as id1, '01' as id2, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '02', '002' FROM dual 
+UNION ALL
+ SELECT 3, '03', '003' FROM dual 
+UNION ALL
+ SELECT 4, '04', '004' FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id1).Count());
+        }
+        class tbioudb03
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string id2 { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndVersionAndCanUpdate()
+        {
+            fsql.Delete<tbioudb04>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb04 t1 
+USING (SELECT 1 as id, '01' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb04 t1 
+USING (SELECT 1 as id, '011' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb04 t1 
+USING (SELECT 2 as id, '02' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "01" }, new tbioudb04 { id = 2, name = "02" }, new tbioudb04 { id = 3, name = "03" }, new tbioudb04 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb04 t1 
+USING (SELECT 1 as id, '01' as name, 0 as version, current as CreateTime FROM dual 
+UNION ALL
+ SELECT 2, '02', 0, current FROM dual 
+UNION ALL
+ SELECT 3, '03', 0, current FROM dual 
+UNION ALL
+ SELECT 4, '04', 0, current FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "001" }, new tbioudb04 { id = 2, name = "002" }, new tbioudb04 { id = 3, name = "003" }, new tbioudb04 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbioudb04 t1 
+USING (SELECT 1 as id, '001' as name, 0 as version, current as CreateTime FROM dual 
+UNION ALL
+ SELECT 2, '002', 0, current FROM dual 
+UNION ALL
+ SELECT 3, '003', 0, current FROM dual 
+UNION ALL
+ SELECT 4, '004', 0, current FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+        }
+        class tbioudb04
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+            [Column(IsVersion = true)]
+            public int version { get; set; }
+            [Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
+            public DateTime CreateTime { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateTest.cs
new file mode 100644
index 00000000..0adafe61
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertOrUpdateTest.cs
@@ -0,0 +1,479 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseInsertOrUpdateTest
+    {
+        IFreeSql fsql => g.gbase;
+
+        [Fact]
+        public void InsertOrUpdate_OnlyPrimary()
+        {
+            fsql.Delete<tbiou01>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou01 t1 
+USING (SELECT 1 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou01 t1 
+USING (SELECT 1 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 2 });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou01 t1 
+USING (SELECT 2 as id FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou01 t1 
+USING (SELECT 1 as id FROM dual 
+UNION ALL
+ SELECT 2 FROM dual 
+UNION ALL
+ SELECT 3 FROM dual 
+UNION ALL
+ SELECT 4 FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou01 t1 
+USING (SELECT 1 as id FROM dual 
+UNION ALL
+ SELECT 2 FROM dual 
+UNION ALL
+ SELECT 3 FROM dual 
+UNION ALL
+ SELECT 4 FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN NOT MATCHED THEN 
+  insert (id) 
+  values (t2.id)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+        }
+        class tbiou01
+        {
+            public int id { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimary()
+        {
+            fsql.Delete<tbiou02>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou02 t1 
+USING (SELECT 1 as id, '01' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou02 t1 
+USING (SELECT 1 as id, '011' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou02 t1 
+USING (SELECT 2 as id, '02' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "01" }, new tbiou02 { id = 2, name = "02" }, new tbiou02 { id = 3, name = "03" }, new tbiou02 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou02 t1 
+USING (SELECT 1 as id, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02' FROM dual 
+UNION ALL
+ SELECT 3, '03' FROM dual 
+UNION ALL
+ SELECT 4, '04' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "001" }, new tbiou02 { id = 2, name = "002" }, new tbiou02 { id = 3, name = "003" }, new tbiou02 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou02 t1 
+USING (SELECT 1 as id, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '002' FROM dual 
+UNION ALL
+ SELECT 3, '003' FROM dual 
+UNION ALL
+ SELECT 4, '004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+        }
+        class tbiou02
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndIdentity()
+        {
+            fsql.Delete<tbiou022>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 1 as id, '01' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 1 as id, '011' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 2 as id, '02' as name FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "01" }, new tbiou022 { id = 2, name = "02" }, new tbiou022 { id = 3, name = "03" }, new tbiou022 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 1 as id, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02' FROM dual 
+UNION ALL
+ SELECT 3, '03' FROM dual 
+UNION ALL
+ SELECT 4, '04' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "001" }, new tbiou022 { id = 2, name = "002" }, new tbiou022 { id = 3, name = "003" }, new tbiou022 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 1 as id, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '002' FROM dual 
+UNION ALL
+ SELECT 3, '003' FROM dual 
+UNION ALL
+ SELECT 4, '004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            //Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+
+            //--no primary
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "01" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbiou022(name) VALUES('01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbiou022(name) VALUES('011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbiou022(name) VALUES('02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { name = "01" }, new tbiou022 { name = "02" }, new tbiou022 { name = "03" }, new tbiou022 { name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbiou022(name)
+SELECT * FROM (
+ SELECT '01' FROM dual 
+UNION ALL
+ SELECT '02' FROM dual 
+UNION ALL
+ SELECT '03' FROM dual 
+UNION ALL
+ SELECT '04' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { name = "001" }, new tbiou022 { name = "002" }, new tbiou022 { name = "003" }, new tbiou022 { name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO tbiou022(name)
+SELECT * FROM (
+ SELECT '001' FROM dual 
+UNION ALL
+ SELECT '002' FROM dual 
+UNION ALL
+ SELECT '003' FROM dual 
+UNION ALL
+ SELECT '004' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            //--no primary and yes
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "100001" }, new tbiou022 { name = "00001" }, new tbiou022 { id = 2, name = "100002" }, new tbiou022 { name = "00002" }, new tbiou022 { id = 3, name = "100003" }, new tbiou022 { name = "00003" }, new tbiou022 { id = 4, name = "100004" }, new tbiou022 { name = "00004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou022 t1 
+USING (SELECT 1 as id, '100001' as name FROM dual 
+UNION ALL
+ SELECT 2, '100002' FROM dual 
+UNION ALL
+ SELECT 3, '100003' FROM dual 
+UNION ALL
+ SELECT 4, '100004' FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id, name) 
+  values (t2.id, t2.name)
+
+;
+
+INSERT INTO tbiou022(name)
+SELECT * FROM (
+ SELECT '00001' FROM dual 
+UNION ALL
+ SELECT '00002' FROM dual 
+UNION ALL
+ SELECT '00003' FROM dual 
+UNION ALL
+ SELECT '00004' FROM dual
+) ftbtmp", sql);
+            Assert.Equal(8, iou.ExecuteAffrows());
+            lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            //Assert.Equal(4, lst.Where(a => a.name == "10000" + a.id).Count());
+        }
+        class tbiou022
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_TwoPrimary()
+        {
+            fsql.Delete<tbiou03>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou03 t1 
+USING (SELECT 1 as id1, '01' as id2, '01' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou03 t1 
+USING (SELECT 1 as id1, '01' as id2, '011' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 2, id2 = "02", name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou03 t1 
+USING (SELECT 2 as id1, '02' as id2, '02' as name FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "01" }, new tbiou03 { id1 = 2, id2 = "02", name = "02" }, new tbiou03 { id1 = 3, id2 = "03", name = "03" }, new tbiou03 { id1 = 4, id2 = "04", name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou03 t1 
+USING (SELECT 1 as id1, '01' as id2, '01' as name FROM dual 
+UNION ALL
+ SELECT 2, '02', '02' FROM dual 
+UNION ALL
+ SELECT 3, '03', '03' FROM dual 
+UNION ALL
+ SELECT 4, '04', '04' FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "001" }, new tbiou03 { id1 = 2, id2 = "02", name = "002" }, new tbiou03 { id1 = 3, id2 = "03", name = "003" }, new tbiou03 { id1 = 4, id2 = "04", name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou03 t1 
+USING (SELECT 1 as id1, '01' as id2, '001' as name FROM dual 
+UNION ALL
+ SELECT 2, '02', '002' FROM dual 
+UNION ALL
+ SELECT 3, '03', '003' FROM dual 
+UNION ALL
+ SELECT 4, '04', '004' FROM dual ) t2 ON (t1.id1 = t2.id1 AND t1.id2 = t2.id2) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name 
+WHEN NOT MATCHED THEN 
+  insert (id1, id2, name) 
+  values (t2.id1, t2.id2, t2.name)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id1).Count());
+        }
+        class tbiou03
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string id2 { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndVersionAndCanUpdate()
+        {
+            fsql.Delete<tbiou04>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou04 t1 
+USING (SELECT 1 as id, '01' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name, t1.version = t1.version + 1 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou04 t1 
+USING (SELECT 1 as id, '011' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name, t1.version = t1.version + 1 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou04 t1 
+USING (SELECT 2 as id, '02' as name, 0 as version, current as CreateTime FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name, t1.version = t1.version + 1 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "01" }, new tbiou04 { id = 2, name = "02" }, new tbiou04 { id = 3, name = "03" }, new tbiou04 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou04 t1 
+USING (SELECT 1 as id, '01' as name, 0 as version, current as CreateTime FROM dual 
+UNION ALL
+ SELECT 2, '02', 0, current FROM dual 
+UNION ALL
+ SELECT 3, '03', 0, current FROM dual 
+UNION ALL
+ SELECT 4, '04', 0, current FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name, t1.version = t1.version + 1 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "001" }, new tbiou04 { id = 2, name = "002" }, new tbiou04 { id = 3, name = "003" }, new tbiou04 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"MERGE INTO tbiou04 t1 
+USING (SELECT 1 as id, '001' as name, 0 as version, current as CreateTime FROM dual 
+UNION ALL
+ SELECT 2, '002', 0, current FROM dual 
+UNION ALL
+ SELECT 3, '003', 0, current FROM dual 
+UNION ALL
+ SELECT 4, '004', 0, current FROM dual ) t2 ON (t1.id = t2.id) 
+WHEN MATCHED THEN 
+  update set t1.name = t2.name, t1.version = t1.version + 1 
+WHEN NOT MATCHED THEN 
+  insert (id, name, version, CreateTime) 
+  values (t2.id, t2.name, t2.version, t2.CreateTime)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+        }
+        class tbiou04
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+            [Column(IsVersion = true)]
+            public int version { get; set; }
+            [Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
+            public DateTime CreateTime { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertTest.cs
new file mode 100644
index 00000000..f84021d8
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseInsertTest.cs
@@ -0,0 +1,439 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseInsertTest
+    {
+
+        IInsert<Topic> insert => g.gbase.Insert<Topic>();
+
+        [Table(Name = "TB_TOPIC_INSERT")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void AppendData()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items.First()).ToSql();
+            Assert.Equal("INSERT INTO TB_TOPIC_INSERT(Clicks, Title, CreateTime) VALUES(0, 'newtitle0', '0001-01-01 00:00:00.000')", sql);
+
+            sql = insert.AppendData(items).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Clicks, Title, CreateTime)
+SELECT * FROM (
+ SELECT 0, 'newtitle0', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 100, 'newtitle1', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 200, 'newtitle2', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 300, 'newtitle3', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 400, 'newtitle4', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 500, 'newtitle5', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 600, 'newtitle6', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 700, 'newtitle7', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 800, 'newtitle8', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 900, 'newtitle9', '0001-01-01 00:00:00.000' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Title)
+SELECT * FROM (
+ SELECT 'newtitle0' FROM dual 
+UNION ALL
+ SELECT 'newtitle1' FROM dual 
+UNION ALL
+ SELECT 'newtitle2' FROM dual 
+UNION ALL
+ SELECT 'newtitle3' FROM dual 
+UNION ALL
+ SELECT 'newtitle4' FROM dual 
+UNION ALL
+ SELECT 'newtitle5' FROM dual 
+UNION ALL
+ SELECT 'newtitle6' FROM dual 
+UNION ALL
+ SELECT 'newtitle7' FROM dual 
+UNION ALL
+ SELECT 'newtitle8' FROM dual 
+UNION ALL
+ SELECT 'newtitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newtitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newtitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newtitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newtitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newtitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newtitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newtitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newtitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newtitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newtitle9' FROM dual
+) ftbtmp", sql);
+        }
+
+        [Fact]
+        public void InsertColumns()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Title)
+SELECT * FROM (
+ SELECT 'newtitle0' FROM dual 
+UNION ALL
+ SELECT 'newtitle1' FROM dual 
+UNION ALL
+ SELECT 'newtitle2' FROM dual 
+UNION ALL
+ SELECT 'newtitle3' FROM dual 
+UNION ALL
+ SELECT 'newtitle4' FROM dual 
+UNION ALL
+ SELECT 'newtitle5' FROM dual 
+UNION ALL
+ SELECT 'newtitle6' FROM dual 
+UNION ALL
+ SELECT 'newtitle7' FROM dual 
+UNION ALL
+ SELECT 'newtitle8' FROM dual 
+UNION ALL
+ SELECT 'newtitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => new { a.Title, a.Clicks }).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newtitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newtitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newtitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newtitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newtitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newtitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newtitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newtitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newtitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newtitle9' FROM dual
+) ftbtmp", sql);
+        }
+        [Fact]
+        public void IgnoreColumns()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newtitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newtitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newtitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newtitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newtitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newtitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newtitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newtitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newtitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newtitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => new { a.Title, a.CreateTime }).ToSql();
+            Assert.Equal(@"INSERT INTO TB_TOPIC_INSERT(Clicks)
+SELECT * FROM (
+ SELECT 0 FROM dual 
+UNION ALL
+ SELECT 100 FROM dual 
+UNION ALL
+ SELECT 200 FROM dual 
+UNION ALL
+ SELECT 300 FROM dual 
+UNION ALL
+ SELECT 400 FROM dual 
+UNION ALL
+ SELECT 500 FROM dual 
+UNION ALL
+ SELECT 600 FROM dual 
+UNION ALL
+ SELECT 700 FROM dual 
+UNION ALL
+ SELECT 800 FROM dual 
+UNION ALL
+ SELECT 900 FROM dual
+) ftbtmp", sql);
+
+            g.gbase.Delete<TopicIgnore>().Where("1=1").ExecuteAffrows();
+            var itemsIgnore = new List<TopicIgnore>();
+            for (var a = 0; a < 2072; a++) itemsIgnore.Add(new TopicIgnore { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
+            g.gbase.Insert<TopicIgnore>().AppendData(itemsIgnore).IgnoreColumns(a => new { a.Title }).ExecuteAffrows();
+            Assert.Equal(2072, itemsIgnore.Count);
+            Assert.Equal(2072, g.gbase.Select<TopicIgnore>().Where(a => a.Title == null).Count());
+        }
+        [Table(Name = "TB_TOPICIGNORECOLUMNS")]
+        class TopicIgnore
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows());
+            Assert.Equal(10, insert.NoneParameter().AppendData(items).ExecuteAffrows());
+
+            Assert.Equal(10, g.gbase.Select<Topic>().Limit(10).InsertInto(null, a => new Topic
+            {
+                Title = a.Title
+            }));
+        }
+        [Fact]
+        public void ExecuteIdentity()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            Assert.NotEqual(0, insert.AppendData(items.First()).ExecuteIdentity());
+        }
+        [Fact]
+        public void ExecuteInserted()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            Assert.Throws<NotImplementedException>(() => insert.AppendData(items.First()).ExecuteInserted());
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items.First()).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO Topic_InsertAsTable(Clicks, Title, CreateTime) VALUES(0, 'newTitle0', '0001-01-01 00:00:00.000')", sql);
+            
+            sql = insert.AppendData(items).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Clicks, Title, CreateTime)
+SELECT * FROM (
+ SELECT 0, 'newTitle0', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 100, 'newTitle1', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 200, 'newTitle2', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 300, 'newTitle3', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 400, 'newTitle4', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 500, 'newTitle5', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 600, 'newTitle6', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 700, 'newTitle7', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 800, 'newTitle8', '0001-01-01 00:00:00.000' FROM dual 
+UNION ALL
+ SELECT 900, 'newTitle9', '0001-01-01 00:00:00.000' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Title)
+SELECT * FROM (
+ SELECT 'newTitle0' FROM dual 
+UNION ALL
+ SELECT 'newTitle1' FROM dual 
+UNION ALL
+ SELECT 'newTitle2' FROM dual 
+UNION ALL
+ SELECT 'newTitle3' FROM dual 
+UNION ALL
+ SELECT 'newTitle4' FROM dual 
+UNION ALL
+ SELECT 'newTitle5' FROM dual 
+UNION ALL
+ SELECT 'newTitle6' FROM dual 
+UNION ALL
+ SELECT 'newTitle7' FROM dual 
+UNION ALL
+ SELECT 'newTitle8' FROM dual 
+UNION ALL
+ SELECT 'newTitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newTitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newTitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newTitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newTitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newTitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newTitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newTitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newTitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newTitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newTitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Title)
+SELECT * FROM (
+ SELECT 'newTitle0' FROM dual 
+UNION ALL
+ SELECT 'newTitle1' FROM dual 
+UNION ALL
+ SELECT 'newTitle2' FROM dual 
+UNION ALL
+ SELECT 'newTitle3' FROM dual 
+UNION ALL
+ SELECT 'newTitle4' FROM dual 
+UNION ALL
+ SELECT 'newTitle5' FROM dual 
+UNION ALL
+ SELECT 'newTitle6' FROM dual 
+UNION ALL
+ SELECT 'newTitle7' FROM dual 
+UNION ALL
+ SELECT 'newTitle8' FROM dual 
+UNION ALL
+ SELECT 'newTitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => new { a.Title, a.Clicks }).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newTitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newTitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newTitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newTitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newTitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newTitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newTitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newTitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newTitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newTitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Clicks, Title)
+SELECT * FROM (
+ SELECT 0, 'newTitle0' FROM dual 
+UNION ALL
+ SELECT 100, 'newTitle1' FROM dual 
+UNION ALL
+ SELECT 200, 'newTitle2' FROM dual 
+UNION ALL
+ SELECT 300, 'newTitle3' FROM dual 
+UNION ALL
+ SELECT 400, 'newTitle4' FROM dual 
+UNION ALL
+ SELECT 500, 'newTitle5' FROM dual 
+UNION ALL
+ SELECT 600, 'newTitle6' FROM dual 
+UNION ALL
+ SELECT 700, 'newTitle7' FROM dual 
+UNION ALL
+ SELECT 800, 'newTitle8' FROM dual 
+UNION ALL
+ SELECT 900, 'newTitle9' FROM dual
+) ftbtmp", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => new { a.Title, a.CreateTime }).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal(@"INSERT INTO Topic_InsertAsTable(Clicks)
+SELECT * FROM (
+ SELECT 0 FROM dual 
+UNION ALL
+ SELECT 100 FROM dual 
+UNION ALL
+ SELECT 200 FROM dual 
+UNION ALL
+ SELECT 300 FROM dual 
+UNION ALL
+ SELECT 400 FROM dual 
+UNION ALL
+ SELECT 500 FROM dual 
+UNION ALL
+ SELECT 600 FROM dual 
+UNION ALL
+ SELECT 700 FROM dual 
+UNION ALL
+ SELECT 800 FROM dual 
+UNION ALL
+ SELECT 900 FROM dual
+) ftbtmp", sql);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseSelectTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseSelectTest.cs
new file mode 100644
index 00000000..5fa9883a
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseSelectTest.cs
@@ -0,0 +1,1850 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseSelectTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic22")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        class TopicInserts
+        {
+            public Guid Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        public partial class Song
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+            public DateTime? Create_time { get; set; }
+            public bool? Is_deleted { get; set; }
+            public string Title { get; set; }
+            public string Url { get; set; }
+
+            public virtual ICollection<Tag> Tags { get; set; }
+        }
+        public partial class Song_tag
+        {
+            public int Song_id { get; set; }
+            public virtual Song Song { get; set; }
+
+            public int Tag_id { get; set; }
+            public virtual Tag Tag { get; set; }
+        }
+        public partial class Tag
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+            public int? Parent_id { get; set; }
+            public virtual Tag Parent { get; set; }
+
+            public decimal? Ddd { get; set; }
+            public string Name { get; set; }
+
+            public virtual ICollection<Song> Songs { get; set; }
+            public virtual ICollection<Tag> Tags { get; set; }
+        }
+
+        [Fact]
+        public void AsSelect()
+        {
+            //OneToOne、ManyToOne
+            var t0 = g.gbase.Select<Tag>().Where(a => a.Parent.Parent.Name == "粤语").ToSql();
+            Assert.Equal(@"SELECT a.Id, a.Parent_id, a__Parent.Id as3, a__Parent.Parent_id as4, a__Parent.Ddd, a__Parent.Name, a.Ddd as7, a.Name as8 
+FROM Tag a 
+LEFT JOIN Tag a__Parent ON a__Parent.Id = a.Parent_id 
+LEFT JOIN Tag a__Parent__Parent ON a__Parent__Parent.Id = a__Parent.Parent_id 
+WHERE (a__Parent__Parent.Name = '粤语')", t0);
+
+            //OneToMany
+            var t1 = g.gbase.Select<Tag>().Where(a => a.Tags.AsSelect().Any(t => t.Parent.Id == 10)).ToSql();
+            Assert.Equal(@"SELECT a.Id, a.Parent_id, a.Ddd, a.Name 
+FROM Tag a 
+WHERE (exists(SELECT FIRST 1 1 
+    FROM Tag t 
+    LEFT JOIN Tag t__Parent ON t__Parent.Id = t.Parent_id 
+    WHERE (t__Parent.Id = 10) AND (t.Parent_id = a.Id)))", t1);
+
+            //ManyToMany
+            var t2 = g.gbase.Select<Song>().Where(s => s.Tags.AsSelect().Any(t => t.Name == "国语")).ToSql();
+            Assert.Equal(@"SELECT a.Id, a.Create_time, a.Is_deleted, a.Title, a.Url 
+FROM Song a 
+WHERE (exists(SELECT FIRST 1 1 
+    FROM Song_tag Mt_Ms 
+    WHERE (Mt_Ms.Song_id = a.Id) AND (exists(SELECT FIRST 1 1 
+        FROM Tag t 
+        WHERE (t.Name = '国语') AND (t.Id = Mt_Ms.Tag_id)))))", t2);
+        }
+
+        [Fact]
+        public void Lazy()
+        {
+            var tags = g.gbase.Select<Tag>().Where(a => a.Parent.Name == "xxx")
+                .LeftJoin(a => a.Parent_id == a.Parent.Id)
+                .ToSql();
+
+            var songs = g.gbase.Select<Song>().Limit(10).ToList();
+        }
+
+        [Fact]
+        public void ToDataTable()
+        {
+            var items = new List<TopicInserts>();
+            for (var a = 0; a < 11; a++) items.Add(new TopicInserts { Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
+
+            //Assert.Equal(1, g.firebird.Insert<TopicInserts>().AppendData(items.First()).ExecuteAffrows());
+            Assert.Equal(11, g.gbase.Insert<TopicInserts>().AppendData(items).ExecuteAffrows());
+
+            //items = Enumerable.Range(0, 9989).Select(a => new TopicInserts { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList();
+            //Assert.Equal(9989, g.firebird.Insert<TopicInserts>(items).ExecuteAffrows());
+
+            var dt1 = select.Limit(10).ToDataTable();
+            var dt2 = select.Limit(10).ToDataTable("id, 111222");
+            var dt3 = select.Limit(10).ToDataTable(a => new { a.Id, a.Type.Name, now = DateTime.Now });
+        }
+        class TestDto
+        {
+            public int id { get; set; }
+            public string name { get; set; } //这是join表的属性
+            public int ParentId { get; set; } //这是join表的属性
+        }
+        class TestDto2
+        {
+            public int id { get; set; }
+            public string name { get; set; } //这是join表的属性
+            public int ParentId { get; set; } //这是join表的属性
+
+            public TestDto2() { }
+            public TestDto2(int id, string name)
+            {
+                this.id = id;
+                this.name = name;
+            }
+        }
+        [Fact]
+        public void ToList()
+        {
+
+            var testDto1 = select.Limit(10).ToList(a => new TestDto { id = a.Id, name = a.Title });
+            var testDto2 = select.Limit(10).ToList(a => new TestDto());
+            var testDto3 = select.Limit(10).ToList(a => new TestDto { });
+            var testDto4 = select.Limit(10).ToList(a => new TestDto() { });
+
+            var testDto11 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto { id = a.Id, name = a.Title });
+            var testDto22 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto());
+            var testDto33 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto { });
+            var testDto44 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto() { });
+
+            var testDto211 = select.Limit(10).ToList(a => new TestDto2(a.Id, a.Title));
+            var testDto212 = select.Limit(10).ToList(a => new TestDto2());
+            var testDto213 = select.Limit(10).ToList(a => new TestDto2 { });
+            var testDto214 = select.Limit(10).ToList(a => new TestDto2() { });
+            var testDto215 = select.Limit(10).ToList<TestDto2>();
+
+            var testDto2211 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2(a.Id, a.Title));
+            var testDto2222 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2());
+            var testDto2233 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2 { });
+            var testDto2244 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2() { });
+            var testDto2255 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList<TestDto2>();
+
+            g.gbase.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
+            var testGuidId5 = g.gbase.Select<TestGuidIdToList>().ToList();
+            var testGuidId6 = g.gbase.Select<TestGuidIdToList>().ToList(a => a.id);
+
+            var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
+            var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
+
+            g.gbase.Delete<District>().Where("1=1").ExecuteAffrows();
+            var repo = g.gbase.GetRepository<District>();
+            repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
+            repo.Insert(new District
+            {
+                Code = "001",
+                Name = "001_name",
+                Childs = new List<District>(new[] {
+                    new District{
+                        Code = "001_01",
+                        Name = "001_01_name"
+                    },
+                    new District{
+                        Code = "001_02",
+                        Name = "001_02_name"
+                    }
+                })
+            });
+            var ddd = g.gbase.Select<District>().LeftJoin(d => d.ParentCode == d.Parent.Code).ToTreeList();
+            Assert.Single(ddd);
+            Assert.Equal(2, ddd[0].Childs.Count);
+        }
+        public class District
+        {
+            [Column(IsPrimary = true, StringLength = 6)]
+            public string Code { get; set; }
+
+            [Column(StringLength = 20, IsNullable = false)]
+            public string Name { get; set; }
+
+            [Column(StringLength = 6)]
+            public string ParentCode { get; set; }
+
+            [Navigate(nameof(ParentCode))]
+            public District Parent { get; set; }
+
+            [Navigate(nameof(ParentCode))]
+            public List<District> Childs { get; set; }
+        }
+        [Fact]
+        public void ToDictionary()
+        {
+            g.gbase.Insert(new Topic { Title = "xxx" }).ExecuteAffrows();
+            var testDto1 = select.Limit(10).ToDictionary(a => a.Id);
+            var testDto2 = select.Limit(10).ToDictionary(a => a.Id, a => new { a.Id, a.Title });
+
+            var repo = g.gbase.GetRepository<Topic>();
+            var dic = repo.Select.Limit(10).ToDictionary(a => a.Id);
+            var first = dic.First().Value;
+            first.Clicks++;
+            repo.Update(first);
+        }
+        class TestGuidIdToList
+        {
+            public Guid id { get; set; }
+            public string title { get; set; } = Guid.NewGuid().ToString();
+        }
+        [Fact]
+        public void ToOne()
+        {
+            var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+            Assert.Equal(default(DateTime), testnotfind);
+        }
+        [Fact]
+        public void ToSql()
+        {
+        }
+        [Fact]
+        public void Any()
+        {
+            var count = select.Where(a => 1 == 1).Count();
+            Assert.False(select.Where(a => 1 == 2).Any());
+            Assert.Equal(count > 0, select.Where(a => 1 == 1).Any());
+
+            var sql2222 = select.Where(a =>
+                select.Where(b => b.Id == a.Id &&
+                    select.Where(c => c.Id == b.Id).Where(d => d.Id == a.Id).Where(e => e.Id == b.Id)
+                    //.Offset(a.Id)
+                    .Any()
+                ).Any(c => c.Id == a.Id + 10)
+            );
+            var sql2222Tolist = sql2222.ToList();
+
+            var collectionSelect = select.Where(a =>
+                a.Type.Guid == a.TypeGuid &&
+                a.Type.Parent.Id == a.Type.ParentId &&
+                a.Type.Parent.Types.AsSelect().Where(b => b.Name == a.Title).Any(b => b.ParentId == a.Type.Parent.Id)
+            );
+            collectionSelect.ToList();
+        }
+        [Fact]
+        public void Count()
+        {
+            var count = select.Where(a => 1 == 1).Count();
+            select.Where(a => 1 == 1).Count(out var count2);
+            Assert.Equal(count, count2);
+            Assert.Equal(0, select.Where(a => 1 == 2).Count());
+
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.Where(b => b.Id > 0 && b.Id == a.Id).Count()
+            });
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.Where(b => b.Id > 0 && b.Id == a.Id).Count()
+            });
+        }
+        [Fact]
+        public void Master()
+        {
+            Assert.StartsWith(" SELECT", select.Master().Where(a => 1 == 1).ToSql());
+        }
+        [Fact]
+        public void From()
+        {
+            var query2 = select.From<TestTypeInfo>((s, b) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                );
+            var sql2 = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b ON a.TypeGuid = b.Guid", sql2);
+            query2.ToList();
+
+            var query3 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id)
+                );
+            var sql3 = query3.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b ON a.TypeGuid = b.Guid LEFT JOIN TestTypeParentInfo c ON b.ParentId = c.Id", sql3);
+            query3.ToList();
+        }
+        [Fact]
+        public void LeftJoin()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //���û�е�������
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b ON b.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b ON b.Guid = a.TypeGuid AND b.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //�������
+            query = select
+                .LeftJoin(a => a.Type.Guid == a.TypeGuid)
+                .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            query = select
+                .LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .LeftJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentInfo c ON c.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b ON a.TypeGuid = b.Guid LEFT JOIN TestTypeParentInfo c ON b.ParentId = c.Id", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.LeftJoin("TestTypeInfo b on b.Guid = a.TypeGuid");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo b on b.Guid = a.TypeGuid", sql);
+            query.ToList();
+        }
+        [Fact]
+        public void InnerJoin()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //���û�е�������
+            query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo b ON b.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo b ON b.Guid = a.TypeGuid AND b.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.InnerJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //�������
+            query = select
+                .InnerJoin(a => a.Type.Guid == a.TypeGuid)
+                .InnerJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid INNER JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            query = select
+                .InnerJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .InnerJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid INNER JOIN TestTypeParentInfo c ON c.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .InnerJoin(a => a.TypeGuid == b.Guid)
+                 .InnerJoin(a => b.ParentId == c.Id));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo b ON a.TypeGuid = b.Guid INNER JOIN TestTypeParentInfo c ON b.ParentId = c.Id", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.InnerJoin("TestTypeInfo b on b.Guid = a.TypeGuid");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a INNER JOIN TestTypeInfo b on b.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+        }
+        [Fact]
+        public void RightJoin()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.RightJoin(a => a.Type.Guid == a.TypeGuid);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.RightJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.RightJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //���û�е�������
+            query = select.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo b ON b.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+            query = select.RightJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo b ON b.Guid = a.TypeGuid AND b.Name = 'xxx'", sql);
+            query.ToList();
+
+            query = select.RightJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+            query.ToList();
+
+            //�������
+            query = select
+                .RightJoin(a => a.Type.Guid == a.TypeGuid)
+                .RightJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid RIGHT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            query = select
+                .RightJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .RightJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid RIGHT JOIN TestTypeParentInfo c ON c.Id = a__Type.ParentId", sql);
+            query.ToList();
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .RightJoin(a => a.TypeGuid == b.Guid)
+                 .RightJoin(a => b.ParentId == c.Id));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo b ON a.TypeGuid = b.Guid RIGHT JOIN TestTypeParentInfo c ON b.ParentId = c.Id", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.RightJoin("TestTypeInfo b on b.Guid = a.TypeGuid");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a RIGHT JOIN TestTypeInfo b on b.Guid = a.TypeGuid", sql);
+            query.ToList();
+
+        }
+        [Fact]
+        public void Where()
+        {
+            var sqltmp1 = select.Where(a => a.Id == 0 && (a.Title == "x" || a.Title == "y") && a.Clicks == 1).ToSql();
+            var sqltmp2 = select.Where(a => a.Id.Equals(true) && (a.Title.Equals("x") || a.Title.Equals("y")) && a.Clicks.Equals(1)).ToSql();
+            var sqltmp3 = select.Where(a => a.Id == 0).Where(a => ((a.Title == "x" && a.Title == "z") || a.Title == "y")).ToSql();
+
+            var sqltmp4 = select.Where(a => (a.Id - 10) / 2 > 0).ToSql();
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.Where(a => a.Id == 10);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Id = 10)", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE ((a.Id = 10 AND a.Id > 10 OR a.Clicks > 100))", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Id == 10).Where(a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Id = 10) AND (a.Clicks > 100)", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid WHERE (a__Type.Name = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid WHERE (a__Type.Name = 'typeTitle' AND a__Type.Guid = a.TypeGuid)", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Name = 'tparent')", sql);
+            query.ToList();
+
+            //���û�е������ԣ��򵥶������
+            query = select.Where<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeInfo b WHERE (b.Guid = a.TypeGuid AND b.Name = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.Where<TestTypeInfo>((a, b) => b.Name == "typeTitle" && b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeInfo b WHERE (b.Name = 'typeTitle' AND b.Guid = a.TypeGuid)", sql);
+            query.ToList();
+
+            query = select.Where<TestTypeInfo, TestTypeParentInfo>((a, b, c) => c.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeParentInfo c WHERE (c.Name = 'tparent')", sql);
+            query.ToList();
+
+            //����һ�� From ��Ķ������
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .Where(a => a.Id == 10 && c.Name == "xxx")
+                .Where(a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeInfo b, TestTypeParentInfo c WHERE (a.Id = 10 AND c.Name = 'xxx') AND (b.ParentId = 20)", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.Where("a.Clicks > 100 and a.Id = ?", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Clicks > 100 and a.Id = ?)", sql);
+            query.ToList();
+        }
+        [Fact]
+        public void WhereIf()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.WhereIf(true, a => a.Id == 10);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Id = 10)", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE ((a.Id = 10 AND a.Id > 10 OR a.Clicks > 100))", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Id == 10).WhereIf(true, a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Id = 10) AND (a.Clicks > 100)", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid WHERE (a__Type.Name = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid WHERE (a__Type.Name = 'typeTitle' AND a__Type.Guid = a.TypeGuid)", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22 a LEFT JOIN TestTypeInfo a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentInfo a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Name = 'tparent')", sql);
+            query.ToList();
+
+            //����һ�� From ��Ķ������
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .WhereIf(true, a => a.Id == 10 && c.Name == "xxx")
+                .WhereIf(true, a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeInfo b, TestTypeParentInfo c WHERE (a.Id = 10 AND c.Name = 'xxx') AND (b.ParentId = 20)", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.WhereIf(true, "a.Clicks > 100 and a.Id = ?", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a WHERE (a.Clicks > 100 and a.Id = ?)", sql);
+            query.ToList();
+
+            // ==========================================WhereIf(false)
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            query = select.WhereIf(false, a => a.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            query = select.WhereIf(false, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            query = select.WhereIf(false, a => a.Id == 10).WhereIf(false, a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            query = select.WhereIf(false, a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            query = select.WhereIf(false, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            query = select.WhereIf(false, a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+
+            //����һ�� From ��Ķ������
+            query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .WhereIf(false, a => a.Id == 10 && c.Name == "xxx")
+                .WhereIf(false, a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a, TestTypeInfo b, TestTypeParentInfo c", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.WhereIf(false, "a.Clicks > 100 and a.Id = ?", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a", sql);
+            query.ToList();
+        }
+        [Fact]
+        public void WhereExists()
+        {
+            var sql2222 = select.Where(a => select.Where(b => b.Id == a.Id).Any()).ToList();
+
+            sql2222 = select.Where(a =>
+                select.Where(b => b.Id == a.Id && select.Where(c => c.Id == b.Id).Where(d => d.Id == a.Id).Where(e => e.Id == b.Id)
+
+                //.Offset(a.Id)
+
+                .Any()
+                ).Any()
+            ).ToList();
+        }
+
+        [Table(Name = "TestInfoT1")]
+        class TestInfo
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void GroupBy()
+        {
+            //var groupby = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+            //    .Where(a => a.Id == 1)
+            //)
+            //.GroupBy((a, b, c) => new { tt2 = a.Title.Substring(0, 2), mod4 = a.Id % 4 })
+            //.Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
+            //.Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
+            //.OrderBy(a => a.Key.tt2)
+            //.OrderByDescending(a => a.Count())
+            //.Offset(10)
+            //.Limit(2)
+            //.Count(out var trycount)
+            //.ToList(a => new
+            //{
+            //    a.Key.tt2,
+            //    cou1 = a.Count(),
+            //    cou2 = a.Count(a.Value.Item3.Id),
+            //    arg1 = a.Avg(a.Key.mod4),
+            //    ccc2 = a.Key.tt2 ?? "now()",
+            //    //ccc = Convert.ToDateTime("now()"), partby = Convert.ToDecimal("sum(num) over(PARTITION BY server_id,os,rid,chn order by id desc)")
+            //    ccc3 = a.Max(a.Value.Item3.Id)
+            //});
+
+            var testpid1 = g.gbase.Insert<TestTypeInfo>().AppendData(new TestTypeInfo { Name = "Name" + DateTime.Now.ToString("yyyyMMddHHmmss") }).ExecuteIdentity();
+            g.gbase.Insert<TestInfo>().AppendData(new TestInfo { Title = "Title" + DateTime.Now.ToString("yyyyMMddHHmmss"), CreateTime = DateTime.Now, TypeGuid = (int)testpid1 }).ExecuteAffrows();
+
+            var fkfjfj = select.GroupBy(a => a.Title)
+                .ToList(a => a.Sum(a.Value.TypeGuid));
+
+            var aggsql1 = select
+                .GroupBy(a => a.Title)
+                .ToSql(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist1 = select
+                .GroupBy(a => a.Title)
+                .ToList(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist11 = select
+                .GroupBy(a => a.Title)
+                .ToDictionary(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+
+            //var aggsql2 = select
+            //    .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+            //    .ToSql(b => new
+            //    {
+            //        b.Key.Title,
+            //        b.Key.yyyy,
+
+            //        cou = b.Count(),
+            //        sum2 = b.Sum(b.Value.TypeGuid)
+            //    });
+            //var aggtolist2 = select
+            //    .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+            //    .ToList(b => new
+            //    {
+            //        b.Key.Title,
+            //        b.Key.yyyy,
+
+            //        cou = b.Count(),
+            //        sum2 = b.Sum(b.Value.TypeGuid)
+            //    });
+            //var aggtolist22 = select
+            //    .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+            //    .ToDictionary(b => new
+            //    {
+            //        b.Key.Title,
+            //        b.Key.yyyy,
+
+            //        cou = b.Count(),
+            //        sum2 = b.Sum(b.Value.TypeGuid)
+            //    });
+
+            var aggsql3 = select
+                .GroupBy(a => a.Title)
+                .ToSql(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid),
+                    sum3 = b.Sum(b.Value.Type.Parent.Id)
+                });
+        }
+        [Fact]
+        public void ToAggregate()
+        {
+            var sql = select.ToAggregate(a => new { sum = a.Sum(a.Key.Id + 11.11), count = a.Count(), max = a.Max(a.Key.Id), min = a.Min(a.Key.Id) });
+        }
+        [Fact]
+        public void OrderBy()
+        {
+            //var sql = select.Offset(10).OrderBy(a => new Random().NextDouble()).ToList();
+        }
+
+        [Fact]
+        public void Skip_Offset()
+        {
+            var sql = select.Offset(10).ToList();
+        }
+        [Fact]
+        public void Take_Limit()
+        {
+            var sql = select.Limit(10).ToList();
+        }
+        [Fact]
+        public void Page()
+        {
+            var sql1 = select.Page(1, 10).ToList();
+            var sql2 = select.Page(2, 10).ToList();
+            //var sql3 = select.Page(3, 10).ToList();
+
+            //var sql11 = select.OrderBy(a => new Random().NextDouble()).Page(1, 10).ToList();
+            //var sql22 = select.OrderBy(a => new Random().NextDouble()).Page(2, 10).ToList();
+            //var sql33 = select.OrderBy(a => new Random().NextDouble()).Page(3, 10).ToList();
+        }
+        [Fact]
+        public void Distinct()
+        {
+            var t1 = select.Distinct().ToList(a => a.Title);
+            var t2 = select.Distinct().Limit(10).ToList(a => a.Title);
+        }
+
+        [Fact]
+        public void Sum()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = (long)select.As("b").Sum(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.Id as1, a.Clicks as2, a.TypeGuid as3, a.Title as4, a.CreateTime as5, (SELECT sum(b.Id) 
+    FROM tb_topic22 b) as6 
+FROM tb_topic22 a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = (long)select.As("b").Sum(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Min()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Min(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.Id as1, a.Clicks as2, a.TypeGuid as3, a.Title as4, a.CreateTime as5, (SELECT min(b.Id) 
+    FROM tb_topic22 b) as6 
+FROM tb_topic22 a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Min(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Max()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Max(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.Id as1, a.Clicks as2, a.TypeGuid as3, a.Title as4, a.CreateTime as5, (SELECT max(b.Id) 
+    FROM tb_topic22 b) as6 
+FROM tb_topic22 a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Max(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Avg()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Avg(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.Id as1, a.Clicks as2, a.TypeGuid as3, a.Title as4, a.CreateTime as5, (SELECT avg(b.Id) 
+    FROM tb_topic22 b) as6 
+FROM tb_topic22 a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Avg(b => b.Id)
+            });
+        }
+        [Fact]
+        public void WhereIn()
+        {
+            var subquery = select.Where(a => select.As("b").ToList(b => b.Title).Contains(a.Id.ToString())).ToSql();
+            Assert.Equal(@"SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime 
+FROM tb_topic22 a 
+WHERE (((cast(a.Id as varchar(8000))) in (SELECT b.Title 
+    FROM tb_topic22 b)))", subquery);
+            var subqueryList = select.Where(a => select.As("b").ToList(b => b.Title).Contains(a.Id.ToString())).ToList();
+
+            subquery = select.Where(a => select.As("b").Limit(10).ToList(b => b.Title).Contains(a.Id.ToString())).ToSql();
+            Assert.Equal(@"SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime 
+FROM tb_topic22 a 
+WHERE (((cast(a.Id as varchar(8000))) in ( SELECT * FROM (SELECT FIRST 10 b.Title 
+    FROM tb_topic22 b) ftblmt50 )))", subquery);
+            subqueryList = select.Where(a => select.As("b").Limit(10).ToList(b => b.Title).Contains(a.Id.ToString())).ToList();
+        }
+        [Fact]
+        public void As()
+        {
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+
+            var listt = select.AsTable((a, b) => "(select * from tb_topic22 where clicks > 10)").Page(1, 10).ToList();
+
+            Func<Type, string, string> tableRule = (type, oldname) =>
+            {
+                if (oldname.Length > 16) oldname = oldname.Remove(16);
+                if (type == typeof(Topic)) return oldname + "_T1";
+                else if (type == typeof(TestTypeInfo)) return oldname + "_T2";
+                return oldname + "_AT";
+            };
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).AsTable(tableRule);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid", sql);
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx'", sql);
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentIn_AT a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+
+            //���û�е�������
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 b ON b.Guid = a.TypeGuid", sql);
+
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 b ON b.Guid = a.TypeGuid AND b.Name = 'xxx'", sql);
+
+            query = select.LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid AND a__Type.Name = 'xxx' LEFT JOIN TestTypeParentIn_AT a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId WHERE (a__Type__Parent.Id = 10)", sql);
+
+            //�������
+            query = select
+                .LeftJoin(a => a.Type.Guid == a.TypeGuid)
+                .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentIn_AT a__Type__Parent ON a__Type__Parent.Id = a__Type.ParentId", sql);
+
+            query = select
+                .LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .LeftJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a__Type.Guid, a__Type.ParentId, a__Type.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 a__Type ON a__Type.Guid = a.TypeGuid LEFT JOIN TestTypeParentIn_AT c ON c.Id = a__Type.ParentId", sql);
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id)).AsTable(tableRule);
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, b.Guid, b.ParentId, b.Name, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo_T2 b ON a.TypeGuid = b.Guid LEFT JOIN TestTypeParentIn_AT c ON b.ParentId = c.Id", sql);
+
+            //������϶����㲻��
+            query = select.LeftJoin("TestTypeInfo b on b.Guid = a.TypeGuid").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo b on b.Guid = a.TypeGuid", sql);
+
+            query = select.LeftJoin("TestTypeInfo b on b.Guid = a.TypeGuid and b.Name = ?", new { bname = "xxx" }).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22_T1 a LEFT JOIN TestTypeInfo b on b.Guid = a.TypeGuid and b.Name = ?", sql);
+
+            query = select.AsTable((_, old) => old).AsTable((_, old) => old);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT  * from (SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a) ftb UNION ALLSELECT  * from (SELECT a.Id, a.Clicks, a.TypeGuid, a.Title, a.CreateTime FROM tb_topic22 a) ftb", sql);
+            query.ToList();
+
+            query = select.AsTable((_, old) => old).AsTable((_, old) => old);
+            sql = query.ToSql("count(1) as1").Replace("\r\n", "");
+            Assert.Equal("SELECT  * from (SELECT count(1) as1 FROM tb_topic22 a) ftb UNION ALLSELECT  * from (SELECT count(1) as1 FROM tb_topic22 a) ftb", sql);
+            query.Count();
+
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Max(a => a.Id);
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Min(a => a.Id);
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Sum(a => a.Id);
+            //select.AsTable((_, old) => old).AsTable((_, old) => old).Avg(a => a.Id);
+
+            var sqlsss = select
+                .AsTable((type, old) => type == typeof(Topic) ? $"{old}_1" : null)
+                .AsTable((type, old) => type == typeof(Topic) ? $"{old}_2" : null)
+                .ToSql(a => new
+                {
+                    a.Id,
+                    a.Clicks
+                }, FieldAliasOptions.AsProperty);
+
+            var slsld3 = select
+                .AsTable((type, old) => type == typeof(Topic) ? $"({sqlsss})" : null)
+                .Page(1, 20)
+                .ToList(a => new
+                {
+                    a.Id,
+                    a.Clicks
+                });
+        }
+
+        public class TiOtmModel1
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public virtual TiOtmModel2 model2 { get; set; }
+
+            public string m1name { get; set; }
+        }
+        public class TiOtmModel2
+        {
+            [Column(IsPrimary = true)]
+            public int model2id { get; set; }
+            public virtual TiOtmModel1 model1 { get; set; }
+
+            public string m2setting { get; set; }
+
+            public List<TiOtmModel3> childs { get; set; }
+        }
+        public class TiOtmModel3
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+
+            public int model2111Idaaa { get; set; }
+            public string title { get; set; }
+
+            public List<TiOtmModel4> childs2 { get; set; }
+        }
+        public class TiOtmModel4
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+
+            public int model3333Id333 { get; set; }
+            public string title444 { get; set; }
+        }
+
+        [Fact]
+        public void Include_OneToMany()
+        {
+            var model1 = new TiOtmModel1 { m1name = DateTime.Now.Second.ToString() };
+            model1.id = (int)g.gbase.Insert(model1).ExecuteIdentity();
+            var model2 = new TiOtmModel2 { model2id = model1.id, m2setting = DateTime.Now.Second.ToString() };
+            g.gbase.Insert(model2).ExecuteAffrows();
+
+            var model3_1 = new TiOtmModel3 { model2111Idaaa = model1.id, title = "testmodel3__111" };
+            model3_1.id = (int)g.gbase.Insert(model3_1).ExecuteIdentity();
+            var model3_2 = new TiOtmModel3 { model2111Idaaa = model1.id, title = "testmodel3__222" };
+            model3_2.id = (int)g.gbase.Insert(model3_2).ExecuteIdentity();
+            var model3_3 = new TiOtmModel3 { model2111Idaaa = model1.id, title = "testmodel3__333" };
+            model3_3.id = (int)g.gbase.Insert(model3_2).ExecuteIdentity();
+
+            var model4s = new[] {
+                new TiOtmModel4{ model3333Id333 = model3_1.id, title444 = "testmodel3_4__111" },
+                new TiOtmModel4{ model3333Id333 = model3_1.id, title444 = "testmodel3_4__222" },
+                new TiOtmModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__111" },
+                new TiOtmModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__222" },
+                new TiOtmModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__333" }
+            };
+            Assert.Equal(5, g.gbase.Insert(model4s).ExecuteAffrows());
+
+            var t0 = g.gbase.Select<TiOtmModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+
+            var t1 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var t2 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var t00 = g.gbase.Select<TiOtmModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+
+            var t11 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var t22 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            //---- Select ----
+
+            var at0 = g.gbase.Select<TiOtmModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+
+            var at1 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var at2 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TiOtmModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var at00 = g.gbase.Select<TiOtmModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+
+            var at11 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+
+            var at22 = g.gbase.Select<TiOtmModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TiOtmModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TiOtmModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+        }
+
+        public class TiOtmModel11
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public int model2id { get; set; }
+            public string m3setting { get; set; }
+            public TiOtmModel22 model2 { get; set; }
+            public string m1name { get; set; }
+        }
+
+        public class TiOtmModel22
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string m2setting { get; set; }
+            public string aaa { get; set; }
+            public string bbb { get; set; }
+            public List<TiOtmModel33> childs { get; set; }
+        }
+        public class TiOtmModel33
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public int model2Id { get; set; }
+            public string title { get; set; }
+            public string setting { get; set; }
+        }
+        [Fact]
+        public void Include_OneToMany2()
+        {
+            string setting = "x";
+            var model2 = new TiOtmModel22 { m2setting = DateTime.Now.Second.ToString(), aaa = "aaa" + DateTime.Now.Second, bbb = "bbb" + DateTime.Now.Second };
+            model2.id = (int)g.gbase.Insert(model2).ExecuteIdentity();
+
+            var model3s = new[]
+            {
+                new TiOtmModel33 {model2Id = model2.id, title = "testmodel3__111", setting = setting},
+                new TiOtmModel33 {model2Id = model2.id, title = "testmodel3__222", setting = setting},
+                new TiOtmModel33 {model2Id = model2.id, title = "testmodel3__333", setting = setting}
+            };
+            Assert.Equal(3, g.gbase.Insert(model3s).ExecuteAffrows());
+
+            var model1 = new TiOtmModel11 { m1name = DateTime.Now.Second.ToString(), model2id = model2.id, m3setting = setting };
+            model1.id = (int)g.gbase.Insert(model1).ExecuteIdentity();
+
+            var t1 = g.gbase.Select<TiOtmModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            var t11 = g.gbase.Select<TiOtmModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            //---- Select ----
+
+            var at1 = g.gbase.Select<TiOtmModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting).Select(m3 => new TiOtmModel33 { title = m3.title }))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            var at11 = g.gbase.Select<TiOtmModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting).Select(m3 => new TiOtmModel33 { title = m3.title }))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+        }
+
+        [Fact]
+        public void Include_OneToChilds()
+        {
+            var tag1 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_中国"
+            };
+            tag1.Id = (int)g.gbase.Insert(tag1).ExecuteIdentity();
+            var tag1_1 = new Tag
+            {
+                Parent_id = tag1.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_北京"
+            };
+            tag1_1.Id = (int)g.gbase.Insert(tag1_1).ExecuteIdentity();
+            var tag1_2 = new Tag
+            {
+                Parent_id = tag1.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_上海"
+            };
+            tag1_2.Id = (int)g.gbase.Insert(tag1_2).ExecuteIdentity();
+
+            var tag2 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_美国"
+            };
+            tag2.Id = (int)g.gbase.Insert(tag2).ExecuteIdentity();
+            var tag2_1 = new Tag
+            {
+                Parent_id = tag2.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_纽约"
+            };
+            tag2_1.Id = (int)g.gbase.Insert(tag2_1).ExecuteIdentity();
+            var tag2_2 = new Tag
+            {
+                Parent_id = tag2.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_华盛顿"
+            };
+            tag2_2.Id = (int)g.gbase.Insert(tag2_2).ExecuteIdentity();
+
+            var tags0 = g.gbase.Select<Tag>()
+                .Include(a => a.Parent)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags1 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags)
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags2 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags,
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags3 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags,
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs).IncludeMany(a => a.Tags))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags11 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags22 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1)))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags33 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1)).IncludeMany(a => a.Tags.Take(1)))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            // --- Select ---
+
+            var atags0 = g.gbase.Select<Tag>()
+                .Include(a => a.Parent)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags1 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags2 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags3 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })).IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags11 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags22 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags33 = g.gbase.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })).IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+        }
+
+        [Fact]
+        public void Include_ManyToMany()
+        {
+
+            var tag1 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_01_中国"
+            };
+            tag1.Id = (int)g.gbase.Insert(tag1).ExecuteIdentity();
+            var tag2 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_02_美国"
+            };
+            tag2.Id = (int)g.gbase.Insert(tag2).ExecuteIdentity();
+            var tag3 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_03_日本"
+            };
+            tag3.Id = (int)g.gbase.Insert(tag3).ExecuteIdentity();
+
+            var song1 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_01_我是中国人.mp3",
+                Url = "http://ww.baidu.com/"
+            };
+            song1.Id = (int)g.gbase.Insert(song1).ExecuteIdentity();
+            var song2 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_02_爱你一万年.mp3",
+                Url = "http://ww.163.com/"
+            };
+            song2.Id = (int)g.gbase.Insert(song2).ExecuteIdentity();
+            var song3 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_03_千年等一回.mp3",
+                Url = "http://ww.sina.com/"
+            };
+            song3.Id = (int)g.gbase.Insert(song3).ExecuteIdentity();
+
+            g.gbase.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.gbase.Insert(new Song_tag { Song_id = song2.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.gbase.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.gbase.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag2.Id }).ExecuteAffrows();
+            g.gbase.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag2.Id }).ExecuteAffrows();
+            g.gbase.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag3.Id }).ExecuteAffrows();
+
+            var songs1 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags)
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var songs2 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags,
+                    then => then.IncludeMany(t => t.Songs))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var tags3 = g.gbase.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs)
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+
+            var songs11 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var songs22 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.IncludeMany(t => t.Songs.Take(1)))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var tags33 = g.gbase.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+            // --- Select ---
+
+            new List<Song>(new[] { song1, song2, song3 }).IncludeMany(g.gbase, a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }));
+
+            var asongs1 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var asongs2 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var atags3 = g.gbase.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+
+            var asongs11 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var asongs22 = g.gbase.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var atags33 = g.gbase.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+        }
+
+        public class ToDel1Pk
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        public class ToDel2Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk2 { get; set; }
+            public string name { get; set; }
+        }
+        public class ToDel3Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int pk2 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk3 { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void ToDelete()
+        {
+            g.gbase.Select<ToDel1Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToDel1Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToDel1Pk{ name = "name1"},
+                new ToDel1Pk{ name = "name2"},
+                new ToDel1Pk{ name = "nick1"},
+                new ToDel1Pk{ name = "nick2"},
+                new ToDel1Pk{ name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToDel1Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.gbase.Select<ToDel1Pk>().Count());
+            Assert.Equal(3, g.gbase.Select<ToDel1Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.gbase.Select<ToDel2Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToDel2Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name1"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name2"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick1"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick2"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToDel2Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.gbase.Select<ToDel2Pk>().Count());
+            Assert.Equal(3, g.gbase.Select<ToDel2Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.gbase.Select<ToDel3Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToDel3Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name1"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name2"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick1"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick2"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToDel3Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.gbase.Select<ToDel3Pk>().Count());
+            Assert.Equal(3, g.gbase.Select<ToDel3Pk>().Where(a => a.name.StartsWith("nick")).Count());
+        }
+
+        public class ToUpd1Pk
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        public class ToUpd2Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk2 { get; set; }
+            public string name { get; set; }
+        }
+        public class ToUpd3Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int pk2 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk3 { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void ToUpdate()
+        {
+            g.gbase.Select<ToUpd1Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToUpd1Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToUpd1Pk{ name = "name1"},
+                new ToUpd1Pk{ name = "name2"},
+                new ToUpd1Pk{ name = "nick1"},
+                new ToUpd1Pk{ name = "nick2"},
+                new ToUpd1Pk{ name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToUpd1Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.gbase.Select<ToUpd1Pk>().Count());
+            Assert.Equal(5, g.gbase.Select<ToUpd1Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.gbase.Select<ToUpd2Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToUpd2Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name1"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name2"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick1"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick2"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToUpd2Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.gbase.Select<ToUpd2Pk>().Count());
+            Assert.Equal(5, g.gbase.Select<ToUpd2Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.gbase.Select<ToUpd3Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.gbase.Select<ToUpd3Pk>().Count());
+            g.gbase.Insert(new[] {
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name1"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name2"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick1"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick2"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.gbase.Select<ToUpd3Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.gbase.Select<ToUpd3Pk>().Count());
+            Assert.Equal(5, g.gbase.Select<ToUpd3Pk>().Where(a => a.name.StartsWith("nick")).Count());
+        }
+
+        [Fact]
+        public void ForUpdate()
+        {
+            var orm = g.gbase;
+
+            Assert.Equal("安全起见，请务必在事务开启之后，再使用 ForUpdate",
+                Assert.Throws<Exception>(() => orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToList())?.Message);
+
+            orm.Transaction(() =>
+            {
+                var sql = orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToSql().Replace("\r\n", "");
+                Assert.Equal("SELECT FIRST 1 a.id, a.name FROM ToUpd1Pk a for update", sql);
+                orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToList();
+
+                sql = orm.Select<ToUpd1Pk>().ForUpdate(true).Limit(1).ToSql().Replace("\r\n", "");
+                Assert.Equal("SELECT FIRST 1 a.id, a.name FROM ToUpd1Pk a for update", sql);
+                orm.Select<ToUpd1Pk>().ForUpdate(true).Limit(1).ToList();
+            });
+        }
+
+        [Fact]
+        public void ToTreeList()
+        {
+            var fsql = g.gbase;
+            fsql.Delete<BaseDistrict>().Where("1=1").ExecuteAffrows();
+            var repo = fsql.GetRepository<VM_District_Child>();
+            repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
+            repo.DbContextOptions.NoneParameter = true;
+            repo.Insert(new VM_District_Child
+            {
+                Code = "100000",
+                Name = "中国",
+                Childs = new List<VM_District_Child>(new[] {
+                    new VM_District_Child
+                    {
+                        Code = "110000",
+                        Name = "北京",
+                        Childs = new List<VM_District_Child>(new[] {
+                            new VM_District_Child{ Code="110100", Name = "北京市" },
+                            new VM_District_Child{ Code="110101", Name = "东城区" },
+                        })
+                    }
+                })
+            });
+
+            var t1 = fsql.Select<VM_District_Parent>()
+                .InnerJoin(a => a.ParentCode == a.Parent.Code)
+                .Where(a => a.Code == "110101")
+                .ToList(true);
+            Assert.Single(t1);
+            Assert.Equal("110101", t1[0].Code);
+            Assert.NotNull(t1[0].Parent);
+            Assert.Equal("110000", t1[0].Parent.Code);
+
+            var t2 = fsql.Select<VM_District_Parent>()
+                .InnerJoin(a => a.ParentCode == a.Parent.Code)
+                .InnerJoin(a => a.Parent.ParentCode == a.Parent.Parent.Code)
+                .Where(a => a.Code == "110101")
+                .ToList(true);
+            Assert.Single(t2);
+            Assert.Equal("110101", t2[0].Code);
+            Assert.NotNull(t2[0].Parent);
+            Assert.Equal("110000", t2[0].Parent.Code);
+            Assert.NotNull(t2[0].Parent.Parent);
+            Assert.Equal("100000", t2[0].Parent.Parent.Code);
+
+            var t3 = fsql.Select<VM_District_Child>().ToTreeList();
+            Assert.Single(t3);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Single(t3[0].Childs);
+            Assert.Equal("110000", t3[0].Childs[0].Code);
+            Assert.Equal(2, t3[0].Childs[0].Childs.Count);
+            Assert.Equal("110100", t3[0].Childs[0].Childs[0].Code);
+            Assert.Equal("110101", t3[0].Childs[0].Childs[1].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte().OrderBy(a => a.Code).ToTreeList();
+            Assert.Single(t3);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Single(t3[0].Childs);
+            Assert.Equal("110000", t3[0].Childs[0].Code);
+            Assert.Equal(2, t3[0].Childs[0].Childs.Count);
+            Assert.Equal("110100", t3[0].Childs[0].Childs[0].Code);
+            Assert.Equal("110101", t3[0].Childs[0].Childs[1].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte().OrderBy(a => a.Code).ToList();
+            Assert.Equal(4, t3.Count);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Equal("110000", t3[1].Code);
+            Assert.Equal("110100", t3[2].Code);
+            Assert.Equal("110101", t3[3].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "北京").AsTreeCte().OrderBy(a => a.Code).ToList();
+            Assert.Equal(3, t3.Count);
+            Assert.Equal("110000", t3[0].Code);
+            Assert.Equal("110100", t3[1].Code);
+            Assert.Equal("110101", t3[2].Code);
+
+            var t4 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte(a => a.Name).OrderBy(a => a.Code)
+                .ToList(a => new { item = a, level = Convert.ToInt32("a.cte_level"), path = "a.cte_path" });
+            Assert.Equal(4, t4.Count);
+            Assert.Equal("100000", t4[0].item.Code);
+            Assert.Equal("110000", t4[1].item.Code);
+            Assert.Equal("110100", t4[2].item.Code);
+            Assert.Equal("110101", t4[3].item.Code);
+            Assert.Equal("中国", t4[0].path);
+            Assert.Equal("中国 -> 北京", t4[1].path);
+            Assert.Equal("中国 -> 北京 -> 北京市", t4[2].path);
+            Assert.Equal("中国 -> 北京 -> 东城区", t4[3].path);
+
+            t4 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte(a => a.Name + "[" + a.Code + "]").OrderBy(a => a.Code)
+                .ToList(a => new { item = a, level = Convert.ToInt32("a.cte_level"), path = "a.cte_path" });
+            Assert.Equal(4, t4.Count);
+            Assert.Equal("100000", t4[0].item.Code);
+            Assert.Equal("110000", t4[1].item.Code);
+            Assert.Equal("110100", t4[2].item.Code);
+            Assert.Equal("110101", t4[3].item.Code);
+            Assert.Equal("中国[100000]", t4[0].path);
+            Assert.Equal("中国[100000] -> 北京[110000]", t4[1].path);
+            Assert.Equal("中国[100000] -> 北京[110000] -> 北京市[110100]", t4[2].path);
+            Assert.Equal("中国[100000] -> 北京[110000] -> 东城区[110101]", t4[3].path);
+
+            var select = fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte()
+                //.OrderBy("a.cte_level desc") //递归层级
+                ;
+            // var list = select.ToList(); //自己调试看查到的数据
+            select.ToUpdate().Set(a => a.testint, 855).ExecuteAffrows();
+            Assert.Equal(855, fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte().Distinct().First(a => a.testint));
+
+            Assert.Equal(4, select.ToDelete().ExecuteAffrows());
+            Assert.False(fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte().Any());
+        }
+
+        [Table(Name = "D_District")]
+        public class BaseDistrict
+        {
+            [Column(IsPrimary = true, StringLength = 6)]
+            public string Code { get; set; }
+
+            [Column(StringLength = 20, IsNullable = false)]
+            public string Name { get; set; }
+
+            [Column(StringLength = 6)]
+            public virtual string ParentCode { get; set; }
+
+            public int testint { get; set; }
+        }
+        [Table(Name = "D_District", DisableSyncStructure = true)]
+        public class VM_District_Child : BaseDistrict
+        {
+            public override string ParentCode { get => base.ParentCode; set => base.ParentCode = value; }
+
+            [Navigate(nameof(ParentCode))]
+            public List<VM_District_Child> Childs { get; set; }
+        }
+        [Table(Name = "D_District", DisableSyncStructure = true)]
+        public class VM_District_Parent : BaseDistrict
+        {
+            public override string ParentCode { get => base.ParentCode; set => base.ParentCode = value; }
+
+            [Navigate(nameof(ParentCode))]
+            public VM_District_Parent Parent { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseUpdateTest.cs
new file mode 100644
index 00000000..cb5094ba
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseUpdateTest.cs
@@ -0,0 +1,234 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseUpdateTest
+    {
+        IUpdate<Topic> update => g.gbase.Update<Topic>();
+
+        [Table(Name = "tb_topic_insert")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int? Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Table(Name = "tb_topic_setsource")]
+        class Topic22
+        {
+            [Column(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; }
+        }
+
+        [Fact]
+        public void Dywhere()
+        {
+            Assert.Null(g.gbase.Update<Topic>().ToSql());
+            Assert.Equal("UPDATE tb_topic_insert SET Title='test' \r\nWHERE (Id IN (1,2))", g.gbase.Update<Topic>(new[] { 1, 2 }).SetRaw("Title='test'").ToSql());
+            Assert.Equal("UPDATE tb_topic_insert SET Title='test1' \r\nWHERE (Id = 1)", g.gbase.Update<Topic>(new Topic { Id = 1, Title = "test" }).SetRaw("Title='test1'").ToSql());
+            Assert.Equal("UPDATE tb_topic_insert SET Title='test1' \r\nWHERE (Id IN (1,2))", g.gbase.Update<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).SetRaw("Title='test1'").ToSql());
+            Assert.Equal("UPDATE tb_topic_insert SET Title='test1' \r\nWHERE (Id = 1)", g.gbase.Update<Topic>(new { id = 1 }).SetRaw("Title='test1'").ToSql());
+        }
+
+        [Fact]
+        public void SetSource()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = NULL, Title = 'newtitle', CreateTime = '0001-01-01 00:00:00.000' WHERE (Id = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            items[0].Clicks = null;
+
+            sql = update.SetSource(items).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = CASE Id WHEN 1 THEN NULL WHEN 2 THEN 100 WHEN 3 THEN 200 WHEN 4 THEN 300 WHEN 5 THEN 400 WHEN 6 THEN 500 WHEN 7 THEN 600 WHEN 8 THEN 700 WHEN 9 THEN 800 WHEN 10 THEN 900 END, Title = CASE Id WHEN 1 THEN 'newtitle0' WHEN 2 THEN 'newtitle1' WHEN 3 THEN 'newtitle2' WHEN 4 THEN 'newtitle3' WHEN 5 THEN 'newtitle4' WHEN 6 THEN 'newtitle5' WHEN 7 THEN 'newtitle6' WHEN 8 THEN 'newtitle7' WHEN 9 THEN 'newtitle8' WHEN 10 THEN 'newtitle9' END, CreateTime = CASE Id WHEN 1 THEN '0001-01-01 00:00:00.000' WHEN 2 THEN '0001-01-01 00:00:00.000' WHEN 3 THEN '0001-01-01 00:00:00.000' WHEN 4 THEN '0001-01-01 00:00:00.000' WHEN 5 THEN '0001-01-01 00:00:00.000' WHEN 6 THEN '0001-01-01 00:00:00.000' WHEN 7 THEN '0001-01-01 00:00:00.000' WHEN 8 THEN '0001-01-01 00:00:00.000' WHEN 9 THEN '0001-01-01 00:00:00.000' WHEN 10 THEN '0001-01-01 00:00:00.000' END WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = update.SetSource(items).IgnoreColumns(a => new { a.Clicks, a.CreateTime }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = CASE Id WHEN 1 THEN 'newtitle0' WHEN 2 THEN 'newtitle1' WHEN 3 THEN 'newtitle2' WHEN 4 THEN 'newtitle3' WHEN 5 THEN 'newtitle4' WHEN 6 THEN 'newtitle5' WHEN 7 THEN 'newtitle6' WHEN 8 THEN 'newtitle7' WHEN 9 THEN 'newtitle8' WHEN 10 THEN 'newtitle9' END WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = update.SetSource(items).Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET CreateTime = '2020-01-01 00:00:00.000' WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = g.gbase.Update<ts_source_mpk>().SetSource(new[] {
+                new ts_source_mpk { id1 = 1, id2 = 7, xx = "a1" },
+                new ts_source_mpk { id1 = 1, id2 = 8, xx = "b122" }
+            }).NoneParameter().ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE ts_source_mpk SET xx = CASE (id1 || '+' || id2) WHEN (1 || '+' || 7) THEN 'a1' WHEN (1 || '+' || 8) THEN 'b122' END WHERE ((id1 = 1 AND id2 = 7) OR (id1 = 1 AND id2 = 8))", sql);
+        }
+        public class ts_source_mpk
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int id2 { get; set; }
+            public string xx { get; set; }
+        }
+        [Fact]
+        public void SetSourceNoIdentity()
+        {
+            var fsql = g.gbase;
+            fsql.Delete<Topic22>().Where("1=1").ExecuteAffrows();
+            var sql = fsql.Update<Topic22>().SetSource(new Topic22 { Id = 1, Title = "newtitle" }).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_setsource SET Clicks = NULL, Title = 'newtitle', CreateTime = '0001-01-01 00:00:00.000' WHERE (Id = 1)", sql);
+
+            var items = new List<Topic22>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic22 { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            Assert.Equal(10, fsql.Insert(items).ExecuteAffrows());
+            items[0].Clicks = null;
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_setsource SET Clicks = CASE Id WHEN 1 THEN NULL WHEN 2 THEN 100 WHEN 3 THEN 200 WHEN 4 THEN 300 WHEN 5 THEN 400 WHEN 6 THEN 500 WHEN 7 THEN 600 WHEN 8 THEN 700 WHEN 9 THEN 800 WHEN 10 THEN 900 END, Title = CASE Id WHEN 1 THEN 'newtitle0' WHEN 2 THEN 'newtitle1' WHEN 3 THEN 'newtitle2' WHEN 4 THEN 'newtitle3' WHEN 5 THEN 'newtitle4' WHEN 6 THEN 'newtitle5' WHEN 7 THEN 'newtitle6' WHEN 8 THEN 'newtitle7' WHEN 9 THEN 'newtitle8' WHEN 10 THEN 'newtitle9' END, CreateTime = CASE Id WHEN 1 THEN '0001-01-01 00:00:00.000' WHEN 2 THEN '0001-01-01 00:00:00.000' WHEN 3 THEN '0001-01-01 00:00:00.000' WHEN 4 THEN '0001-01-01 00:00:00.000' WHEN 5 THEN '0001-01-01 00:00:00.000' WHEN 6 THEN '0001-01-01 00:00:00.000' WHEN 7 THEN '0001-01-01 00:00:00.000' WHEN 8 THEN '0001-01-01 00:00:00.000' WHEN 9 THEN '0001-01-01 00:00:00.000' WHEN 10 THEN '0001-01-01 00:00:00.000' END WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => new { a.Clicks, a.CreateTime, a.TypeGuid }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_setsource SET Title = CASE Id WHEN 1 THEN 'newtitle0' WHEN 2 THEN 'newtitle1' WHEN 3 THEN 'newtitle2' WHEN 4 THEN 'newtitle3' WHEN 5 THEN 'newtitle4' WHEN 6 THEN 'newtitle5' WHEN 7 THEN 'newtitle6' WHEN 8 THEN 'newtitle7' WHEN 9 THEN 'newtitle8' WHEN 10 THEN 'newtitle9' END WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => a.TypeGuid).Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_setsource SET CreateTime = '2020-01-01 00:00:00.000' WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void SetSourceIgnore()
+        {
+            Assert.Equal("UPDATE tssi01 SET tint = 10 WHERE (id = '00000000-0000-0000-0000-000000000000')",
+                g.gbase.Update<tssi01>().NoneParameter()
+                    .SetSourceIgnore(new tssi01 { id = Guid.Empty, tint = 10 }, col => col == null).ToSql().Replace("\r\n", ""));
+        }
+        public class tssi01
+        {
+            [Column(CanUpdate = false)]
+            public Guid id { get; set; }
+            public int tint { get; set; }
+            public string Title { get; set; }
+        }
+        [Fact]
+        public void IgnoreColumns()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new { a.Clicks, a.CreateTime }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new object[] { a.Clicks, a.CreateTime }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new[] { "Clicks", "CreateTime" }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+
+            var cols = new[] { "Clicks", "CreateTime" };
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => cols).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+
+            cols = new[] { "Clicks", "CreateTime" };
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(cols).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+        }
+        [Fact]
+        public void UpdateColumns()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).UpdateColumns(a => a.Title).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+        }
+        [Fact]
+        public void Set()
+        {
+            var sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle' WHERE (Id = 1)", sql);
+
+            sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title = 'newtitle', CreateTime = '2020-01-01 00:00:00.000' WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = trunc(nvl(Clicks, 0) * 10/1) WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Id - 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Id = (Id - 10) WHERE (Id = 1)", sql);
+
+            int incrv = 10;
+            sql = update.Set(a => a.Clicks * incrv / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = trunc(nvl(Clicks, 0) * 10/1) WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Id - incrv).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Id = (Id - 10) WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Clicks == a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = trunc(Clicks * 10/1) WHERE (Id = 1)", sql);
+
+            var dt2000 = DateTime.Parse("2000-01-01");
+            sql = update.Set(a => a.Clicks == (a.CreateTime > dt2000 ? 1 : 2)).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = case when CreateTime > '2000-01-01 00:00:00.000' then 1 else 2 end WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Id = 10 WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = NULL WHERE (Id = 1)", sql);
+
+            sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = NULL WHERE (Id = 1)", sql);
+        }
+        [Fact]
+        public void SetRaw()
+        {
+            var sql = update.Where(a => a.Id == 1).SetRaw("clicks = clicks + @incrClick", new { incrClick = 1 }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET clicks = clicks + @incrClick WHERE (Id = 1)", sql);
+        }
+        [Fact]
+        public void SetDto()
+        {
+            var sql = update.SetDto(new { clicks = 1, Title = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = 1, Title = 'xxx' WHERE (Id = 1)", sql);
+
+            sql = update.NoneParameter().SetDto(new Dictionary<string, object> { ["clicks"] = 1, ["Title"] = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Clicks = 1, Title = 'xxx' WHERE (Id = 1)", sql);
+        }
+        [Fact]
+        public void Where()
+        {
+            var sql = update.Where(a => a.Id == 1).SetRaw("Title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title='newtitle' WHERE (Id = 1)", sql);
+
+            sql = update.Where("id = @id", new { id = 1 }).SetRaw("Title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title='newtitle' WHERE (id = @id)", sql);
+
+            var item = new Topic { Id = 1, Title = "newtitle" };
+            sql = update.Where(item).SetRaw("Title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title='newtitle' WHERE (Id = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            sql = update.Where(items).SetRaw("Title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE tb_topic_insert SET Title='newtitle' WHERE (Id IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
+        }
+        [Fact]
+        public void ExecuteUpdated()
+        {
+
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            Assert.Null(g.gbase.Update<Topic>().ToSql());
+            Assert.Equal("UPDATE tb_topicAsTable SET Title='test' \r\nWHERE (Id IN (1,2))", g.gbase.Update<Topic>(new[] { 1, 2 }).SetRaw("Title='test'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE tb_topicAsTable SET Title='test1' \r\nWHERE (Id = 1)", g.gbase.Update<Topic>(new Topic { Id = 1, Title = "test" }).SetRaw("Title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE tb_topicAsTable SET Title='test1' \r\nWHERE (Id IN (1,2))", g.gbase.Update<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).SetRaw("Title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE tb_topicAsTable SET Title='test1' \r\nWHERE (Id = 1)", g.gbase.Update<Topic>(new { id = 1 }).SetRaw("Title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/ExtensionsAdo/GBaseAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/ExtensionsAdo/GBaseAdoTest.cs
new file mode 100644
index 00000000..563c6be2
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/ExtensionsAdo/GBaseAdoTest.cs
@@ -0,0 +1,73 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseAdoTest
+    {
+        [Fact]
+        public void Pool()
+        {
+            var t1 = g.gbase.Ado.MasterPool.StatisticsFullily;
+        }
+
+        [Fact]
+        public void SlavePools()
+        {
+            var t2 = g.gbase.Ado.SlavePools.Count;
+        }
+
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.gbase.Ado.ExecuteConnectTest());
+        }
+        [Fact]
+        public void ExecuteReader()
+        {
+
+        }
+        [Fact]
+        public void ExecuteArray()
+        {
+
+        }
+        [Fact]
+        public void ExecuteNonQuery()
+        {
+
+        }
+        [Fact]
+        public void ExecuteScalar()
+        {
+
+        }
+
+        [Fact]
+        public void Query()
+        {
+
+            var t3 = g.gbase.Ado.Query<xxx>("select * from TB_TOPIC22");
+
+            var t4 = g.gbase.Ado.Query<(int, string, string)>("select * from TB_TOPIC22");
+
+            var t5 = g.gbase.Ado.Query<dynamic>("select * from TB_TOPIC22");
+
+            var t6 = g.gbase.Ado.Query<xxx>("select * from TB_TOPIC22 where ID in @ids", new { ids = new[] { 1, 2, 3 } });
+        }
+
+        [Fact]
+        public void QueryMultipline()
+        {
+            //var t3 = g.firebird.Ado.Query<xxx, (int, string, string), dynamic>("select * from TB_TOPIC; select * from TB_TOPIC; select * from TB_TOPIC");
+        }
+
+        class xxx
+        {
+            public int Id { get; set; }
+            public string Path { get; set; }
+            public string Title2 { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/ConvertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/ConvertTest.cs
new file mode 100644
index 00000000..19e04965
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/ConvertTest.cs
@@ -0,0 +1,169 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class ConvertTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        [Fact]
+        public void ToBoolean()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => (Convert.ToBoolean(a.Clicks) ? 1 : 0) > 0).ToList());
+            //data.Add(select.Where(a => (bool.Parse(a.Clicks.ToString()) ? 1 : 0) > 0).ToList());
+        }
+        [Fact]
+        public void ToByte()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToByte(a.Clicks % 255) > 0).ToList());
+            data.Add(select.Where(a => byte.Parse((a.Clicks % 255).ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToChar()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToChar(a.Clicks) == '1').ToList());
+            data.Add(select.Where(a => char.Parse(a.Clicks.ToString()) == '1').ToList());
+        }
+        [Fact]
+        public void ToDateTime()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDateTime(a.CreateTime.ToString()).Year > 0).ToList());
+            data.Add(select.Where(a => DateTime.Parse(a.CreateTime.ToString()).Year > 0).ToList());
+        }
+        [Fact]
+        public void ToDecimal()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDecimal(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => decimal.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToDouble()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDouble(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => double.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt16()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToInt16(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => short.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt32()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (int)a.Clicks > 0).ToList());
+            data.Add(select.Where(a => Convert.ToInt32(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => int.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt64()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToInt64(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => long.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToSByte()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToSByte(a.Clicks % 128) > 0).ToList());
+            data.Add(select.Where(a => sbyte.Parse((a.Clicks % 128).ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToSingle()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToSingle(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => float.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToString(a.Clicks).Equals("")).ToList());
+            data.Add(select.Where(a => a.Clicks.ToString().Equals("")).ToList());
+        }
+        [Fact]
+        public void ToUInt16()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt16(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => ushort.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToUInt32()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt32(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => uint.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToUInt64()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt64(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => ulong.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+
+        [Fact]
+        public void Guid_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Guid.Parse(Guid.Empty.ToString()) == Guid.Empty).ToList());
+        }
+
+        [Fact]
+        public void Guid_NewGuid()
+        {
+            var data = new List<object>();
+            //data.Add(select.OrderBy(a => Guid.NewGuid()).Limit(10).ToList());
+        }
+
+        [Fact]
+        public void Random()
+        {
+            //var data = new List<object>();
+            //data.Add(select.Where(a => new Random().Next() > a.Clicks).Limit(10).ToList());
+            //data.Add(select.Where(a => new Random().NextDouble() > a.Clicks).Limit(10).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/DateTimeTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/DateTimeTest.cs
new file mode 100644
index 00000000..ae6892f0
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/DateTimeTest.cs
@@ -0,0 +1,642 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class DateTimeTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic111333")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Table(Name = "TestTypeInfo333")]
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+            public DateTime Time { get; set; }
+        }
+        [Table(Name = "TestTypeParentInf1")]
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+            public DateTime Time2 { get; set; }
+        }
+
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.ToString().Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+
+            g.gbase.Insert(new Topic()).ExecuteAffrows();
+            var dtn = DateTime.Parse("2020-1-1 0:0:0");
+            var dts = Enumerable.Range(1, 12).Select(a => dtn.AddMonths(a))
+                .Concat(Enumerable.Range(1, 31).Select(a => dtn.AddDays(a)))
+                .Concat(Enumerable.Range(1, 24).Select(a => dtn.AddHours(a)))
+                .Concat(Enumerable.Range(1, 60).Select(a => dtn.AddMinutes(a)))
+                .Concat(Enumerable.Range(1, 60).Select(a => dtn.AddSeconds(a)));
+            foreach (var dt in dts)
+            {
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm:ss"), select.First(a => dt.ToString()));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm:ss"), select.First(a => dt.ToString("yyyy-MM-dd HH:mm:ss")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm"), select.First(a => dt.ToString("yyyy-MM-dd HH:mm")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd")));
+                Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM")));
+                Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss")));
+                Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm")));
+                Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH")));
+                Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd")));
+                Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM")));
+                Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy")));
+                Assert.Equal(dt.ToString("HH:mm:ss"), select.First(a => dt.ToString("HH:mm:ss")));
+                Assert.Equal(dt.ToString("yyyy MM dd HH mm ss yy M d H hh h"), select.First(a => dt.ToString("yyyy MM dd HH mm ss yy M d H hh h")));
+                Assert.Equal(dt.ToString("yyyy MM dd HH mm ss yy M d H hh h m s tt t").Replace("���� ��", "���� ����").Replace("���� ��", "���� ����"), select.First(a => dt.ToString("yyyy MM dd HH mm ss yy M d H hh h m s tt t")));
+            }
+        }
+
+        [Fact]
+        public void Now()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void UtcNow()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.UtcNow.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(utc_timestamp(), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void MinValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.MinValue.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('0001/1/1 0:00:00' as datetime), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void MaxValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.MaxValue.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('9999/12/31 23:59:59' as datetime), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void Date()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+            data.Add(select.Where(a => a.Type.Time.Date > DateTime.Now.Date).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Date > DateTime.Now.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.CreateTime.Date).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Time.Date).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Parent.Time2.Date).TotalSeconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0)
+        }
+        [Fact]
+        public void TimeOfDay()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay == DateTime.Now.TimeOfDay).ToList());
+            //data.Add(select.Where(a => a.Type.Time.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+            //data.Add(select.Where(a => a.Type.Parent.Time2.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((timestampdiff(microsecond, date_format(a__Type.`Time`, '1970-1-1 %H:%i:%s.%f'), a__Type.`Time`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((timestampdiff(microsecond, date_format(a__Type__Parent.`Time2`, '1970-1-1 %H:%i:%s.%f'), a__Type__Parent.`Time2`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000))
+        }
+        [Fact]
+        public void DayOfWeek()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            data.Add(select.Where(a => a.Type.Time.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((dayofweek(a.`CreateTime`) - 1) > (dayofweek(now()) - 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((dayofweek(a__Type.`Time`) - 1) > (dayofweek(now()) - 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((dayofweek(a__Type__Parent.`Time2`) - 1) > (dayofweek(now()) - 1))
+        }
+        [Fact]
+        public void Day()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Day > DateTime.Now.Day).ToList());
+            data.Add(select.Where(a => a.Type.Time.Day > DateTime.Now.Day).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Day > DateTime.Now.Day).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofmonth(a.`CreateTime`) > dayofmonth(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofmonth(a__Type.`Time`) > dayofmonth(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofmonth(a__Type__Parent.`Time2`) > dayofmonth(now()))
+        }
+        [Fact]
+        public void DayOfYear()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            data.Add(select.Where(a => a.Type.Time.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofyear(a.`CreateTime`) > dayofyear(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofyear(a__Type.`Time`) > dayofyear(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofyear(a__Type__Parent.`Time2`) > dayofyear(now()))
+        }
+        [Fact]
+        public void Month()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Month > DateTime.Now.Month).ToList());
+            data.Add(select.Where(a => a.Type.Time.Month > DateTime.Now.Month).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Month > DateTime.Now.Month).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (month(a.`CreateTime`) > month(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (month(a__Type.`Time`) > month(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (month(a__Type__Parent.`Time2`) > month(now()))
+        }
+        [Fact]
+        public void Year()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Year > DateTime.Now.Year).ToList());
+            data.Add(select.Where(a => a.Type.Time.Year > DateTime.Now.Year).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Year > DateTime.Now.Year).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (year(a.`CreateTime`) > year(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (year(a__Type.`Time`) > year(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (year(a__Type__Parent.`Time2`) > year(now()))
+        }
+        [Fact]
+        public void Hour()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Hour > DateTime.Now.Hour).ToList());
+            data.Add(select.Where(a => a.Type.Time.Hour > DateTime.Now.Hour).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Hour > DateTime.Now.Hour).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (hour(a.`CreateTime`) > hour(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (hour(a__Type.`Time`) > hour(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (hour(a__Type__Parent.`Time2`) > hour(now()))
+        }
+        [Fact]
+        public void Minute()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Minute > DateTime.Now.Minute).ToList());
+            data.Add(select.Where(a => a.Type.Time.Minute > DateTime.Now.Minute).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Minute > DateTime.Now.Minute).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (minute(a.`CreateTime`) > minute(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (minute(a__Type.`Time`) > minute(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (minute(a__Type__Parent.`Time2`) > minute(now()))
+        }
+        [Fact]
+        public void Second()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Second > DateTime.Now.Second).ToList());
+            data.Add(select.Where(a => a.Type.Time.Second > DateTime.Now.Second).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Second > DateTime.Now.Second).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (second(a.`CreateTime`) > second(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (second(a__Type.`Time`) > second(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (second(a__Type__Parent.`Time2`) > second(now()))
+        }
+        [Fact]
+        public void Millisecond()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Millisecond > DateTime.Now.Millisecond).ToList());
+            data.Add(select.Where(a => a.Type.Time.Millisecond > DateTime.Now.Millisecond).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Millisecond > DateTime.Now.Millisecond).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (floor(microsecond(a.`CreateTime`) / 1000) > floor(microsecond(now()) / 1000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (floor(microsecond(a__Type.`Time`) / 1000) > floor(microsecond(now()) / 1000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (floor(microsecond(a__Type__Parent.`Time2`) / 1000) > floor(microsecond(now()) / 1000))
+        }
+        [Fact]
+        public void Add()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval ((1 * 86400000000)) microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval ((1 * 86400000000)) microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval ((1 * 86400000000)) microsecond) > now())
+        }
+        [Fact]
+        public void AddDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddDays(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddDays(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddDays(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) day) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) day) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) day) > now())
+        }
+        [Fact]
+        public void AddHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddHours(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddHours(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddHours(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) hour) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) hour) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) hour) > now())
+        }
+        [Fact]
+        public void AddMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMilliseconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMilliseconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMilliseconds(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) * 1000 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) * 1000 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) * 1000 microsecond) > now())
+        }
+        [Fact]
+        public void AddMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMinutes(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMinutes(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMinutes(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) minute) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) minute) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) minute) > now())
+        }
+        [Fact]
+        public void AddMonths()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMonths(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMonths(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMonths(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) month) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) month) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) month) > now())
+        }
+        [Fact]
+        public void AddSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddSeconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddSeconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddSeconds(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) second) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) second) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) second) > now())
+        }
+        [Fact]
+        public void AddTicks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddTicks(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddTicks(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddTicks(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) / 10 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) / 10 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) / 10 microsecond) > now())
+        }
+        [Fact]
+        public void AddYears()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddYears(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) year) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) year) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) year) > now())
+        }
+        [Fact]
+        public void Subtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Subtract(DateTime.Now).TotalMinutes > 0).ToList());
+            //data.Add(select.Where(a => a.Type.Time.Subtract(DateTime.Now).TotalMinutes > 0).ToList());
+            //data.Add(select.Where(a => a.Type.Parent.Time2.Subtract(DateTime.Now).TotalMinutes > 0).ToList());
+        }
+        [Fact]
+        public void �����������_Ч��ͬSubtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (a.CreateTime - DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => (a.Type.Time - DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => (a.Type.Parent.Time2 - DateTime.Now).TotalSeconds > 0).ToList());
+        }
+        [Fact]
+        public void this_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddYears(1).Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).Equals(DateTime.Now)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+        }
+
+        [Fact]
+        public void DateTime_Compare()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.CompareTo(DateTime.Now) == 0).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((a.`CreateTime`) - (now())) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((date_add(a__Type.`Time`, interval (1) year)) - (now())) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((date_add(a__Type__Parent.`Time2`, interval (1) year)) - (now())) = 0)
+        }
+        [Fact]
+        public void DateTime_DaysInMonth()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.DaysInMonth(a.CreateTime.Year, a.CreateTime.Month) > 30).ToList());
+            //data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Time.Year, a.Type.Time.Month) > 30).ToList());
+            //data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Parent.Time2.Year, a.Type.Parent.Time2.Month) > 30).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofmonth(last_day(concat(year(a.`CreateTime`), month(a.`CreateTime`), '-01'))) > 30);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofmonth(last_day(concat(year(a__Type.`Time`), month(a__Type.`Time`), '-01'))) > 30);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofmonth(last_day(concat(year(a__Type__Parent.`Time2`), month(a__Type__Parent.`Time2`), '-01'))) > 30)
+        }
+        [Fact]
+        public void DateTime_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.Equals(a.CreateTime.AddYears(1), DateTime.Now)).ToList());
+            data.Add(select.Where(a => DateTime.Equals(a.Type.Time.AddYears(1), DateTime.Now)).ToList());
+            data.Add(select.Where(a => DateTime.Equals(a.Type.Parent.Time2.AddYears(1), DateTime.Now)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+        }
+        [Fact]
+        public void DateTime_IsLeapYear()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.CreateTime.Year)).ToList());
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Time.AddYears(1).Year)).ToList());
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Parent.Time2.AddYears(1).Year)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((year(a.`CreateTime`)) % 4 = 0 AND (year(a.`CreateTime`)) % 100 <> 0 OR (year(a.`CreateTime`)) % 400 = 0));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((year(date_add(a__Type.`Time`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type.`Time`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type.`Time`, interval (1) year))) % 400 = 0));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 400 = 0))
+        }
+        [Fact]
+        public void DateTime_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.Parse(a.CreateTime.ToString()) > DateTime.Now).ToList());
+            //data.Add(select.Where(a => DateTime.Parse(a.Type.Time.AddYears(1).ToString()) > DateTime.Now).ToList());
+            //data.Add(select.Where(a => DateTime.Parse(a.Type.Parent.Time2.AddYears(1).ToString()) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (cast(date_format(date_add(a__Type.`Time`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (cast(date_format(date_add(a__Type__Parent.`Time2`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now())
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/MathTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/MathTest.cs
new file mode 100644
index 00000000..5a0f5c87
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/MathTest.cs
@@ -0,0 +1,150 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class MathTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        [Fact]
+        public void PI()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.PI + a.Clicks > 0).ToList());
+        }
+        [Fact]
+        public void Abs()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Abs(-a.Clicks) > 0).ToList());
+        }
+        [Fact]
+        public void Sign()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sign(-a.Clicks) > 0).ToList());
+        }
+        [Fact]
+        public void Floor()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Floor(a.Clicks + 0.5) == a.Clicks).ToList());
+        }
+        [Fact]
+        public void Ceiling()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Ceiling(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Round()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Round(a.Clicks + 0.5) == a.Clicks).ToList());
+            data.Add(select.Where(a => Math.Round(a.Clicks + 0.5, 1) > a.Clicks).ToList());
+        }
+        [Fact]
+        public void Exp()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Exp(1) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Log10()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Log10(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Pow()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Pow(2, a.Clicks % 5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Sqrt()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sqrt(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Cos()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Cos(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Sin()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sin(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Tan()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Tan(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Acos()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Acos(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Asin()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Asin(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Atan()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Atan(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Atan2()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Atan2(2, a.Clicks) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Truncate()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Truncate(a.Clicks * 1.0 / 3) == a.Clicks + 1).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/OtherTest.cs
new file mode 100644
index 00000000..0aacb521
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/OtherTest.cs
@@ -0,0 +1,169 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class OtherTest
+    {
+
+        ISelect<TableAllType> select => g.gbase.Select<TableAllType>();
+
+        public OtherTest()
+        {
+        }
+
+        [Fact]
+        public void Div()
+        {
+            var t1 = select.Where(a => a.Int / 3 > 3).Limit(10).ToList();
+            var t2 = select.Where(a => a.Long / 3 > 3).Limit(10).ToList();
+            var t3 = select.Where(a => a.Short / 3 > 3).Limit(10).ToList();
+
+            var t4 = select.Where(a => a.Int / 3.0 > 3).Limit(10).ToList();
+            var t5 = select.Where(a => a.Long / 3.0 > 3).Limit(10).ToList();
+            var t6 = select.Where(a => a.Short / 3.0 > 3).Limit(10).ToList();
+
+            var t7 = select.Where(a => a.Double / 3 > 3).Limit(10).ToList();
+            var t8 = select.Where(a => a.Decimal / 3 > 3).Limit(10).ToList();
+            var t9 = select.Where(a => a.Float / 3 > 3).Limit(10).ToList();
+        }
+
+        [Fact]
+        public void Boolean()
+        {
+            var t1 = select.Where(a => a.Bool == true).ToList();
+            var t2 = select.Where(a => a.Bool != true).ToList();
+            var t3 = select.Where(a => a.Bool == false).ToList();
+            var t4 = select.Where(a => !a.Bool).ToList();
+            var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).ToList();
+
+            var t11 = select.Where(a => a.BoolNullable == true).ToList();
+            var t22 = select.Where(a => a.BoolNullable != true).ToList();
+            var t33 = select.Where(a => a.BoolNullable == false).ToList();
+            var t44 = select.Where(a => !a.BoolNullable.Value).ToList();
+            var t55 = select.Where(a => a.BoolNullable.Value).ToList();
+
+            var t111 = select.Where(a => a.Bool == true && a.Int > 0).ToList();
+            var t222 = select.Where(a => a.Bool != true && a.Int > 0).ToList();
+            var t333 = select.Where(a => a.Bool == false && a.Int > 0).ToList();
+            var t444 = select.Where(a => !a.Bool && a.Int > 0).ToList();
+            var t555 = select.Where(a => a.Bool && a.Int > 0).ToList();
+
+            var t1111 = select.Where(a => a.BoolNullable == true && a.Int > 0).ToList();
+            var t2222 = select.Where(a => a.BoolNullable != true && a.Int > 0).ToList();
+            var t3333 = select.Where(a => a.BoolNullable == false && a.Int > 0).ToList();
+            var t4444 = select.Where(a => !a.BoolNullable.Value && a.Int > 0).ToList();
+            var t5555 = select.Where(a => a.BoolNullable.Value && a.Int > 0).ToList();
+
+            var t11111 = select.Where(a => a.Bool == true && a.Int > 0 && a.Bool == true).ToList();
+            var t22222 = select.Where(a => a.Bool != true && a.Int > 0 && a.Bool != true).ToList();
+            var t33333 = select.Where(a => a.Bool == false && a.Int > 0 && a.Bool == false).ToList();
+            var t44444 = select.Where(a => !a.Bool && a.Int > 0 && !a.Bool).ToList();
+            var t55555 = select.Where(a => a.Bool && a.Int > 0 && a.Bool).ToList();
+
+            var t111111 = select.Where(a => a.BoolNullable == true && a.Int > 0 && a.BoolNullable == true).ToList();
+            var t222222 = select.Where(a => a.BoolNullable != true && a.Int > 0 && a.BoolNullable != true).ToList();
+            var t333333 = select.Where(a => a.BoolNullable == false && a.Int > 0 && a.BoolNullable == false).ToList();
+            var t444444 = select.Where(a => !a.BoolNullable.Value && a.Int > 0 && !a.BoolNullable.Value).ToList();
+            var t555555 = select.Where(a => a.BoolNullable.Value && a.Int > 0 && a.BoolNullable.Value).ToList();
+        }
+
+        [Fact]
+        public void Array()
+        {
+            IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+            var testlinq = select.Where(a => testlinqlist.Contains(a.Int)).ToList();
+
+            //in not in
+            var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
+            //var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+            var sql113 = select.Where(a => !new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+            var inarray = new[] { 1, 2, 3 };
+            var sql1111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+            //var sql1122 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+            var sql1133 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+
+            //in not in
+            var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+            //var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+            var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+            var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+            //var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int) == false).ToList();
+            var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+
+            var inarray2 = new List<int>() { 1, 2, 3 };
+            var sql111111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+            //var sql112222 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+            var sql113333 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+            var inarray2n = Enumerable.Range(1, 3333).ToArray();
+            var sql1111111 = select.Where(a => inarray2n.Contains(a.Int)).ToList();
+            var sql1122222 = select.Where(a => inarray2n.Contains(a.Int) == false).ToList();
+            var sql1133333 = select.Where(a => !inarray2n.Contains(a.Int)).ToList();
+        }
+
+        [Table(Name = "tb_alltype")]
+        class TableAllType
+        {
+            [Column(IsPrimary = true)]
+            public Guid Id { get; set; }
+
+            public string id2 { get; set; } = "id2=10";
+
+            public bool Bool { get; set; }
+            public sbyte SByte { get; set; }
+            public short Short { get; set; }
+            public int Int { get; set; }
+            public long Long { get; set; }
+            public byte Byte { get; set; }
+            public ushort UShort { get; set; }
+            public uint UInt { get; set; }
+            public ulong ULong { get; set; }
+            public double Double { get; set; }
+            public float Float { get; set; }
+            public decimal Decimal { get; set; }
+            public TimeSpan TimeSpan { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime DateTime { get; set; }
+
+            public byte[] Bytes { get; set; }
+            public string String { get; set; }
+            public Guid Guid { get; set; }
+
+            public bool? BoolNullable { get; set; }
+            public sbyte? SByteNullable { get; set; }
+            public short? ShortNullable { get; set; }
+            public int? IntNullable { get; set; }
+            public long? testFielLongNullable { get; set; }
+            public byte? ByteNullable { get; set; }
+            public ushort? UShortNullable { get; set; }
+            public uint? UIntNullable { get; set; }
+            public ulong? ULongNullable { get; set; }
+            public double? DoubleNullable { get; set; }
+            public float? FloatNullable { get; set; }
+            public decimal? DecimalNullable { get; set; }
+            public TimeSpan? TimeSpanNullable { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime? DateTimeNullable { get; set; }
+
+            public Guid? GuidNullable { get; set; }
+
+            public TableAllTypeEnumType1 Enum1 { get; set; }
+            public TableAllTypeEnumType1? Enum1Nullable { get; set; }
+            public TableAllTypeEnumType2 Enum2 { get; set; }
+            public TableAllTypeEnumType2? Enum2Nullable { get; set; }
+        }
+
+        public enum TableAllTypeEnumType1 { e1, e2, e3, e5 }
+        [Flags] public enum TableAllTypeEnumType2 { f1, f2, f3 }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/StringTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/StringTest.cs
new file mode 100644
index 00000000..fb6a1e8b
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/StringTest.cs
@@ -0,0 +1,816 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class StringTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+        class TestEqualsGuid
+        {
+            public Guid id { get; set; }
+        }
+
+        [Fact]
+        public void Equals__()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+            list.Add(g.gbase.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+        }
+
+        [Fact]
+        public void StringJoin()
+        {
+            var fsql = g.gbase;
+            fsql.Delete<StringJoin01>().Where("1=1").ExecuteAffrows();
+            fsql.Insert(new[] { new StringJoin01 { name = "����" }, new StringJoin01 { name = "�Ϻ�" }, new StringJoin01 { name = "����" }, }).ExecuteAffrows();
+
+            var val1 = string.Join(",", fsql.Select<StringJoin01>().ToList(a => a.name));
+            var val2 = fsql.Select<StringJoin01>().ToList(a => string.Join(",", fsql.Select<StringJoin01>().As("b").ToList(b => b.name)));
+            Assert.Equal(val1, val2[0]);
+
+            //val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.name));
+            //val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.name)));
+            //Assert.Equal(val1, val2[0]);
+
+            val1 = string.Join(",", fsql.Select<StringJoin01>().ToList(a => a.id));
+            val2 = fsql.Select<StringJoin01>().ToList(a => string.Join(",", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
+            Assert.Equal(val1, val2[0]);
+
+            //val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.id));
+            //val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
+            //Assert.Equal(val1, val2[0]);
+        }
+        class StringJoin01
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void First()
+        {
+            Assert.Equal('x', select.First(a => "x1".First()));
+            Assert.Equal('z', select.First(a => "z1".First()));
+        }
+        [Fact]
+        public void FirstOrDefault()
+        {
+            Assert.Equal('x', select.First(a => "x1".FirstOrDefault()));
+            Assert.Equal('z', select.First(a => "z1".FirstOrDefault()));
+        }
+
+        [Fact]
+        public void Format()
+        {
+            var item = g.gbase.GetRepository<Topic>().Insert(new Topic { Clicks = 101, Title = "�������101", CreateTime = DateTime.Parse("2020-7-5") });
+            var sql = select.WhereDynamic(item).ToSql(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title)
+            });
+            Assert.Equal($@"SELECT 'x'||nvl((a.Id + 1), '')||'z-'||nvl(to_char(a.CreateTime,'YYYYMM'), '')||''||nvl(a.Title, '')||'' as1, ''||nvl((a.Id + 1), '')||'x'||nvl((a.Id + 1), '')||'z-'||nvl(to_char(a.CreateTime,'YYYYMM'), '')||''||nvl(a.Title, '')||'' as2 
+FROM tb_topic a 
+WHERE (a.Id = {item.Id})", sql);
+
+            var item2 = select.WhereDynamic(item).First(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title)
+            });
+            Assert.NotNull(item2);
+            Assert.Equal($"x{item.Id + 1}z-{item.CreateTime.ToString("yyyyMM")}{item.Title}", item2.str);
+            Assert.Equal(string.Format("{0}x{0}z-{1}{2}", item.Id + 1, item.CreateTime.ToString("yyyyMM"), item.Title), item2.str2);
+        }
+
+        [Fact]
+        public void Format4()
+        {
+            //3�� {} ʱ��Arguments ���������Ƿֿ���
+            //4�� {} ʱ��Arguments[1] ֻ�ܽ������������Ȼ�������� NewArray []
+            var item = g.gbase.GetRepository<Topic>().Insert(new Topic { Clicks = 101, Title = "�������101", CreateTime = DateTime.Parse("2020-7-5") });
+            var sql = select.WhereDynamic(item).ToSql(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}{3}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title, a.Title)
+            });
+            Assert.Equal($@"SELECT 'x'||nvl((a.Id + 1), '')||'z-'||nvl(to_char(a.CreateTime,'YYYYMM'), '')||''||nvl(a.Title, '')||''||nvl(a.Title, '')||'' as1, ''||nvl((a.Id + 1), '')||'x'||nvl((a.Id + 1), '')||'z-'||nvl(to_char(a.CreateTime,'YYYYMM'), '')||''||nvl(a.Title, '')||''||nvl(a.Title, '')||'' as2 
+FROM tb_topic a 
+WHERE (a.Id = {item.Id})", sql);
+
+            var item2 = select.WhereDynamic(item).First(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}{3}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title, a.Title)
+            });
+            Assert.NotNull(item2);
+            Assert.Equal($"x{item.Id + 1}z-{item.CreateTime.ToString("yyyyMM")}{item.Title}{item.Title}", item2.str);
+            Assert.Equal(string.Format("{0}x{0}z-{1}{2}{3}", item.Id + 1, item.CreateTime.ToString("yyyyMM"), item.Title, item.Title), item2.str2);
+        }
+
+        [Fact]
+        public void Empty()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (a.Title ?? "") == string.Empty).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (coalesce(a.`Title`, '') = '')
+        }
+
+        [Fact]
+        public void StartsWith()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.StartsWith("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE '%aaa')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title`))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', concat(a.`Title`, 1)))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`))
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1)))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`))
+        }
+        [Fact]
+        public void EndsWith()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.EndsWith("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE 'aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat(a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat(concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat(a__Type.`Name`, '%'))
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE 'aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a__Type.`Name`, '%'))
+        }
+        [Fact]
+        public void Contains()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.Contains("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE '%aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title` +1, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`, '%'))
+            list.Add(select.Where(a => (a.Title + "aaa").Contains("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`, '%'))
+        }
+        [Fact]
+        public void ToLower()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.ToLower() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE(lower(a.`Title`) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a__Type.`Name`)
+        }
+        [Fact]
+        public void ToUpper()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.ToUpper() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (upper(a.`Title`) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Substring()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Substring(0) == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (substr(a.`Title`, 1) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(a.Title.Length) == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, a.Title.Length) == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, 3) == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(1, 2) == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), char_length(a.`Title`) + 1) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, char_length(a.`Title`)) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, 3) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 2, 2) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Length()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Length == 0).ToList());
+            data.Add(select.Where(a => a.Title.Length == 1).ToList());
+            data.Add(select.Where(a => a.Title.Length == a.Title.Length + 1).ToList());
+            data.Add(select.Where(a => a.Title.Length == a.Type.Name.Length).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (char_length(a.`Title`) = char_length(a__Type.`Name`));
+            data.Add(select.Where(a => (a.Title + "aaa").Length == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == 1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == a.Title.Length + 1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == a.Type.Name.Length).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a__Type.`Name`))
+        }
+        [Fact]
+        public void IndexOf()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.IndexOf("aaa") == -1).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == -1).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa') - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1);
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa") == -1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == -1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa') - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1)
+        }
+        [Fact]
+        public void PadLeft()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(a.`Title`, 10, 'a') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(a.`Title`, 10, 'a') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (lpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+        }
+        [Fact]
+        public void PadRight()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.PadRight(10, 'a') == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.PadRight(10, 'a') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(a.`Title`, 10, 'a') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(a.`Title`, 10, 'a') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (rpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+        }
+        [Fact]
+        public void Trim()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Trim() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Trim('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Trim('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Trim('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('a' from a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('b' from trim('a' from a.`Title`)) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim('c' from trim('b' from trim('a' from a.`Title`))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Trim() + "aaa").Trim() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a') + "aaa").Trim('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a', 'b') + "aaa").Trim('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a', 'b', 'c') + "aaa").Trim('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(concat(trim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('a' from concat(trim('a' from a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('b' from trim('a' from concat(trim('b' from trim('a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim('c' from trim('b' from trim('a' from concat(trim('c' from trim('b' from trim('a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void TrimStart()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.TrimStart() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (ltrim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from trim(leading 'a' from a.`Title`)) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.TrimStart() + "aaa").TrimStart() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a') + "aaa").TrimStart('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a', 'b') + "aaa").TrimStart('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a', 'b', 'c') + "aaa").TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (ltrim(concat(ltrim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'a' from trim(leading 'a' from a.`Title`)), 'aaa'))) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))), 'aaa'))))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))), 'aaa'))))))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void TrimEnd()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rtrim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(trailing 'a' from a.`Title`)) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.TrimEnd() + "aaa").TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a') + "aaa").TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b') + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b', 'c') + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rtrim(concat(rtrim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from concat(trim(trailing 'a' from a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'b' from trim(trailing 'a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Replace()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Replace("a", "b") == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c") == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(a.`Title`, 'a', 'b') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(replace(a.`Title`, 'a', 'b'), 'b', 'c') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a') = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Replace("a", "b") + "aaa").TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c") + "aaa").TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(a.`Title`, 'a', 'b'), 'aaa') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'aaa') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a'), 'aaa') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a'), 'aaa') = a__Type.`Name`)
+        }
+        [Fact]
+        public void CompareTo()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title) == 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title) > 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title + 1) == 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title + a.Type.Name) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, a.`Title`) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, a.`Title`) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, concat(a.`Title`, 1)) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (strcmp(a.`Title`, concat(a.`Title`, a__Type.`Name`)) = 0);
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo("aaa") == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title) > 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title + 1) == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Type.Name) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), 'aaa') = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), a.`Title`) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), concat(a.`Title`, 1)) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), a__Type.`Name`) = 0)
+        }
+
+        [Fact]
+        public void string_IsNullOrEmpty()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => string.IsNullOrEmpty(a.Title)).ToList());
+            data.Add(select.Where(a => !string.IsNullOrEmpty(a.Title)).ToList());
+        }
+
+        [Fact]
+        public void string_IsNullOrWhiteSpace()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => string.IsNullOrWhiteSpace(a.Title)).ToList());
+            data.Add(select.Where(a => !string.IsNullOrWhiteSpace(a.Title)).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/TimeSpanTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/TimeSpanTest.cs
new file mode 100644
index 00000000..970e9516
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/FirebirdExpression/TimeSpanTest.cs
@@ -0,0 +1,293 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseExpression
+{
+    public class TimeSpanTest
+    {
+
+        ISelect<Topic> select => g.gbase.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+        [Fact]
+        public void Zero()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > 0)
+        }
+        [Fact]
+        public void MinValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.MinValue).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > -922337203685477580)
+        }
+        [Fact]
+        public void MaxValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay < TimeSpan.MaxValue).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) < 922337203685477580)
+        }
+        [Fact]
+        public void Days()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Days == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 86400000000) = 0)
+        }
+        [Fact]
+        public void Hours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Hours > 0).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 3600000000) mod 24 > 0)
+        }
+        [Fact]
+        public void Milliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Milliseconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000 mod 1000) > 0)
+        }
+        [Fact]
+        public void Minutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Minutes > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 60000000 mod 60) > 0)
+        }
+        [Fact]
+        public void Seconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Seconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000000 mod 60) > 0)
+        }
+        [Fact]
+        public void Ticks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Ticks > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) * 10) > 0)
+        }
+        [Fact]
+        public void TotalDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalDays > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 86400000000) > 0)
+        }
+        [Fact]
+        public void TotalHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalHours > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 3600000000) > 0)
+        }
+        [Fact]
+        public void TotalMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMilliseconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000) > 0)
+        }
+        [Fact]
+        public void TotalMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMinutes > 0).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 60000000) > 0)
+        }
+        [Fact]
+        public void TotalSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalSeconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000000) > 0)
+        }
+        [Fact]
+        public void Add()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Add(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) + (1 * 86400000000)) > 0)
+        }
+        [Fact]
+        public void Subtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Subtract(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) - (1 * 86400000000)) > 0)
+        }
+        [Fact]
+        public void CompareTo()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.CompareTo(TimeSpan.FromDays(1)) > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+        }
+        [Fact]
+        public void this_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Equals(TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.ToString() == "ssss").ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') = 'ssss')
+        }
+
+        [Fact]
+        public void TimeSpan_Compare()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Compare(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1)) > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+        }
+        [Fact]
+        public void TimeSpan_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromHours(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 3600000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMilliseconds(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000)))
+        }
+        [Fact]
+        public void TimeSpan_FromMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMinutes(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 60000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromSeconds(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromTicks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromTicks(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 / 10)))
+        }
+        [Fact]
+        public void TimeSpan_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Parse(a.CreateTime.TimeOfDay.ToString()) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (cast(date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') as signed) > 0)
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseAopTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseAopTest.cs
new file mode 100644
index 00000000..b5f50818
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseAopTest.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var date = DateTime.Now.Date;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now.Date;
+             };
+            g.gbase.Aop.AuditValue += audit;
+
+            g.gbase.Insert(item).ExecuteAffrows();
+
+            g.gbase.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime, date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseCodeFirstTest.cs
new file mode 100644
index 00000000..071b4590
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseCodeFirstTest.cs
@@ -0,0 +1,346 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseCodeFirstTest
+    {
+        [Fact]
+        public void InsertUpdateParameter()
+        {
+            var fsql = g.gbase;
+            fsql.CodeFirst.SyncStructure<ts_iupstr_bak>();
+            var item = new ts_iupstr { id = Guid.NewGuid(), title = string.Join(",", Enumerable.Range(0, 2000).Select(a => "�������")) };
+            Assert.Equal(1, fsql.Insert(item).ExecuteAffrows());
+            var find = fsql.Select<ts_iupstr>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(find.id, item.id);
+            Assert.Equal(find.title, item.title);
+        }
+        [Table(Name = "ts_iupstr_bak", DisableSyncStructure = true)]
+        class ts_iupstr
+        {
+            public Guid id { get; set; }
+            public string title { get; set; }
+        }
+        class ts_iupstr_bak
+        {
+            public Guid id { get; set; }
+            [Column(StringLength = -1)]
+            public string title { get; set; }
+        }
+
+        [Fact]
+        public void Text_StringLength_1()
+        {
+            var str1 = string.Join(",", Enumerable.Range(0, 10000).Select(a => "�������"));
+            var str2 = string.Join(",", Enumerable.Range(0, 10000).Select(a => "�����й��˰�"));
+
+            var item1 = new TS_TEXT02 { Data = str1, Data2 = str2 };
+            Assert.Equal(1, g.gbase.Insert(item1).ExecuteAffrows());
+
+            var item2 = g.gbase.Select<TS_TEXT02>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(str1, item2.Data);
+            Assert.Equal(str2, item2.Data2);
+
+            //NoneParameter
+            item1 = new TS_TEXT02 { Data = str1, Data2 = str2 };
+            Assert.Equal(1, g.gbase.Insert(item1).NoneParameter().ExecuteAffrows());
+            item2 = g.gbase.Select<TS_TEXT02>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(str1, item2.Data);
+            Assert.Equal(str2, item2.Data2);
+            //Assert.Throws<Exception>(() => g.firebird.Insert(item1).NoneParameter().ExecuteAffrows());
+            //Dynamic SQL Error
+            //SQL error code = -104
+            //String literal with 159999 bytes exceeds the maximum length of 65535 bytes
+        }
+        class TS_TEXT02
+        {
+            public Guid Id { get; set; }
+            [Column(StringLength = - 1)]
+            public string Data { get; set; }
+            [Column(StringLength = -1)]
+            public string Data2 { get; set; }
+        }
+
+        [Fact]
+        public void Blob()
+        {
+            var str1 = string.Join(",", Enumerable.Range(0, 10000).Select(a => "�������"));
+            var data1 = Encoding.UTF8.GetBytes(str1);
+
+            var item1 = new TS_BLB01 { Data = data1 };
+            Assert.Equal(1, g.gbase.Insert(item1).ExecuteAffrows());
+
+            var item2 = g.gbase.Select<TS_BLB01>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(item1.Data.Length, item2.Data.Length);
+            var str2 = Encoding.UTF8.GetString(item2.Data);
+            Assert.Equal(str1, str2);
+
+            //NoneParameter
+            item1 = new TS_BLB01 { Data = data1 };
+            Assert.Equal(1, g.gbase.Insert(item1).NoneParameter().ExecuteAffrows());
+            item2 = g.gbase.Select<TS_BLB01>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(item1.Data.Length, item2.Data.Length);
+            str2 = Encoding.UTF8.GetString(item2.Data);
+            Assert.Equal(str1, str2);
+            //Assert.Throws<Exception>(() => g.firebird.Insert(item1).NoneParameter().ExecuteAffrows());
+            //Dynamic SQL Error
+            //SQL error code = -104
+            //String literal with 159999 bytes exceeds the maximum length of 65535 bytes
+        }
+        class TS_BLB01
+        {
+            public Guid Id { get; set; }
+            public byte[] Data { get; set; }
+        }
+        [Fact]
+        public void StringLength()
+        {
+            var dll = g.gbase.CodeFirst.GetComparisonDDLStatements<TS_SLTB>();
+            g.gbase.CodeFirst.SyncStructure<TS_SLTB>();
+        }
+        class TS_SLTB
+        {
+            public Guid Id { get; set; }
+            [Column(StringLength = 50)]
+            public string Title { get; set; }
+
+            [Column(IsNullable = false, StringLength = 50)]
+            public string TitleSub { get; set; }
+        }
+
+        [Fact]
+        public void ���ı�_�ֶ�()
+        {
+            var sql = g.gbase.CodeFirst.GetComparisonDDLStatements<�������ı�>();
+            g.gbase.CodeFirst.SyncStructure<�������ı�>();
+
+            var item = new �������ı�
+            {
+                ���� = "���Ա���",
+                ����ʱ�� = DateTime.Now
+            };
+            Assert.Equal(1, g.gbase.Insert<�������ı�>().AppendData(item).ExecuteAffrows());
+            Assert.NotEqual(Guid.Empty, item.���);
+            var item2 = g.gbase.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.gbase.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.gbase.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.gbase.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.gbase.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.gbase.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+        }
+        class �������ı�
+        {
+            [Column(IsPrimary = true)]
+            public Guid ��� { get; set; }
+
+            public string ���� { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+            public DateTime ����ʱ�� { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime ����ʱ�� { get; set; }
+        }
+
+        [Fact]
+        public void AddUniques()
+        {
+            var sql = g.gbase.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();
+            g.gbase.CodeFirst.SyncStructure<AddUniquesInfo>();
+        }
+        [Table(Name = "AddUniquesInfo", OldName = "AddUniquesInfo2")]
+        [Index("uk_phone", "phone", true)]
+        [Index("uk_group_index", "group,index", true)]
+        [Index("uk_group_index2", "group,index", false)]
+        class AddUniquesInfo
+        {
+            /// <summary>
+            /// ���
+            /// </summary>
+            public Guid id { get; set; }
+            public string phone { get; set; }
+
+            public string group { get; set; }
+            public int index { get; set; }
+            public string index22 { get; set; }
+        }
+        [Fact]
+        public void AddField()
+        {
+            var sql = g.gbase.CodeFirst.GetComparisonDDLStatements<TopicAddField>();
+
+            var id = g.gbase.Insert<TopicAddField>().AppendData(new TopicAddField { }).ExecuteIdentity();
+
+            //var inserted = g.firebird.Insert<TopicAddField>().AppendData(new TopicAddField { }).ExecuteInserted();
+        }
+
+        [Table(Name = "TopicAddField", OldName = "xxxtb.TopicAddField")]
+        public class TopicAddField
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+
+            public string name { get; set; }
+
+            [Column(DbType = "varchar(200) not null", OldName = "title")]
+            public string title2 { get; set; } = "10";
+
+            [Column(IsIgnore = true)]
+            public DateTime ct { get; set; } = DateTime.Now;
+        }
+
+        [Fact]
+        public void GetComparisonDDLStatements()
+        {
+            var sql = g.gbase.CodeFirst.GetComparisonDDLStatements<TableAllType>();
+        }
+
+        IInsert<TableAllType> insert => g.gbase.Insert<TableAllType>();
+        ISelect<TableAllType> select => g.gbase.Select<TableAllType>();
+
+        [Fact]
+        public void CurdAllField()
+        {
+            var item = new TableAllType { };
+            insert.AppendData(item).ExecuteAffrows();
+
+            var newitem = select.Where(a => a.Id == item.Id).ToOne();
+
+            var item2 = new TableAllType
+            {
+                Bool = true,
+                BoolNullable = true,
+                Byte = 255,
+                ByteNullable = 127,
+                Bytes = Encoding.UTF8.GetBytes("�������"),
+                DateTime = DateTime.Now,
+                DateTimeNullable = DateTime.Now.AddHours(-1),
+                Decimal = 99.99M,
+                DecimalNullable = 99.98M,
+                Double = 999.99,
+                DoubleNullable = 999.98,
+                Enum1 = TableAllTypeEnumType1.e5,
+                Enum1Nullable = TableAllTypeEnumType1.e3,
+                Enum2 = TableAllTypeEnumType2.f2,
+                Enum2Nullable = TableAllTypeEnumType2.f3,
+                Float = 19.99F,
+                FloatNullable = 19.98F,
+                Guid = Guid.NewGuid(),
+                GuidNullable = Guid.NewGuid(),
+                Int = int.MaxValue,
+                IntNullable = int.MinValue + 1,
+                SByte = 100,
+                SByteNullable = 99,
+                Short = short.MaxValue,
+                ShortNullable = short.MinValue + 1,
+                String = "�������string'\\?!@#$%^&*()_+{}}{~?><<>",
+                TimeSpan = TimeSpan.FromSeconds(999),
+                TimeSpanNullable = TimeSpan.FromSeconds(60),
+                UInt = uint.MaxValue,
+                UIntNullable = uint.MinValue + 1,
+                ULong = long.MaxValue,
+                ULongNullable = ulong.MinValue + 1,
+                UShort = ushort.MaxValue,
+                UShortNullable = ushort.MinValue + 1,
+                testFielLongNullable = long.MinValue + 1
+            };
+            var sqlPar = insert.AppendData(item2).ToSql();
+            var sqlText = insert.AppendData(item2).NoneParameter().ToSql();
+
+            insert.AppendData(item2).ExecuteAffrows();
+            var newitem2 = select.Where(a => a.Id == item2.Id).ToOne();
+            Assert.Equal(item2.String, newitem2.String);
+
+            item2.Id = Guid.NewGuid();
+            insert.NoneParameter().AppendData(item2).ExecuteAffrows();
+            newitem2 = select.Where(a => a.Id == item2.Id).ToOne();
+            Assert.Equal(item2.String, newitem2.String);
+
+            var items = select.ToList();
+        }
+
+        [Table(Name = "tb_alltype")]
+        class TableAllType
+        {
+            [Column(IsPrimary = true)]
+            public Guid Id { get; set; }
+
+            public string id2 { get; set; } = "id2=10";
+
+            public bool Bool { get; set; }
+            public sbyte SByte { get; set; }
+            public short Short { get; set; }
+            public int Int { get; set; }
+            public long Long { get; set; }
+            public byte Byte { get; set; }
+            public ushort UShort { get; set; }
+            public uint UInt { get; set; }
+            public ulong ULong { get; set; }
+            public double Double { get; set; }
+            public float Float { get; set; }
+            public decimal Decimal { get; set; }
+            public TimeSpan TimeSpan { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime DateTime { get; set; }
+
+            public byte[] Bytes { get; set; }
+            public string String { get; set; }
+            public Guid Guid { get; set; }
+
+            public bool? BoolNullable { get; set; }
+            public sbyte? SByteNullable { get; set; }
+            public short? ShortNullable { get; set; }
+            public int? IntNullable { get; set; }
+            public long? testFielLongNullable { get; set; }
+            public byte? ByteNullable { get; set; }
+            public ushort? UShortNullable { get; set; }
+            public uint? UIntNullable { get; set; }
+            public ulong? ULongNullable { get; set; }
+            public double? DoubleNullable { get; set; }
+            public float? FloatNullable { get; set; }
+            public decimal? DecimalNullable { get; set; }
+            public TimeSpan? TimeSpanNullable { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime? DateTimeNullable { get; set; }
+
+            public Guid? GuidNullable { get; set; }
+
+            public TableAllTypeEnumType1 Enum1 { get; set; }
+            public TableAllTypeEnumType1? Enum1Nullable { get; set; }
+            public TableAllTypeEnumType2 Enum2 { get; set; }
+            public TableAllTypeEnumType2? Enum2Nullable { get; set; }
+        }
+
+        public enum TableAllTypeEnumType1 { e1, e2, e3, e5 }
+        [Flags] public enum TableAllTypeEnumType2 { f1, f2, f3 }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseDbFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseDbFirstTest.cs
new file mode 100644
index 00000000..53a7013b
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/GBaseDbFirstTest.cs
@@ -0,0 +1,50 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.GBase
+{
+    public class GBaseDbFirstTest
+    {
+        [Fact]
+        public void GetDatabases()
+        {
+        }
+
+        [Fact]
+        public void GetTablesByDatabase()
+        {
+        }
+
+        [Fact]
+        public void GetTableByName()
+        {
+            var fsql = g.gbase;
+            var t1 = fsql.DbFirst.GetTableByName("tb_alltype");
+            Assert.NotNull(t1);
+            var t3 = fsql.DbFirst.GetTableByName("notexists_tb");
+            Assert.Null(t3);
+        }
+
+        [Fact]
+        public void ExistsTable()
+        {
+            var fsql = g.gbase;
+            try
+            {
+                fsql.Ado.ExecuteNonQuery("drop table test_existstb011");
+            }
+            catch { }
+            Assert.False(fsql.DbFirst.ExistsTable("test_existstb011"));
+            Assert.False(fsql.DbFirst.ExistsTable("test_existstb011", false));
+            fsql.CodeFirst.SyncStructure(typeof(test_existstb011));
+            Assert.True(fsql.DbFirst.ExistsTable("test_existstb011"));
+            Assert.False(fsql.DbFirst.ExistsTable("Test_existstb011", false));
+            fsql.Ado.ExecuteNonQuery("drop table test_existstb011");
+        }
+        class test_existstb011
+        {
+            public Guid id { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolNullableTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolNullableTest.cs
new file mode 100644
index 00000000..0d1e46a9
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolNullableTest.cs
@@ -0,0 +1,1571 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseMapType
+{
+    public class BoolNullableTest
+    {
+        class BoolNullableMap
+        {
+            public Guid id { get; set; }
+            [Column(MapType = typeof(bool))]
+            public bool? tobool { get; set; } = true;
+
+            [Column(MapType = typeof(sbyte))]
+            public bool? tosbyte { get; set; } = true;
+            [Column(MapType = typeof(sbyte?))]
+            public bool? tosbytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(short))]
+            public bool? toshort { get; set; } = true;
+
+            [Column(MapType = typeof(short?))]
+            public bool? toshortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(int))]
+            public bool? toint { get; set; } = true;
+
+            [Column(MapType = typeof(int?))]
+            public bool? tointnullable { get; set; } = true;
+
+            [Column(MapType = typeof(long))]
+            public bool? tolong { get; set; } = true;
+            [Column(MapType = typeof(long?))]
+            public bool? tolongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(byte))]
+            public bool? tobyte { get; set; } = true;
+            [Column(MapType = typeof(byte?))]
+            public bool? tobytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(ushort))]
+            public bool? toushort { get; set; } = true;
+
+            [Column(MapType = typeof(ushort?))]
+            public bool? toushortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(uint))]
+            public bool? touint { get; set; } = true;
+
+            [Column(MapType = typeof(uint?))]
+            public bool? touintnullable { get; set; } = true;
+
+            [Column(MapType = typeof(ulong))]
+            public bool? toulong { get; set; } = true;
+            [Column(MapType = typeof(ulong?))]
+            public bool? toulongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(string))]
+            public bool? tostring { get; set; } = true;
+        }
+        [Fact]
+        public void Bool()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(true, find.tobool);
+
+            item = new BoolNullableMap { tobool = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            item = new BoolNullableMap { tobool = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            //update all
+            item.tobool = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(true, find.tobool);
+
+            item.tobool = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            item.tobool = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobool);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobool);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobool);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByte()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(true, find.tosbyte);
+
+            item = new BoolNullableMap { tosbyte = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            item = new BoolNullableMap { tosbyte = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            //update all
+            item.tosbyte = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(true, find.tosbyte);
+
+            item.tosbyte = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            item.tosbyte = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByteNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(true, find.tosbytenullable);
+
+            item = new BoolNullableMap { tosbytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(false, find.tosbytenullable);
+
+            item = new BoolNullableMap { tosbytenullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Null(find.tosbytenullable);
+
+            //update all
+            item.tosbytenullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(true, find.tosbytenullable);
+
+            item.tosbytenullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(false, find.tosbytenullable);
+
+            item.tosbytenullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Null(find.tosbytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tosbytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Short()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(true, find.toshort);
+
+            item = new BoolNullableMap { toshort = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            item = new BoolNullableMap { toshort = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            //update all
+            item.toshort = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(true, find.toshort);
+
+            item.toshort = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            item.toshort = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ShortNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(true, find.toshortnullable);
+
+            item = new BoolNullableMap { toshortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(false, find.toshortnullable);
+
+            item = new BoolNullableMap { toshortnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Null(find.toshortnullable);
+
+            //update all
+            item.toshortnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(true, find.toshortnullable);
+
+            item.toshortnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(false, find.toshortnullable);
+
+            item.toshortnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Null(find.toshortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toshortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Int()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(true, find.toint);
+
+            item = new BoolNullableMap { toint = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            item = new BoolNullableMap { toint = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            //update all
+            item.toint = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(true, find.toint);
+
+            item.toint = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            item.toint = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void IntNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(true, find.tointnullable);
+
+            item = new BoolNullableMap { tointnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(false, find.tointnullable);
+
+            item = new BoolNullableMap { tointnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Null(find.tointnullable);
+
+            //update all
+            item.tointnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(true, find.tointnullable);
+
+            item.tointnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(false, find.tointnullable);
+
+            item.tointnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Null(find.tointnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tointnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Long()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(true, find.tolong);
+
+            item = new BoolNullableMap { tolong = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            item = new BoolNullableMap { tolong = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            //update all
+            item.tolong = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(true, find.tolong);
+
+            item.tolong = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            item.tolong = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void LongNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(true, find.tolongnullable);
+
+            item = new BoolNullableMap { tolongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(false, find.tolongnullable);
+
+            item = new BoolNullableMap { tolongnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Null(find.tolongnullable);
+
+            //update all
+            item.tolongnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(true, find.tolongnullable);
+
+            item.tolongnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(false, find.tolongnullable);
+
+            item.tolongnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Null(find.tolongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tolongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Byte()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(true, find.tobyte);
+
+            item = new BoolNullableMap { tobyte = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            item = new BoolNullableMap { tobyte = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            //update all
+            item.tobyte = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(true, find.tobyte);
+
+            item.tobyte = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            item.tobyte = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ByteNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(true, find.tobytenullable);
+
+            item = new BoolNullableMap { tobytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(false, find.tobytenullable);
+
+            item = new BoolNullableMap { tobytenullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Null(find.tobytenullable);
+
+            //update all
+            item.tobytenullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(true, find.tobytenullable);
+
+            item.tobytenullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(false, find.tobytenullable);
+
+            item.tobytenullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Null(find.tobytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tobytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShort()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(true, find.toushort);
+
+            item = new BoolNullableMap { toushort = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            item = new BoolNullableMap { toushort = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            //update all
+            item.toushort = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(true, find.toushort);
+
+            item.toushort = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            item.toushort = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShortNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(true, find.toushortnullable);
+
+            item = new BoolNullableMap { toushortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(false, find.toushortnullable);
+
+            item = new BoolNullableMap { toushortnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Null(find.toushortnullable);
+
+            //update all
+            item.toushortnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(true, find.toushortnullable);
+
+            item.toushortnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(false, find.toushortnullable);
+
+            item.toushortnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Null(find.toushortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toushortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UInt()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(true, find.touint);
+
+            item = new BoolNullableMap { touint = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            item = new BoolNullableMap { touint = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            //update all
+            item.touint = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(true, find.touint);
+
+            item.touint = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            item.touint = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.touint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UIntNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(true, find.touintnullable);
+
+            item = new BoolNullableMap { touintnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(false, find.touintnullable);
+
+            item = new BoolNullableMap { touintnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Null(find.touintnullable);
+
+            //update all
+            item.touintnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(true, find.touintnullable);
+
+            item.touintnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(false, find.touintnullable);
+
+            item.touintnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Null(find.touintnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.touintnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULong()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(true, find.toulong);
+
+            item = new BoolNullableMap { toulong = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            item = new BoolNullableMap { toulong = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            //update all
+            item.toulong = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(true, find.toulong);
+
+            item.toulong = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            item.toulong = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULongNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(true, find.toulongnullable);
+
+            item = new BoolNullableMap { toulongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(false, find.toulongnullable);
+
+            item = new BoolNullableMap { toulongnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Null(find.toulongnullable);
+
+            //update all
+            item.toulongnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(true, find.toulongnullable);
+
+            item.toulongnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(false, find.toulongnullable);
+
+            item.toulongnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Null(find.toulongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toulongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void TimeSpan()
+        {
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+        }
+        [Fact]
+        public void DateTime()
+        {
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+        }
+
+        [Fact]
+        public void ByteArray()
+        {
+        }
+        [Fact]
+        public void String()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(true, find.tostring);
+
+            item = new BoolNullableMap { tostring = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(false, find.tostring);
+
+            item = new BoolNullableMap { tostring = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Null(find.tostring);
+
+            //update all
+            item.tostring = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(true, find.tostring);
+
+            item.tostring = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(false, find.tostring);
+
+            item.tostring = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Null(find.tostring);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tostring);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid()
+        {
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolTest.cs
new file mode 100644
index 00000000..dd32892a
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/BoolTest.cs
@@ -0,0 +1,1105 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseMapType
+{
+    public class BoolTest
+    {
+
+        class BoolMap
+        {
+            public Guid id { get; set; }
+            [Column(MapType = typeof(bool?))]
+            public bool toboolnullable { get; set; } = true;
+
+            [Column(MapType = typeof(sbyte))]
+            public bool tosbyte { get; set; } = true;
+            [Column(MapType = typeof(sbyte?))]
+            public bool tosbytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(short))]
+            public bool toshort { get; set; } = true;
+
+            [Column(MapType = typeof(short?))]
+            public bool toshortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(int))]
+            public bool toint { get; set; } = true;
+
+            [Column(MapType = typeof(int?))]
+            public bool tointnullable { get; set; } = true;
+
+            [Column(MapType = typeof(long))]
+            public bool tolong { get; set; } = true;
+            [Column(MapType = typeof(long?))]
+            public bool tolongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(byte))]
+            public bool tobyte { get; set; } = true;
+            [Column(MapType = typeof(byte?))]
+            public bool tobytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(ushort))]
+            public bool toushort { get; set; } = true;
+
+            [Column(MapType = typeof(ushort?))]
+            public bool toushortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(uint))]
+            public bool touint { get; set; } = true;
+
+            [Column(MapType = typeof(uint?))]
+            public bool touintnullable { get; set; } = true;
+
+            [Column(MapType = typeof(ulong))]
+            public bool toulong { get; set; } = true;
+            [Column(MapType = typeof(ulong?))]
+            public bool toulongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(string))]
+            public bool tostring { get; set; } = true;
+        }
+
+        [Fact]
+        public void BoolNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.True(find.toboolnullable);
+
+            item = new BoolMap { toboolnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.False(find.toboolnullable);
+
+            //update all
+            item.toboolnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.True(find.toboolnullable);
+
+            item.toboolnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.False(find.toboolnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toboolnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toboolnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toboolnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toboolnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByte()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.True(find.tosbyte);
+
+            item = new BoolMap { tosbyte = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.False(find.tosbyte);
+
+            //update all
+            item.tosbyte = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.True(find.tosbyte);
+
+            item.tosbyte = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.False(find.tosbyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tosbyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByteNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.True(find.tosbytenullable);
+
+            item = new BoolMap { tosbytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.False(find.tosbytenullable);
+
+            //update all
+            item.tosbytenullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.True(find.tosbytenullable);
+
+            item.tosbytenullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.False(find.tosbytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tosbytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Short()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.True(find.toshort);
+
+            item = new BoolMap { toshort = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.False(find.toshort);
+
+            //update all
+            item.toshort = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.True(find.toshort);
+
+            item.toshort = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.False(find.toshort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshort, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshort, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toshort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshort == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ShortNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.True(find.toshortnullable);
+
+            item = new BoolMap { toshortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.False(find.toshortnullable);
+
+            //update all
+            item.toshortnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.True(find.toshortnullable);
+
+            item.toshortnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.False(find.toshortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toshortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Int()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.True(find.toint);
+
+            item = new BoolMap { toint = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.False(find.toint);
+
+            //update all
+            item.toint = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.True(find.toint);
+
+            item.toint = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.False(find.toint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toint, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toint);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toint, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toint == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void IntNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.True(find.tointnullable);
+
+            item = new BoolMap { tointnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.False(find.tointnullable);
+
+            //update all
+            item.tointnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.True(find.tointnullable);
+
+            item.tointnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.False(find.tointnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tointnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Long()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.True(find.tolong);
+
+            item = new BoolMap { tolong = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.False(find.tolong);
+
+            //update all
+            item.tolong = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.True(find.tolong);
+
+            item.tolong = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.False(find.tolong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolong, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolong, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tolong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolong == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void LongNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.True(find.tolongnullable);
+
+            item = new BoolMap { tolongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.False(find.tolongnullable);
+
+            //update all
+            item.tolongnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.True(find.tolongnullable);
+
+            item.tolongnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.False(find.tolongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tolongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Byte()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.True(find.tobyte);
+
+            item = new BoolMap { tobyte = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.False(find.tobyte);
+
+            //update all
+            item.tobyte = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.True(find.tobyte);
+
+            item.tobyte = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.False(find.tobyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobyte, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobyte, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tobyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ByteNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.True(find.tobytenullable);
+
+            item = new BoolMap { tobytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.False(find.tobytenullable);
+
+            //update all
+            item.tobytenullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.True(find.tobytenullable);
+
+            item.tobytenullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.False(find.tobytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tobytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShort()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.True(find.toushort);
+
+            item = new BoolMap { toushort = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.False(find.toushort);
+
+            //update all
+            item.toushort = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.True(find.toushort);
+
+            item.toushort = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.False(find.toushort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushort, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushort, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toushort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushort == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShortNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.True(find.toushortnullable);
+
+            item = new BoolMap { toushortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.False(find.toushortnullable);
+
+            //update all
+            item.toushortnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.True(find.toushortnullable);
+
+            item.toushortnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.False(find.toushortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toushortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UInt()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.True(find.touint);
+
+            item = new BoolMap { touint = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.False(find.touint);
+
+            //update all
+            item.touint = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.True(find.touint);
+
+            item.touint = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.False(find.touint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touint, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.touint);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touint, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.touint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touint == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UIntNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.True(find.touintnullable);
+
+            item = new BoolMap { touintnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.False(find.touintnullable);
+
+            //update all
+            item.touintnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.True(find.touintnullable);
+
+            item.touintnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.False(find.touintnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.touintnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULong()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.True(find.toulong);
+
+            item = new BoolMap { toulong = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.False(find.toulong);
+
+            //update all
+            item.toulong = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.True(find.toulong);
+
+            item.toulong = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.False(find.toulong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulong, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulong, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toulong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulong == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULongNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.True(find.toulongnullable);
+
+            item = new BoolMap { toulongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.False(find.toulongnullable);
+
+            //update all
+            item.toulongnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.True(find.toulongnullable);
+
+            item.toulongnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.False(find.toulongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toulongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void TimeSpan()
+        {
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+        }
+        [Fact]
+        public void DateTime()
+        {
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+        }
+
+        [Fact]
+        public void ByteArray()
+        {
+        }
+        [Fact]
+        public void String()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.True(find.tostring);
+
+            item = new BoolMap { tostring = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.False(find.tostring);
+
+            //update all
+            item.tostring = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.True(find.tostring);
+
+            item.tostring = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.False(find.tostring);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tostring, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tostring, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tostring);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tostring == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tostring == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid()
+        {
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/DateTimeOffSetTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/DateTimeOffSetTest.cs
new file mode 100644
index 00000000..c542bec5
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/DateTimeOffSetTest.cs
@@ -0,0 +1,54 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseMapType
+{
+    public class DateTimeOffSetTest
+    {
+        class Dtos_dt
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(DateTime))]
+            public DateTimeOffset dtos_to_dt { get; set; }
+            [Column(MapType = typeof(DateTime))]
+            public DateTimeOffset? dtofnil_to_dt { get; set; }
+        }
+        [Fact]
+        public void DateTimeToDateTimeOffSet()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new Dtos_dt { dtos_to_dt = DateTimeOffset.Now, dtofnil_to_dt = DateTimeOffset.Now };
+            Assert.Equal(1, orm.Insert<Dtos_dt>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<Dtos_dt>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtofnil_to_dt.Value.ToString("g"), find.dtofnil_to_dt.Value.ToString("g"));
+
+            //update all
+            item.dtos_to_dt = DateTimeOffset.Now;
+            Assert.Equal(1, orm.Update<Dtos_dt>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<Dtos_dt>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtofnil_to_dt.Value.ToString("g"), find.dtofnil_to_dt.Value.ToString("g"));
+
+            //update set
+            Assert.Equal(1, orm.Update<Dtos_dt>().Where(a => a.id == item.id).Set(a => a.dtos_to_dt, item.dtos_to_dt = DateTimeOffset.Now).ExecuteAffrows());
+            find = orm.Select<Dtos_dt>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtofnil_to_dt.Value.ToString("g"), find.dtofnil_to_dt.Value.ToString("g"));
+
+            //delete
+            Assert.Equal(1, orm.Delete<Dtos_dt>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<Dtos_dt>().Where(a => a.id == item.id).First());
+        }
+        
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/EnumTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/EnumTest.cs
new file mode 100644
index 00000000..ea847b1a
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/EnumTest.cs
@@ -0,0 +1,261 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseMapType
+{
+    public class EnumTest
+    {
+        class EnumTestMap
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum enum_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum? enumnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(int))]
+            public ToStringMapEnum enum_to_int { get; set; }
+            [Column(MapType = typeof(int?))]
+            public ToStringMapEnum? enumnullable_to_int { get; set; }
+        }
+        public enum ToStringMapEnum { ���, abc, ��� }
+        [Fact]
+        public void EnumToString()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item = new EnumTestMap { enum_to_string = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //update all
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullableToString()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            item = new EnumTestMap { enumnullable_to_string = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            //update all
+            item.enumnullable_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            item.enumnullable_to_string = null;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void EnumToInt()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            item = new EnumTestMap { enum_to_int = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_int);
+
+            //update all
+            item.enum_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            item.enum_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_int, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_int, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_int);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullableToInt()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Null(find.enumnullable_to_int);
+
+            item = new EnumTestMap { enumnullable_to_int = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_int);
+
+            //update all
+            item.enumnullable_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_int);
+
+            item.enumnullable_to_int = null;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Null(find.enumnullable_to_int);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_int, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_int);
+
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_int, null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.abc).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_int);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/ToStringTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/ToStringTest.cs
new file mode 100644
index 00000000..b9f6adb0
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/MapType/ToStringTest.cs
@@ -0,0 +1,570 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.GBaseMapType
+{
+    public class ToStringTest
+    {
+        class ToStringMap
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public TimeSpan timespan_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public TimeSpan? timespannullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public DateTime datetime_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public DateTime? datetimenullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public Guid guid_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public Guid? guidnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum enum_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum? enumnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public BigInteger biginteger_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public BigInteger? bigintegernullable_to_string { get; set; }
+        }
+        public enum ToStringMapEnum { ���, abc, ��� }
+        [Fact]
+        public void Enum1()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item = new ToStringMap { enum_to_string = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //update all
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            item = new ToStringMap { enumnullable_to_string = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            //update all
+            item.enumnullable_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            item.enumnullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void BigInteger1()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 0).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(0, find.biginteger_to_string);
+
+            item = new ToStringMap { biginteger_to_string = 100 };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 100).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(100, find.biginteger_to_string);
+
+            //update all
+            item.biginteger_to_string = 200;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 200).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(200, find.biginteger_to_string);
+
+            item.biginteger_to_string = 205;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 205).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(205, find.biginteger_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.biginteger_to_string, 522).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 522).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(522, find.biginteger_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.biginteger_to_string, 10005).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 10005).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(10005, find.biginteger_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 522).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 205).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 10005).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void BigIntegerNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            item = new ToStringMap { bigintegernullable_to_string = 101 };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 101).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Equal(101, find.bigintegernullable_to_string);
+
+            //update all
+            item.bigintegernullable_to_string = 2004;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Equal(2004, find.bigintegernullable_to_string);
+
+            item.bigintegernullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.bigintegernullable_to_string, 998).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(998, find.bigintegernullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.bigintegernullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void TimeSpan1()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.Zero, find.timespan_to_string);
+
+            item = new ToStringMap { timespan_to_string = TimeSpan.FromDays(1) };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.FromDays(1), find.timespan_to_string);
+
+            //update all
+            item.timespan_to_string = TimeSpan.FromHours(10);
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.FromHours(10), find.timespan_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespan_to_string, TimeSpan.FromHours(11)).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(TimeSpan.FromHours(11), find.timespan_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Null(find.timespannullable_to_string);
+
+            item = new ToStringMap { timespannullable_to_string = TimeSpan.FromDays(1) };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Equal(TimeSpan.FromDays(1), find.timespannullable_to_string);
+
+            //update all
+            item.timespannullable_to_string = TimeSpan.FromHours(10);
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Equal(TimeSpan.FromHours(10), find.timespannullable_to_string);
+
+            item.timespannullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Null(find.timespannullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespannullable_to_string, TimeSpan.FromHours(11)).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(TimeSpan.FromHours(11), find.timespannullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespannullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.timespannullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void DateTime1()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.MinValue, find.datetime_to_string);
+
+            item = new ToStringMap { datetime_to_string = DateTime.Parse("2000-1-1") };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-1"), find.datetime_to_string);
+
+            //update all
+            item.datetime_to_string = DateTime.Parse("2000-1-11");
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-11"), find.datetime_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetime_to_string, DateTime.Parse("2000-1-12")).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(DateTime.Parse("2000-1-12"), find.datetime_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Null(find.datetimenullable_to_string);
+
+            item = new ToStringMap { datetimenullable_to_string = DateTime.Parse("2000-1-1") };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-1"), find.datetimenullable_to_string);
+
+            //update all
+            item.datetimenullable_to_string = DateTime.Parse("2000-1-11");
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-11"), find.datetimenullable_to_string);
+
+            item.datetimenullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Null(find.datetimenullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetimenullable_to_string, DateTime.Parse("2000-1-12")).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(DateTime.Parse("2000-1-12"), find.datetimenullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetimenullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.datetimenullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid1()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == Guid.Empty).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(Guid.Empty, find.guid_to_string);
+
+            var newid = Guid.NewGuid();
+            item = new ToStringMap { guid_to_string = newid };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //update all
+            newid = Guid.NewGuid();
+            item.guid_to_string = newid;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //update set
+            newid = Guid.NewGuid();
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guid_to_string, newid).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+            //insert
+            var orm = g.gbase;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Null(find.guidnullable_to_string);
+
+            var newid = Guid.NewGuid();
+            item = new ToStringMap { guidnullable_to_string = newid };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            //update all
+            newid = Guid.NewGuid();
+            item.guidnullable_to_string = newid;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            item.guidnullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Null(find.guidnullable_to_string);
+
+            //update set
+            newid = Guid.NewGuid();
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guidnullable_to_string, newid).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guidnullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.guidnullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs
new file mode 100644
index 00000000..8fcee4a4
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Odbc;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+
+public class g
+{
+
+
+    static Lazy<IFreeSql> gbaseLazy = new Lazy<IFreeSql>(() =>
+    {
+        var build = new OdbcConnectionStringBuilder();
+        build.Driver = "GBase ODBC DRIVER (64-Bit)";    // 在系统中注册的驱动名称
+        build.Add("Host", "192.168.164.134");          // 主机地址或者IP地址
+        build.Add("Service", "9088");                   // 数据库服务器的使用的端口号
+        build.Add("Server", "gbase01");                 // 数据库服务名称
+        build.Add("Database", "testdb");                // 数据库名（DBNAME）
+        build.Add("Protocol", "onsoctcp");              // 网络协议名称
+        build.Add("Uid", "gbasedbt");                   // 用户
+        build.Add("Pwd", "GBase123");                   // 密码
+        build.Add("Db_locale", "zh_CN.utf8");           // 数据库字符集
+        build.Add("Client_locale", "zh_CN.utf8");       // 客户端字符集
+
+        return new FreeSql.FreeSqlBuilder()
+            .UseConnectionString(FreeSql.DataType.GBase, build.ConnectionString)
+            .UseAutoSyncStructure(true)
+            .UseLazyLoading(true)
+
+            .UseMonitorCommand(
+                cmd => Trace.WriteLine(cmd.CommandText), //监听SQL命令对象，在执行前
+                (cmd, traceLog) => Console.WriteLine(traceLog))
+            .Build();
+    });
+    public static IFreeSql gbase => gbaseLazy.Value;
+
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
index 48c9376e..e6c259e3 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/Curd/MySqlInsertTest.cs
@@ -29,6 +29,31 @@ namespace FreeSql.Tests.MySqlConnector
         }
         enum TestEnumInserTbType { str1, biggit, sum211 }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.mysql;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(@id_0, @name_0), (@id_1, @name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(1, 'xxxx'), (2, 'yyyy')", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/Properties/launchSettings.json b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/Properties/launchSettings.json
new file mode 100644
index 00000000..33504c94
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj
new file mode 100644
index 00000000..93061340
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.7" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" />
+    <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
+    <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+    <ProjectReference Include="..\..\Providers\FreeSql.Provider.SqliteCore\FreeSql.Provider.SqliteCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteDeleteTest.cs
new file mode 100644
index 00000000..dad8da8b
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteDeleteTest.cs
@@ -0,0 +1,106 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteDeleteTest
+    {
+
+        IDelete<Topic> delete => g.sqlite.Delete<Topic>(); //��������
+
+        [Table(Name = "tb_topic22211")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int? Clicks { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void Dywhere()
+        {
+            Assert.Null(g.sqlite.Delete<Topic>().ToSql());
+            var sql = g.sqlite.Delete<Topic>(new[] { 1, 2 }).ToSql();
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" IN (1,2))", sql);
+
+            sql = g.sqlite.Delete<Topic>(new Topic { Id = 1, Title = "test" }).ToSql();
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" = 1)", sql);
+
+            sql = g.sqlite.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).ToSql();
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" IN (1,2))", sql);
+
+            sql = g.sqlite.Delete<Topic>(new { id = 1 }).ToSql();
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" = 1)", sql);
+
+            sql = g.sqlite.Delete<MultiPkTopic>(new[] { new { Id1 = 1, Id2 = 10 }, new { Id1 = 2, Id2 = 20 } }).ToSql();
+            Assert.Equal("DELETE FROM \"MultiPkTopic\" WHERE (\"Id1\" = 1 AND \"Id2\" = 10 OR \"Id1\" = 2 AND \"Id2\" = 20)", sql);
+        }
+        class MultiPkTopic
+        {
+            [Column(IsPrimary = true)]
+            public int Id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int Id2 { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void Where()
+        {
+            var sql = delete.Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" = 1)", sql);
+
+            sql = delete.Where("id = @id", new { id = 1 }).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (id = @id)", sql);
+
+            var item = new Topic { Id = 1, Title = "newtitle" };
+            sql = delete.Where(item).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            sql = delete.Where(items).ToSql().Replace("\r\n", "");
+            Assert.Equal("DELETE FROM \"tb_topic22211\" WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+
+            var id = g.sqlite.Insert<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteIdentity();
+            Assert.Equal(1, delete.Where(a => a.Id == id).ExecuteAffrows());
+        }
+        [Fact]
+        public void ExecuteDeleted()
+        {
+
+            //var item = g.Sqlite.Delete<Topic>(new Topic { Title = "xxxx", CreateTime = DateTime.Now }).ExecuteInserted();
+            //Assert.Equal(item[0].Id, delete.Where(a => a.Id == item[0].Id).ExecuteDeleted()[0].Id);
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            Assert.Null(g.sqlite.Delete<Topic>().AsTable(a => "TopicAsTable").ToSql());
+            var sql = g.sqlite.Delete<Topic>(new[] { 1, 2 }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM \"TopicAsTable\" WHERE (\"Id\" IN (1,2))", sql);
+
+            sql = g.sqlite.Delete<Topic>(new Topic { Id = 1, Title = "test" }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM \"TopicAsTable\" WHERE (\"Id\" = 1)", sql);
+
+            sql = g.sqlite.Delete<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM \"TopicAsTable\" WHERE (\"Id\" IN (1,2))", sql);
+
+            sql = g.sqlite.Delete<Topic>(new { id = 1 }).AsTable(a => "TopicAsTable").ToSql();
+            Assert.Equal("DELETE FROM \"TopicAsTable\" WHERE (\"Id\" = 1)", sql);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateIfExistsDoNothingTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateIfExistsDoNothingTest.cs
new file mode 100644
index 00000000..46e0685d
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateIfExistsDoNothingTest.cs
@@ -0,0 +1,453 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteInsertOrUpdateIfExistsDoNothingTest
+    {
+
+        IFreeSql fsql => g.sqlite;
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimary()
+        {
+            fsql.Delete<tbioudb02>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '011' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new tbioudb02 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 2, '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "01" }, new tbioudb02 { id = 2, name = "02" }, new tbioudb02 { id = 3, name = "03" }, new tbioudb02 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '03' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '04' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb02>().IfExistsDoNothing().SetSource(new[] { new tbioudb02 { id = 1, name = "001" }, new tbioudb02 { id = 2, name = "002" }, new tbioudb02 { id = 3, name = "003" }, new tbioudb02 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb02""(""id"", ""name"") SELECT 1, '001' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '002' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '003' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '004' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb02"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+        }
+        class tbioudb02
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndIdentity()
+        {
+            fsql.Delete<tbioudb022>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '011' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 2, '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "01" }, new tbioudb022 { id = 2, name = "02" }, new tbioudb022 { id = 3, name = "03" }, new tbioudb022 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '03' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '04' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "001" }, new tbioudb022 { id = 2, name = "002" }, new tbioudb022 { id = 3, name = "003" }, new tbioudb022 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '001' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '002' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '003' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '004' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+
+            //--no primary
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "01" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""name"") VALUES('01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""name"") VALUES('011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new tbioudb022 { name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""name"") VALUES('02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { name = "01" }, new tbioudb022 { name = "02" }, new tbioudb022 { name = "03" }, new tbioudb022 { name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""name"") VALUES('01'), ('02'), ('03'), ('04')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { name = "001" }, new tbioudb022 { name = "002" }, new tbioudb022 { name = "003" }, new tbioudb022 { name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""name"") VALUES('001'), ('002'), ('003'), ('004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            //--no primary and yes
+            iou = fsql.InsertOrUpdate<tbioudb022>().IfExistsDoNothing().SetSource(new[] { new tbioudb022 { id = 1, name = "100001" }, new tbioudb022 { name = "00001" }, new tbioudb022 { id = 2, name = "100002" }, new tbioudb022 { name = "00002" }, new tbioudb022 { id = 3, name = "100003" }, new tbioudb022 { name = "00003" }, new tbioudb022 { id = 4, name = "100004" }, new tbioudb022 { name = "00004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb022""(""id"", ""name"") SELECT 1, '100001' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '100002' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '100003' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '100004' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb022"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)
+
+;
+
+INSERT INTO ""tbioudb022""(""name"") VALUES('00001'), ('00002'), ('00003'), ('00004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            lst = fsql.Select<tbioudb022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+        }
+        class tbioudb022
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_TwoPrimary()
+        {
+            fsql.Delete<tbioudb03>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 1 AND a.""id2"" = '01') 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 1, id2 = "01", name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '011' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 1 AND a.""id2"" = '01') 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new tbioudb03 { id1 = 2, id2 = "02", name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 2, '02', '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 2 AND a.""id2"" = '02') 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "01" }, new tbioudb03 { id1 = 2, id2 = "02", name = "02" }, new tbioudb03 { id1 = 3, id2 = "03", name = "03" }, new tbioudb03 { id1 = 4, id2 = "04", name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '01' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 1 AND a.""id2"" = '01') 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '02', '02' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 2 AND a.""id2"" = '02') 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '03', '03' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 3 AND a.""id2"" = '03') 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '04', '04' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 4 AND a.""id2"" = '04') 
+    limit 0,1)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb03>().IfExistsDoNothing().SetSource(new[] { new tbioudb03 { id1 = 1, id2 = "01", name = "001" }, new tbioudb03 { id1 = 2, id2 = "02", name = "002" }, new tbioudb03 { id1 = 3, id2 = "03", name = "003" }, new tbioudb03 { id1 = 4, id2 = "04", name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb03""(""id1"", ""id2"", ""name"") SELECT 1, '01', '001' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 1 AND a.""id2"" = '01') 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '02', '002' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 2 AND a.""id2"" = '02') 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '03', '003' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 3 AND a.""id2"" = '03') 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '04', '004' 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb03"" a 
+    WHERE (a.""id1"" = 4 AND a.""id2"" = '04') 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id1).Count());
+        }
+        class tbioudb03
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string id2 { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndVersionAndCanUpdate()
+        {
+            fsql.Delete<tbioudb04>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '01', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '011', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new tbioudb04 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 2, '02', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "01" }, new tbioudb04 { id = 2, name = "02" }, new tbioudb04 { id = 3, name = "03" }, new tbioudb04 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '01', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '02', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '03', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '04', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(2, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbioudb04>().IfExistsDoNothing().SetSource(new[] { new tbioudb04 { id = 1, name = "001" }, new tbioudb04 { id = 2, name = "002" }, new tbioudb04 { id = 3, name = "003" }, new tbioudb04 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbioudb04""(""id"", ""name"", ""version"", ""CreateTime"") SELECT 1, '001', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 1) 
+    limit 0,1) 
+UNION ALL
+ SELECT 2, '002', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 2) 
+    limit 0,1) 
+UNION ALL
+ SELECT 3, '003', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 3) 
+    limit 0,1) 
+UNION ALL
+ SELECT 4, '004', 0, datetime(current_timestamp,'localtime') 
+ WHERE NOT EXISTS(SELECT 1 
+    FROM ""tbioudb04"" a 
+    WHERE (a.""id"" = 4) 
+    limit 0,1)", sql);
+            Assert.Equal(0, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbioudb04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "0" + a.id).Count());
+        }
+        class tbioudb04
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+            [Column(IsVersion = true)]
+            public int version { get; set; }
+            [Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
+            public DateTime CreateTime { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateTest.cs
new file mode 100644
index 00000000..d0e650ad
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertOrUpdateTest.cs
@@ -0,0 +1,241 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteInsertOrUpdateTest
+    {
+        IFreeSql fsql => g.sqlite;
+
+        [Fact]
+        public void InsertOrUpdate_OnlyPrimary()
+        {
+            fsql.Delete<tbiou01>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
+            var sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 1 });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new tbiou01 { id = 2 });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(2)", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou01>().SetSource(new[] { new tbiou01 { id = 1 }, new tbiou01 { id = 2 }, new tbiou01 { id = 3 }, new tbiou01 { id = 4 } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou01""(""id"") VALUES(1), (2), (3), (4)", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+        }
+        class tbiou01
+        {
+            public int id { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimary()
+        {
+            fsql.Delete<tbiou02>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new tbiou02 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(2, '02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "01" }, new tbiou02 { id = 2, name = "02" }, new tbiou02 { id = 3, name = "03" }, new tbiou02 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou02>().SetSource(new[] { new tbiou02 { id = 1, name = "001" }, new tbiou02 { id = 2, name = "002" }, new tbiou02 { id = 3, name = "003" }, new tbiou02 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou02""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+        }
+        class tbiou02
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndIdentity()
+        {
+            fsql.Delete<tbiou022>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(2, '02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "01" }, new tbiou022 { id = 2, name = "02" }, new tbiou022 { id = 3, name = "03" }, new tbiou022 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '01'), (2, '02'), (3, '03'), (4, '04')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "001" }, new tbiou022 { id = 2, name = "002" }, new tbiou022 { id = 3, name = "003" }, new tbiou022 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '001'), (2, '002'), (3, '003'), (4, '004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+
+            //--no primary
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "01" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbiou022""(""name"") VALUES('01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbiou022""(""name"") VALUES('011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new tbiou022 { name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbiou022""(""name"") VALUES('02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { name = "01" }, new tbiou022 { name = "02" }, new tbiou022 { name = "03" }, new tbiou022 { name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbiou022""(""name"") VALUES('01'), ('02'), ('03'), ('04')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { name = "001" }, new tbiou022 { name = "002" }, new tbiou022 { name = "003" }, new tbiou022 { name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"INSERT INTO ""tbiou022""(""name"") VALUES('001'), ('002'), ('003'), ('004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            //--no primary and yes
+            iou = fsql.InsertOrUpdate<tbiou022>().SetSource(new[] { new tbiou022 { id = 1, name = "100001" }, new tbiou022 { name = "00001" }, new tbiou022 { id = 2, name = "100002" }, new tbiou022 { name = "00002" }, new tbiou022 { id = 3, name = "100003" }, new tbiou022 { name = "00003" }, new tbiou022 { id = 4, name = "100004" }, new tbiou022 { name = "00004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou022""(""id"", ""name"") VALUES(1, '100001'), (2, '100002'), (3, '100003'), (4, '100004')
+
+;
+
+INSERT INTO ""tbiou022""(""name"") VALUES('00001'), ('00002'), ('00003'), ('00004')", sql);
+            Assert.Equal(8, iou.ExecuteAffrows());
+            lst = fsql.Select<tbiou022>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "10000" + a.id).Count());
+        }
+        class tbiou022
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_TwoPrimary()
+        {
+            fsql.Delete<tbiou03>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 1, id2 = "01", name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '011')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new tbiou03 { id1 = 2, id2 = "02", name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(2, '02', '02')", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "01" }, new tbiou03 { id1 = 2, id2 = "02", name = "02" }, new tbiou03 { id1 = 3, id2 = "03", name = "03" }, new tbiou03 { id1 = 4, id2 = "04", name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '01'), (2, '02', '02'), (3, '03', '03'), (4, '04', '04')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou03>().SetSource(new[] { new tbiou03 { id1 = 1, id2 = "01", name = "001" }, new tbiou03 { id1 = 2, id2 = "02", name = "002" }, new tbiou03 { id1 = 3, id2 = "03", name = "003" }, new tbiou03 { id1 = 4, id2 = "04", name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou03""(""id1"", ""id2"", ""name"") VALUES(1, '01', '001'), (2, '02', '002'), (3, '03', '003'), (4, '04', '004')", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou03>().Where(a => a.id1 == 1 && a.id2 == "01" || a.id1 == 2 && a.id2 == "02" || a.id1 == 3 && a.id2 == "03" || a.id1 == 4 && a.id2 == "04").ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id1).Count());
+        }
+        class tbiou03
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string id2 { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void InsertOrUpdate_OnePrimaryAndVersionAndCanUpdate()
+        {
+            fsql.Delete<tbiou04>().Where("1=1").ExecuteAffrows();
+            var iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "01" });
+            var sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime'))", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 1, name = "011" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '011', 0, datetime(current_timestamp,'localtime'))", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new tbiou04 { id = 2, name = "02" });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(2, '02', 0, datetime(current_timestamp,'localtime'))", sql);
+            Assert.Equal(1, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "01" }, new tbiou04 { id = 2, name = "02" }, new tbiou04 { id = 3, name = "03" }, new tbiou04 { id = 4, name = "04" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '01', 0, datetime(current_timestamp,'localtime')), (2, '02', 0, datetime(current_timestamp,'localtime')), (3, '03', 0, datetime(current_timestamp,'localtime')), (4, '04', 0, datetime(current_timestamp,'localtime'))", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+
+            iou = fsql.InsertOrUpdate<tbiou04>().SetSource(new[] { new tbiou04 { id = 1, name = "001" }, new tbiou04 { id = 2, name = "002" }, new tbiou04 { id = 3, name = "003" }, new tbiou04 { id = 4, name = "004" } });
+            sql = iou.ToSql();
+            Assert.Equal(@"REPLACE INTO ""tbiou04""(""id"", ""name"", ""version"", ""CreateTime"") VALUES(1, '001', 0, datetime(current_timestamp,'localtime')), (2, '002', 0, datetime(current_timestamp,'localtime')), (3, '003', 0, datetime(current_timestamp,'localtime')), (4, '004', 0, datetime(current_timestamp,'localtime'))", sql);
+            Assert.Equal(4, iou.ExecuteAffrows());
+            var lst = fsql.Select<tbiou04>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
+            Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
+        }
+        class tbiou04
+        {
+            public int id { get; set; }
+            public string name { get; set; }
+            [Column(IsVersion = true)]
+            public int version { get; set; }
+            [Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
+            public DateTime CreateTime { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs
new file mode 100644
index 00000000..d3579aa0
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs
@@ -0,0 +1,142 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteInsertTest
+    {
+
+        IInsert<Topic> insert => g.sqlite.Insert<Topic>();
+
+        [Table(Name = "tb_topic_insert")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void AppendData()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items.First()).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\", \"Title\", \"CreateTime\") VALUES(@Clicks_0, @Title_0, @CreateTime_0)", sql);
+
+            sql = insert.AppendData(items).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\", \"Title\", \"CreateTime\") VALUES(@Clicks_0, @Title_0, @CreateTime_0), (@Clicks_1, @Title_1, @CreateTime_1), (@Clicks_2, @Title_2, @CreateTime_2), (@Clicks_3, @Title_3, @CreateTime_3), (@Clicks_4, @Title_4, @CreateTime_4), (@Clicks_5, @Title_5, @CreateTime_5), (@Clicks_6, @Title_6, @CreateTime_6), (@Clicks_7, @Title_7, @CreateTime_7), (@Clicks_8, @Title_8, @CreateTime_8), (@Clicks_9, @Title_9, @CreateTime_9)", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Title\") VALUES(@Title_0), (@Title_1), (@Title_2), (@Title_3), (@Title_4), (@Title_5), (@Title_6), (@Title_7), (@Title_8), (@Title_9)", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+        }
+
+        [Fact]
+        public void InsertColumns()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items).InsertColumns(a => a.Title).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Title\") VALUES(@Title_0), (@Title_1), (@Title_2), (@Title_3), (@Title_4), (@Title_5), (@Title_6), (@Title_7), (@Title_8), (@Title_9)", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => new { a.Title, a.Clicks }).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+        }
+        [Fact]
+        public void IgnoreColumns()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => new { a.Title, a.CreateTime }).ToSql();
+            Assert.Equal("INSERT INTO \"tb_topic_insert\"(\"Clicks\") VALUES(@Clicks_0), (@Clicks_1), (@Clicks_2), (@Clicks_3), (@Clicks_4), (@Clicks_5), (@Clicks_6), (@Clicks_7), (@Clicks_8), (@Clicks_9)", sql);
+
+            g.sqlite.Delete<TopicIgnore>().Where("1=1").ExecuteAffrows();
+            var itemsIgnore = new List<TopicIgnore>();
+            for (var a = 0; a < 2072; a++) itemsIgnore.Add(new TopicIgnore { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
+            g.sqlite.Insert<TopicIgnore>().AppendData(itemsIgnore).IgnoreColumns(a => new { a.Title }).ExecuteAffrows();
+            Assert.Equal(2072, itemsIgnore.Count);
+            Assert.Equal(2072, g.sqlite.Select<TopicIgnore>().Where(a => a.Title == null).Count());
+        }
+        [Table(Name = "tb_topicIgnoreColumns")]
+        class TopicIgnore
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            Assert.Equal(1, insert.AppendData(items.First()).ExecuteAffrows());
+            Assert.Equal(10, insert.AppendData(items).ExecuteAffrows());
+
+            Assert.Equal(10, g.sqlite.Select<Topic>().Limit(10).InsertInto(null, a => new Topic
+            {
+                Title = a.Title
+            }));
+        }
+        [Fact]
+        public void ExecuteIdentity()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            Assert.NotEqual(0, insert.AppendData(items.First()).ExecuteIdentity());
+        }
+        [Fact]
+        public void ExecuteInserted()
+        {
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newTitle{a}", Clicks = a * 100 });
+
+            var sql = insert.AppendData(items.First()).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\", \"Title\", \"CreateTime\") VALUES(@Clicks_0, @Title_0, @CreateTime_0)", sql);
+
+            sql = insert.AppendData(items).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\", \"Title\", \"CreateTime\") VALUES(@Clicks_0, @Title_0, @CreateTime_0), (@Clicks_1, @Title_1, @CreateTime_1), (@Clicks_2, @Title_2, @CreateTime_2), (@Clicks_3, @Title_3, @CreateTime_3), (@Clicks_4, @Title_4, @CreateTime_4), (@Clicks_5, @Title_5, @CreateTime_5), (@Clicks_6, @Title_6, @CreateTime_6), (@Clicks_7, @Title_7, @CreateTime_7), (@Clicks_8, @Title_8, @CreateTime_8), (@Clicks_9, @Title_9, @CreateTime_9)", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Title\") VALUES(@Title_0), (@Title_1), (@Title_2), (@Title_3), (@Title_4), (@Title_5), (@Title_6), (@Title_7), (@Title_8), (@Title_9)", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => a.Title).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Title\") VALUES(@Title_0), (@Title_1), (@Title_2), (@Title_3), (@Title_4), (@Title_5), (@Title_6), (@Title_7), (@Title_8), (@Title_9)", sql);
+
+            sql = insert.AppendData(items).InsertColumns(a => new { a.Title, a.Clicks }).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => a.CreateTime).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\", \"Title\") VALUES(@Clicks_0, @Title_0), (@Clicks_1, @Title_1), (@Clicks_2, @Title_2), (@Clicks_3, @Title_3), (@Clicks_4, @Title_4), (@Clicks_5, @Title_5), (@Clicks_6, @Title_6), (@Clicks_7, @Title_7), (@Clicks_8, @Title_8), (@Clicks_9, @Title_9)", sql);
+
+            sql = insert.AppendData(items).IgnoreColumns(a => new { a.Title, a.CreateTime }).AsTable(a => "Topic_InsertAsTable").ToSql();
+            Assert.Equal("INSERT INTO \"Topic_InsertAsTable\"(\"Clicks\") VALUES(@Clicks_0), (@Clicks_1), (@Clicks_2), (@Clicks_3), (@Clicks_4), (@Clicks_5), (@Clicks_6), (@Clicks_7), (@Clicks_8), (@Clicks_9)", sql);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteSelectTest.cs
new file mode 100644
index 00000000..91b17c10
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteSelectTest.cs
@@ -0,0 +1,2578 @@
+using FreeSql.DataAnnotations;
+using FreeSql.Internal.Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Text;
+using Xunit;
+using FreeSql.Internal.CommonProvider;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteSelectTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic22")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        public partial class Song
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+            public DateTime? Create_time { get; set; }
+            public bool? Is_deleted { get; set; }
+            public string Title { get; set; }
+            public string Url { get; set; }
+
+            public virtual ICollection<Tag> Tags { get; set; }
+        }
+        public partial class Song_tag
+        {
+            public int Song_id { get; set; }
+            public virtual Song Song { get; set; }
+
+            public int Tag_id { get; set; }
+            public virtual Tag Tag { get; set; }
+        }
+        public partial class Tag
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+            public int? Parent_id { get; set; }
+            public virtual Tag Parent { get; set; }
+
+            public decimal? Ddd { get; set; }
+            public string Name { get; set; }
+
+            public virtual ICollection<Song> Songs { get; set; }
+            public virtual ICollection<Tag> Tags { get; set; }
+        }
+
+        [Fact]
+        public void AsSelect()
+        {
+            //OneToOne、ManyToOne
+            var t0 = g.sqlite.Select<Tag>().Where(a => a.Parent.Parent.Name == "粤语").ToSql();
+            //SELECT a.`Id`, a.`Parent_id`, a__Parent.`Id` as3, a__Parent.`Parent_id` as4, a__Parent.`Ddd`, a__Parent.`Name`, a.`Ddd` as7, a.`Name` as8 
+            //FROM `Tag` a 
+            //LEFT JOIN `Tag` a__Parent ON a__Parent.`Id` = a.`Parent_id` 
+            //LEFT JOIN `Tag` a__Parent__Parent ON a__Parent__Parent.`Id` = a__Parent.`Parent_id` 
+            //WHERE (a__Parent__Parent.`Name` = '粤语')
+
+            //OneToMany
+            var t1 = g.sqlite.Select<Tag>().Where(a => a.Tags.AsSelect().Any(t => t.Parent.Id == 10)).ToSql();
+            //SELECT a.`Id`, a.`Parent_id`, a.`Ddd`, a.`Name` 
+            //FROM `Tag` a 
+            //WHERE (exists(SELECT 1 
+            //    FROM `Tag` t 
+            //    LEFT JOIN `Tag` t__Parent ON t__Parent.`Id` = t.`Parent_id` 
+            //    WHERE (t__Parent.`Id` = 10) AND (t.`Parent_id` = a.`Id`) 
+            //    limit 0,1))
+
+            //ManyToMany
+            var t2 = g.sqlite.Select<Song>().Where(s => s.Tags.AsSelect().Any(t => t.Name == "国语")).ToSql();
+            //SELECT a.`Id`, a.`Create_time`, a.`Is_deleted`, a.`Title`, a.`Url` 
+            //FROM `Song` a
+            //WHERE(exists(SELECT 1
+            //    FROM `Song_tag` Mt_Ms
+            //    WHERE(Mt_Ms.`Song_id` = a.`Id`) AND(exists(SELECT 1
+            //        FROM `Tag` t
+            //        WHERE(t.`Name` = '国语') AND(t.`Id` = Mt_Ms.`Tag_id`)
+            //        limit 0, 1))
+            //    limit 0, 1))
+
+            var t3 = g.sqlite.Select<Song>().ToList(r => new
+            {
+                r.Title,
+                count = r.Tags.AsSelect().Count(),
+                //sum = r.Tags.AsSelect().Sum(b => b.Id + 0),
+                //avg = r.Tags.AsSelect().Avg(b => b.Id + 1),
+                //max = r.Tags.AsSelect().Max(b => b.Id + 2),
+                //min = r.Tags.AsSelect().Min(b => b.Id + 3),
+                //first = r.Tags.AsSelect().First(b => b.Name)
+            });
+        }
+
+        [Fact]
+        public void Lazy()
+        {
+            var tags = g.sqlite.Select<Tag>().Where(a => a.Parent.Name == "xxx")
+                .LeftJoin(a => a.Parent_id == a.Parent.Id)
+                .ToSql();
+
+            var songs = g.sqlite.Select<Song>().Limit(10).ToList();
+
+
+        }
+
+        [Fact]
+        public void ToDataTable()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100, CreateTime = DateTime.Now });
+
+            Assert.Equal(1, g.sqlite.Insert<Topic>().AppendData(items.First()).ExecuteAffrows());
+            Assert.Equal(10, g.sqlite.Insert<Topic>().AppendData(items).ExecuteAffrows());
+
+            //items = Enumerable.Range(0, 9989).Select(a => new Topic { Title = "newtitle" + a, CreateTime = DateTime.Now }).ToList();
+            //Assert.Equal(9989, g.sqlite.Insert<Topic>(items).ExecuteAffrows());
+
+            var dt1 = select.Limit(10).ToDataTable();
+            var dt2 = select.Limit(10).ToDataTable("id, 111222");
+            var dt3 = select.Limit(10).ToDataTable(a => new { a.Id, a.Type.Name, now = DateTime.Now });
+            var dt4 = select.Limit(10).ToDataTableByPropertyName(new[] { "a.Id", "a.Type.Name", "Title", "clicks" });
+        }
+        class TestDto
+        {
+            public int id { get; set; }
+            public string name { get; set; } //这是join表的属性
+            public int ParentId { get; set; } //这是join表的属性
+
+            public bool? testBool1 { get; set; }
+            public bool? testBool2 { get; set; }
+
+            public TestDtoLeftJoin Obj { get; set; }
+        }
+        class TestDto2
+        {
+            public int id { get; set; }
+            public string name { get; set; } //这是join表的属性
+            public int ParentId { get; set; } //这是join表的属性
+
+            public TestDto2() { }
+            public TestDto2(int id, string name)
+            {
+                this.id = id;
+                this.name = name;
+            }
+        }
+        class TestDto3
+        {
+            public string title { get; set; } //这是join表的属性
+        }
+        class TestDtoLeftJoin
+        {
+            [Column(IsPrimary = true)]
+            public int Guid { get; set; }
+            public bool? testBool1 { get; set; }
+            public bool? testBool2 { get; set; }
+        }
+        [Fact]
+        public void ToList()
+        {
+
+            g.sqlite.Delete<TestDtoLeftJoin>().Where("1=1").ExecuteAffrows();
+            var testlist = select.Limit(10).ToList();
+            foreach (var testitem in testlist)
+            {
+                var testdtolj = new TestDtoLeftJoin { Guid = testitem.TypeGuid, testBool1 = true };
+                if (g.sqlite.Select<TestDtoLeftJoin>().Where(a => a.Guid == testitem.TypeGuid).Any() == false)
+                    g.sqlite.Insert<TestDtoLeftJoin>(testdtolj).ExecuteAffrows();
+            }
+
+            select.Limit(10).ToList(a => new TestDto { id = a.Id, name = a.Title });
+            var testDto1 = select.Limit(10).ToList(a => new TestDto { id = a.Id, name = a.Title });
+            var testDto2 = select.Limit(10).ToList(a => new TestDto());
+            var testDto3 = select.Limit(10).ToList(a => new TestDto { });
+            var testDto4 = select.Limit(10).ToList(a => new TestDto() { });
+
+            var testDto11 = select.From<TestDtoLeftJoin>((_, b) => _.LeftJoin(a => b.Guid == a.TypeGuid)).Limit(10).ToList((a, b) => new TestDto { id = a.Id, name = a.Title, Obj = b });
+            var testDto22 = select.LeftJoin<TestDtoLeftJoin>((a, b) => b.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto());
+            var testDto33 = select.LeftJoin<TestDtoLeftJoin>((a, b) => b.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto { });
+            var testDto44 = select.LeftJoin<TestDtoLeftJoin>((a, b) => b.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto() { });
+
+            var testDto211 = select.Limit(10).ToList(a => new TestDto2(a.Id, a.Title));
+            var testDto212 = select.Limit(10).ToList(a => new TestDto2());
+            var testDto213 = select.Limit(10).ToList(a => new TestDto2 { });
+            var testDto214 = select.Limit(10).ToList(a => new TestDto2() { });
+            var testDto215 = select.Limit(10).ToList<TestDto2>();
+            var testDto216 = select.Limit(10).ToList<TestDto3>();
+
+
+            var testDto2211 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2(a.Id, a.Title));
+            var testDto2222 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2());
+            var testDto2233 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2 { });
+            var testDto2244 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList(a => new TestDto2() { });
+            var testDto2255 = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).Limit(10).ToList<TestDto2>();
+
+            g.sqlite.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
+            var testGuidId5 = g.sqlite.Select<TestGuidIdToList>().ToList();
+            var testGuidId6 = g.sqlite.Select<TestGuidIdToList>().ToList(a => a.id);
+
+            var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
+            var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
+
+            g.sqlite.Delete<District>().Where("1=1").ExecuteAffrows();
+            var repo = g.sqlite.GetRepository<District>();
+            repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
+            repo.Insert(new District
+            {
+                Code = "001",
+                Name = "001_name",
+                Childs = new List<District>(new[] {
+                    new District{
+                        Code = "001_01",
+                        Name = "001_01_name"
+                    },
+                    new District{
+                        Code = "001_02",
+                        Name = "001_02_name"
+                    }
+                })
+            });
+            var ddd = g.sqlite.Select<District>().LeftJoin(d => d.ParentCode == d.Parent.Code).ToTreeList();
+            Assert.Single(ddd);
+            Assert.Equal(2, ddd[0].Childs.Count);
+        }
+        public class District
+        {
+            [Column(IsPrimary = true, StringLength = 6)]
+            public string Code { get; set; }
+
+            [Column(StringLength = 20, IsNullable = false)]
+            public string Name { get; set; }
+
+            [Column(StringLength = 6)]
+            public string ParentCode { get; set; }
+
+            [Navigate(nameof(ParentCode))]
+            public District Parent { get; set; }
+
+            [Navigate(nameof(ParentCode))]
+            public List<District> Childs { get; set; }
+        }
+        [Fact]
+        public void ToDictionary()
+        {
+            var testDto1 = select.Limit(10).ToDictionary(a => a.Id);
+            var testDto2 = select.Limit(10).ToDictionary(a => a.Id, a => new { a.Id, a.Title });
+
+            var repo = g.sqlite.GetRepository<Topic>();
+            var dic = repo.Select.Limit(10).ToDictionary(a => a.Id);
+            var first = dic.First().Value;
+            first.Clicks++;
+            repo.Update(first);
+        }
+        class TestGuidIdToList
+        {
+            public Guid id { get; set; }
+            public string title { get; set; } = Guid.NewGuid().ToString();
+        }
+        [Fact]
+        public void ToOne()
+        {
+            var testnotfind = select.Where("1=2").First(a => a.CreateTime);
+            Assert.Equal(default(DateTime), testnotfind);
+        }
+        [Fact]
+        public void ToSql()
+        {
+        }
+        [Fact]
+        public void Any()
+        {
+            var count = select.Where(a => 1 == 1).Count();
+            Assert.False(select.Where(a => 1 == 2).Any());
+            Assert.Equal(count > 0, select.Where(a => 1 == 1).Any());
+
+            var sql2222 = select.Where(a =>
+                select.Where(b => b.Id == a.Id &&
+                    select.Where(c => c.Id == b.Id).Where(d => d.Id == a.Id).Where(e => e.Id == b.Id)
+                    //.Offset(a.Id)
+                    .Any()
+                ).Any(c => c.Id == a.Id + 10)
+            );
+            var sql2222Tolist = sql2222.ToList();
+
+            var collectionSelect = select.Where(a =>
+                a.Type.Guid == a.TypeGuid &&
+                a.Type.Parent.Id == a.Type.ParentId &&
+                a.Type.Parent.Types.AsSelect().Where(b => b.Name == a.Title).Any(b => b.ParentId == a.Type.Parent.Id)
+            );
+            collectionSelect.ToList();
+        }
+        [Fact]
+        public void Count()
+        {
+            var count = select.Where(a => 1 == 1).Count();
+            select.Where(a => 1 == 1).Count(out var count2);
+            Assert.Equal(count, count2);
+            Assert.Equal(0, select.Where(a => 1 == 2).Count());
+
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.Where(b => b.Id > 0 && b.Id == a.Id).Count()
+            });
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.Where(b => b.Id > 0 && b.Id == a.Id).Count()
+            });
+        }
+        [Fact]
+        public void Master()
+        {
+            Assert.StartsWith(" SELECT", select.Master().Where(a => 1 == 1).ToSql());
+        }
+        [Fact]
+        public void From()
+        {
+            var query2 = select.From<TestTypeInfo>((s, b) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                );
+            var sql2 = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b ON a.\"TypeGuid\" = b.\"Guid\"", sql2);
+            query2.ToList();
+
+            var query3 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id)
+                );
+            var sql3 = query3.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b ON a.\"TypeGuid\" = b.\"Guid\" LEFT JOIN \"TestTypeParentInfo\" c ON b.\"ParentId\" = c.\"Id\"", sql3);
+            query3.ToList();
+        }
+        [Fact]
+        public void LeftJoin()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\"", sql);
+            (query as Select0Provider)._tables.Where(a => a.Table.Type == typeof(TestTypeInfo))
+                .First()
+                .Type = SelectTableInfoType.InnerJoin; 
+            query.ToList();
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx'", sql);
+            query.ToList();
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+            query.ToList();
+
+            //���û�е�������
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b ON b.\"Guid\" = a.\"TypeGuid\"", sql);
+            query.ToList();
+
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b ON b.\"Guid\" = a.\"TypeGuid\" AND b.\"Name\" = 'xxx'", sql);
+            query.ToList();
+
+            query = select.LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+            query.ToList();
+
+            //�������
+            query = select
+                .LeftJoin(a => a.Type.Guid == a.TypeGuid)
+                .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\"", sql);
+            query.ToList();
+
+            query = select
+                .LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .LeftJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfo\" c ON c.\"Id\" = a__Type.\"ParentId\"", sql);
+            query.ToList();
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b ON a.\"TypeGuid\" = b.\"Guid\" LEFT JOIN \"TestTypeParentInfo\" c ON b.\"ParentId\" = c.\"Id\"", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.LeftJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"", sql);
+            query.ToList();
+
+            query = select.LeftJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", new { bname = "xxx" });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", sql);
+            query.ToList();
+        }
+        [Fact]
+        public void InnerJoin()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\"", sql);
+            query.ToList();
+
+            query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx'", sql);
+            query.ToList();
+
+            query = select.InnerJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+            query.ToList();
+
+            //���û�е�������
+            query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" b ON b.\"Guid\" = a.\"TypeGuid\"", sql);
+            query.ToList();
+
+            query = select.InnerJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" b ON b.\"Guid\" = a.\"TypeGuid\" AND b.\"Name\" = 'xxx'", sql);
+            query.ToList();
+
+            query = select.InnerJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+            query.ToList();
+
+            //�������
+            query = select
+                .InnerJoin(a => a.Type.Guid == a.TypeGuid)
+                .InnerJoin(a => a.Type.Parent.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" INNER JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\"", sql);
+            query.ToList();
+
+            query = select
+                .InnerJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .InnerJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" INNER JOIN \"TestTypeParentInfo\" c ON c.\"Id\" = a__Type.\"ParentId\"", sql);
+            query.ToList();
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .InnerJoin(a => a.TypeGuid == b.Guid)
+                 .InnerJoin(a => b.ParentId == c.Id));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" b ON a.\"TypeGuid\" = b.\"Guid\" INNER JOIN \"TestTypeParentInfo\" c ON b.\"ParentId\" = c.\"Id\"", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.InnerJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"", sql);
+            query.ToList();
+
+            query = select.InnerJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", new { bname = "xxx" });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a INNER JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", sql);
+            query.ToList();
+
+        }
+        [Fact]
+        public void RightJoin()
+        {
+
+        }
+        [Fact]
+        public void Where()
+        {
+            var sqltmp1 = select.Where(a => a.Id == 0 && (a.Title == "x" || a.Title == "y") && a.Clicks == 1).ToSql();
+            var sqltmp2 = select.Where(a => a.Id.Equals(true) && (a.Title.Equals("x") || a.Title.Equals("y")) && a.Clicks.Equals(1)).ToSql();
+            var sqltmp3 = select.Where(a => a.Id == 0).Where(a => ((a.Title == "x" && a.Title == "z") || a.Title == "y")).ToSql();
+
+            var sqltmp4 = select.Where(a => (a.Id - 10) / 2 > 0).ToSql();
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.Where(a => a.Id == 10);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Id\" = 10)", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE ((a.\"Id\" = 10 AND a.\"Id\" > 10 OR a.\"Clicks\" > 100))", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Id == 10).Where(a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Id\" = 10) AND (a.\"Clicks\" > 100)", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" WHERE (a__Type.\"Name\" = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" WHERE (a__Type.\"Name\" = 'typeTitle' AND a__Type.\"Guid\" = a.\"TypeGuid\")", sql);
+            query.ToList();
+
+            query = select.Where(a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Name\" = 'tparent')", sql);
+            query.ToList();
+
+            //���û�е������ԣ��򵥶������
+            query = select.Where<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeInfo\" b WHERE (b.\"Guid\" = a.\"TypeGuid\" AND b.\"Name\" = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.Where<TestTypeInfo>((a, b) => b.Name == "typeTitle" && b.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeInfo\" b WHERE (b.\"Name\" = 'typeTitle' AND b.\"Guid\" = a.\"TypeGuid\")", sql);
+            query.ToList();
+
+            query = select.Where<TestTypeInfo, TestTypeParentInfo>((a, b, c) => c.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeParentInfo\" c WHERE (c.\"Name\" = 'tparent')", sql);
+            query.ToList();
+
+            //����һ�� From ��Ķ������
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .Where(a => a.Id == 10 && c.Name == "xxx")
+                .Where(a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeInfo\" b, \"TestTypeParentInfo\" c WHERE (a.\"Id\" = 10 AND c.\"Name\" = 'xxx') AND (b.\"ParentId\" = 20)", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.Where("a.\"Clicks\" > 100 and a.\"Id\" = @id", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Clicks\" > 100 and a.\"Id\" = @id)", sql);
+            query.ToList();
+        }
+        [Fact]
+        public void WhereIf()
+        {
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            var query = select.WhereIf(true, a => a.Id == 10);
+            var sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Id\" = 10)", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE ((a.\"Id\" = 10 AND a.\"Id\" > 10 OR a.\"Clicks\" > 100))", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Id == 10).WhereIf(true, a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Id\" = 10) AND (a.\"Clicks\" > 100)", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" WHERE (a__Type.\"Name\" = 'typeTitle')", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" WHERE (a__Type.\"Name\" = 'typeTitle' AND a__Type.\"Guid\" = a.\"TypeGuid\")", sql);
+            query.ToList();
+
+            query = select.WhereIf(true, a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfo\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Name\" = 'tparent')", sql);
+            query.ToList();
+
+            //����һ�� From ��Ķ������
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .WhereIf(true, a => a.Id == 10 && c.Name == "xxx")
+                .WhereIf(true, a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeInfo\" b, \"TestTypeParentInfo\" c WHERE (a.\"Id\" = 10 AND c.\"Name\" = 'xxx') AND (b.\"ParentId\" = 20)", sql);
+            query2.ToList();
+
+            //������϶����㲻��
+            query = select.WhereIf(true, "a.\"Clicks\" > 100 and a.\"Id\" = @id", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a WHERE (a.\"Clicks\" > 100 and a.\"Id\" = @id)", sql);
+            query.ToList();
+
+            // ==========================================WhereIf(false)
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            query = select.WhereIf(false, a => a.Id == 10);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            query = select.WhereIf(false, a => a.Id == 10 && a.Id > 10 || a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            query = select.WhereIf(false, a => a.Id == 10).WhereIf(false, a => a.Clicks > 100);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            query = select.WhereIf(false, a => a.Type.Name == "typeTitle");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            query = select.WhereIf(false, a => a.Type.Name == "typeTitle" && a.Type.Guid == a.TypeGuid);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            query = select.WhereIf(false, a => a.Type.Parent.Name == "tparent");
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+
+            //����һ�� From ��Ķ������
+            query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .WhereIf(false, a => a.Id == 10 && c.Name == "xxx")
+                .WhereIf(false, a => b.ParentId == 20));
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a, \"TestTypeInfo\" b, \"TestTypeParentInfo\" c", sql);
+            query2.First();
+
+            //������϶����㲻��
+            query = select.WhereIf(false, "a.\"Clicks\" > 100 and a.\"Id\" = @id", new { id = 10 });
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a", sql);
+            query.First();
+        }
+
+        [Fact]
+        public void WhereExists()
+        {
+            var sql2222 = select.Where(a => select.Where(b => b.Id == a.Id).Any()).ToList();
+
+            sql2222 = select.Where(a =>
+                select.Where(b => b.Id == a.Id && select.Where(c => c.Id == b.Id).Where(d => d.Id == a.Id).Where(e => e.Id == b.Id)
+
+                //.Offset(a.Id)
+
+                .Any()
+                ).Any()
+            ).ToList();
+        }
+        [Fact]
+        public void GroupBy()
+        {
+            var groupby = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                .Where(a => a.Id == 1)
+            )
+            .GroupBy((a, b, c) => new { tt2 = a.Title.Substring(0, 2), mod4 = a.Id % 4 })
+            .Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
+            .Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
+            .OrderBy(a => a.Key.tt2)
+            .OrderByDescending(a => new { a.Key.tt2, a.Key.mod4 })
+            .OrderByDescending(a => a.Count())
+            .Offset(10)
+            .Limit(2)
+            .Count(out var trycount)
+            .ToList(a => new
+            {
+                a.Key.tt2,
+                cou1 = a.Count(),
+                cou2 = a.Count(a.Value.Item3.Id),
+                arg1 = a.Avg(a.Key.mod4),
+                ccc2 = a.Key.tt2 ?? "now()",
+                //ccc = Convert.ToDateTime("now()"), partby = Convert.ToDecimal("sum(num) over(PARTITION BY server_id,os,rid,chn order by id desc)")
+                ccc3 = a.Max(a.Value.Item3.Id)
+            });
+
+            var testpid1 = g.sqlite.Insert<TestTypeInfo>().AppendData(new TestTypeInfo { Name = "Name" + DateTime.Now.ToString("yyyyMMddHHmmss") }).ExecuteIdentity();
+            g.sqlite.Insert<TestInfo>().AppendData(new TestInfo { Title = "Title" + DateTime.Now.ToString("yyyyMMddHHmmss"), CreateTime = DateTime.Now, TypeGuid = (int)testpid1 }).ExecuteAffrows();
+
+            var fkfjfj = select.GroupBy(a => a.Title)
+                .ToList(a => a.Sum(a.Value.TypeGuid));
+
+            var aggsql1 = select
+                .GroupBy(a => a.Title)
+                .ToSql(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist1 = select
+                .GroupBy(a => a.Title)
+                .ToList(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist11 = select
+                .GroupBy(a => a.Title)
+                .ToDictionary(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+
+            var aggsql2 = select
+                .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+                .ToSql(b => new
+                {
+                    b.Key.Title,
+                    b.Key.yyyy,
+
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist2 = select
+                .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+                .ToList(b => new
+                {
+                    b.Key.Title,
+                    b.Key.yyyy,
+
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+            var aggtolist22 = select
+                .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
+                .ToDictionary(b => new
+                {
+                    b.Key.Title,
+                    b.Key.yyyy,
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid)
+                });
+
+            var aggsql3 = select
+                .GroupBy(a => a.Title)
+                .ToSql(b => new
+                {
+                    b.Key,
+                    cou = b.Count(),
+                    sum2 = b.Sum(b.Value.TypeGuid),
+                    sum3 = b.Sum(b.Value.Type.Parent.Id)
+                });
+
+
+
+            var aggsql4 = select
+                .GroupBy(a => a.Title)
+                .ToList(b => new TestGroupByDto01
+                {
+                    Name = b.Key,
+                    TotalCount = b.Count()
+                });
+        }
+        class TestGroupByDto01
+        {
+            public string Name { get; set; }
+            public int TotalCount { get; set; }
+        }
+
+        [Fact]
+        public void ToAggregate()
+        {
+            var sql = select.ToAggregate(a => new { sum = a.Sum(a.Key.Id + 11.11), avg = a.Avg(a.Key.Id), count = a.Count(), max = a.Max(a.Key.Id), min = a.Min(a.Key.Id) });
+        }
+        [Fact]
+        public void OrderBy()
+        {
+            var sql = select.OrderBy(a => new Random().NextDouble()).ToSql();
+
+            sql = select.OrderBy(a => a.Id).OrderBy(a => a.Title).OrderByDescending(a => a.CreateTime).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+ORDER BY a.""Id"", a.""Title"", a.""CreateTime"" DESC", sql);
+
+            sql = select.OrderBy(a => new { a.Id, a.Title }).OrderByDescending(a => a.CreateTime).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+ORDER BY a.""Id"", a.""Title"", a.""CreateTime"" DESC", sql);
+        }
+        [Fact]
+        public void OrderByRandom()
+        {
+            var t1 = select.OrderByRandom().Limit(10).ToSql("1");
+            Assert.Equal(@"SELECT 1 
+FROM ""tb_topic22"" a 
+ORDER BY random() 
+limit 0,10", t1);
+            var t2 = select.OrderByRandom().Limit(10).ToList();
+        }
+
+        [Fact]
+        public void Skip_Offset()
+        {
+            var sql = select.Offset(10).Limit(10).ToList();
+        }
+        [Fact]
+        public void Take_Limit()
+        {
+            var sql = select.Limit(10).ToList();
+        }
+        [Fact]
+        public void Page()
+        {
+            var sql1 = select.Page(1, 10).ToList();
+            var sql2 = select.Page(2, 10).ToList();
+            var sql3 = select.Page(3, 10).ToList();
+
+            var sql11 = select.OrderBy(a => new Random().NextDouble()).Page(1, 10).ToList();
+            var sql22 = select.OrderBy(a => new Random().NextDouble()).Page(2, 10).ToList();
+            var sql33 = select.OrderBy(a => new Random().NextDouble()).Page(3, 10).ToList();
+        }
+        [Fact]
+        public void Distinct()
+        {
+            var t1 = select.Distinct().ToList(a => a.Title);
+            var t2 = select.Distinct().Limit(10).ToList(a => a.Title);
+        }
+
+        [Fact]
+        public void Sum()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = (long)select.As("b").Sum(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.""Id"" as1, a.""Clicks"" as2, a.""TypeGuid"" as3, a.""Title"" as4, a.""CreateTime"" as5, (SELECT sum(b.""Id"") 
+    FROM ""tb_topic22"" b) as6 
+FROM ""tb_topic22"" a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = (long)select.As("b").Sum(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Min()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Min(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.""Id"" as1, a.""Clicks"" as2, a.""TypeGuid"" as3, a.""Title"" as4, a.""CreateTime"" as5, (SELECT min(b.""Id"") 
+    FROM ""tb_topic22"" b) as6 
+FROM ""tb_topic22"" a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Min(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Max()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Max(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.""Id"" as1, a.""Clicks"" as2, a.""TypeGuid"" as3, a.""Title"" as4, a.""CreateTime"" as5, (SELECT max(b.""Id"") 
+    FROM ""tb_topic22"" b) as6 
+FROM ""tb_topic22"" a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Max(b => b.Id)
+            });
+        }
+        [Fact]
+        public void Avg()
+        {
+            var subquery = select.ToSql(a => new
+            {
+                all = a,
+                count = select.As("b").Avg(b => b.Id)
+            });
+            Assert.Equal(@"SELECT a.""Id"" as1, a.""Clicks"" as2, a.""TypeGuid"" as3, a.""Title"" as4, a.""CreateTime"" as5, (SELECT avg(b.""Id"") 
+    FROM ""tb_topic22"" b) as6 
+FROM ""tb_topic22"" a", subquery);
+            var subqueryList = select.ToList(a => new
+            {
+                all = a,
+                count = select.As("b").Avg(b => b.Id)
+            });
+        }
+        [Fact]
+        public void WhereIn()
+        {
+            var subquery = select.Where(a => select.As("b").ToList(b => b.Title).Contains(a.Id.ToString())).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title"" 
+    FROM ""tb_topic22"" b)))", subquery);
+            var subqueryList = select.Where(a => select.As("b").ToList(b => b.Title).Contains(a.Id.ToString())).ToList();
+
+            subquery = select.Where(a => select.As("b").Limit(10).ToList(b => b.Title).Contains(a.Id.ToString())).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title"" 
+    FROM ""tb_topic22"" b 
+    limit 0,10)))", subquery);
+            subqueryList = select.Where(a => select.As("b").Limit(10).ToList(b => b.Title).Contains(a.Id.ToString())).ToList();
+        }
+        [Fact]
+        public void As()
+        {
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+
+            var listt = select.AsTable((a, b) => "(select * from tb_topic where clicks > 10)").Page(1, 10).ToList();
+
+            var tenantId = 1;
+            var reposTopic = g.sqlite.GetGuidRepository<Topic>(null, oldname => $"{oldname}_{tenantId}");
+            var reposType = g.sqlite.GetGuidRepository<TestTypeInfo>(null, oldname => $"{oldname}_{tenantId}");
+
+            //reposTopic.Delete(Guid.Empty);
+            //reposTopic.Find(Guid.Empty);
+            //reposTopic.Update(new Topic { TypeGuid = 1 });
+            var sql11 = reposTopic.Select
+                .From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s)
+                .LeftJoin(a => a.TypeGuid == a.Type.Guid)
+                .ToSql();
+
+
+
+            Func<Type, string, string> tableRule = (type, oldname) =>
+            {
+                if (type == typeof(Topic)) return oldname + "AsTable1";
+                else if (type == typeof(TestTypeInfo)) return oldname + "AsTable2";
+                return oldname + "AsTable";
+            };
+            Func<Type, string, string> tableRule2 = (type, oldname) =>
+            {
+                if (type == typeof(Topic)) return oldname + "Test2";
+                else if (type == typeof(TestTypeInfo)) return oldname + "Test2";
+                return oldname + "Test2";
+            };
+            var query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).AsTable(tableRule).AsTable(tableRule2);
+            var sql = query.ToSql();
+            var sql2 = query.ToSql("count(1)");
+            var count2 = query.ToList<int>("count(1)");
+
+
+
+            query = select.AsTable((type, oldname) => "table_1").AsTable((type, oldname) => "table_2").AsTable((type, oldname) => "table_3");
+            sql = query.ToSql(a => a.Id);
+            sql2 = query.ToSql("count(1)");
+            count2 = query.ToList<int>("count(1)");
+
+
+            //����е�������a.Type��a.Type.Parent ���ǵ�������
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\"", sql);
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx'", sql);
+
+            query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfoAsTable\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+
+            //���û�е�������
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" b ON b.\"Guid\" = a.\"TypeGuid\"", sql);
+
+            query = select.LeftJoin<TestTypeInfo>((a, b) => b.Guid == a.TypeGuid && b.Name == "xxx").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" b ON b.\"Guid\" = a.\"TypeGuid\" AND b.\"Name\" = 'xxx'", sql);
+
+            query = select.LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid && a__Type.Name == "xxx").Where(a => a.Type.Parent.Id == 10).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" AND a__Type.\"Name\" = 'xxx' LEFT JOIN \"TestTypeParentInfoAsTable\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\" WHERE (a__Type__Parent.\"Id\" = 10)", sql);
+
+            //�������
+            query = select
+                .LeftJoin(a => a.Type.Guid == a.TypeGuid)
+                .LeftJoin(a => a.Type.Parent.Id == a.Type.ParentId).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfoAsTable\" a__Type__Parent ON a__Type__Parent.\"Id\" = a__Type.\"ParentId\"", sql);
+
+            query = select
+                .LeftJoin<TestTypeInfo>((a, a__Type) => a__Type.Guid == a.TypeGuid)
+                .LeftJoin<TestTypeParentInfo>((a, c) => c.Id == a.Type.ParentId).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\" LEFT JOIN \"TestTypeParentInfoAsTable\" c ON c.\"Id\" = a__Type.\"ParentId\"", sql);
+
+            //���û�е�������b��c������ϵ
+            var query2 = select.From<TestTypeInfo, TestTypeParentInfo>((s, b, c) => s
+                 .LeftJoin(a => a.TypeGuid == b.Guid)
+                 .LeftJoin(a => b.ParentId == c.Id)).AsTable(tableRule);
+            sql = query2.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", b.\"Guid\", b.\"ParentId\", b.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfoAsTable2\" b ON a.\"TypeGuid\" = b.\"Guid\" LEFT JOIN \"TestTypeParentInfoAsTable\" c ON b.\"ParentId\" = c.\"Id\"", sql);
+
+            //������϶����㲻��
+            query = select.LeftJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"").AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\"", sql);
+
+            query = select.LeftJoin("\"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", new { bname = "xxx" }).AsTable(tableRule);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22AsTable1\" a LEFT JOIN \"TestTypeInfo\" b on b.\"Guid\" = a.\"TypeGuid\" and b.\"Name\" = @bname", sql);
+
+            query = select.AsTable((_, old) => old).AsTable((_, old) => old);
+            sql = query.ToSql().Replace("\r\n", "");
+            Assert.Equal("SELECT  * from (SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a) ftb UNION ALL SELECT  * from (SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a) ftb", sql);
+            query.ToList();
+
+            query = select.AsTable((_, old) => old).AsTable((_, old) => old);
+            sql = query.ToSql("count(1) as1").Replace("\r\n", "");
+            Assert.Equal("SELECT  * from (SELECT count(1) as1 FROM \"tb_topic22\" a) ftb UNION ALL SELECT  * from (SELECT count(1) as1 FROM \"tb_topic22\" a) ftb", sql);
+            query.Count();
+
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Max(a => a.Id);
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Min(a => a.Id);
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Sum(a => a.Id);
+            select.AsTable((_, old) => old).AsTable((_, old) => old).Avg(a => a.Id);
+
+            var sqlsss = select
+                .AsTable((type, old) => type == typeof(Topic) ? $"{old}_1" : null)
+                .AsTable((type, old) => type == typeof(Topic) ? $"{old}_2" : null)
+                .ToSql(a => new
+                {
+                    a.Id,
+                    a.Clicks
+                }, FieldAliasOptions.AsProperty);
+
+            var slsld3 = select
+                .AsTable((type, old) => type == typeof(Topic) ? $"({sqlsss})" : null)
+                .Page(1, 20)
+                .ToList(a => new
+                {
+                    a.Id,
+                    a.Clicks
+                });
+        }
+
+        public class TestInclude_OneToManyModel1
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public virtual TestInclude_OneToManyModel2 model2 { get; set; }
+
+            public string m1name { get; set; }
+        }
+        public class TestInclude_OneToManyModel2
+        {
+            [Column(IsPrimary = true)]
+            public int? model2id { get; set; }
+            public virtual TestInclude_OneToManyModel1 model1 { get; set; }
+
+            public string m2setting { get; set; }
+
+            public List<TestInclude_OneToManyModel3> childs { get; set; }
+        }
+        public class TestInclude_OneToManyModel3
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+
+            public int model2111Idaaa { get; set; }
+            public string title { get; set; }
+
+            public List<TestInclude_OneToManyModel4> childs2 { get; set; }
+        }
+        public class TestInclude_OneToManyModel4
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+
+            public int model3333Id333 { get; set; }
+            public string title444 { get; set; }
+        }
+
+        [Fact]
+        public void Include_OneToMany()
+        {
+            var model1 = new TestInclude_OneToManyModel1 { m1name = DateTime.Now.Second.ToString() };
+            model1.id = (int)g.sqlite.Insert(model1).ExecuteIdentity();
+            var model2 = new TestInclude_OneToManyModel2 { model2id = model1.id, m2setting = DateTime.Now.Second.ToString() };
+            g.sqlite.Insert(model2).ExecuteAffrows();
+
+            var model3_1 = new TestInclude_OneToManyModel3 { model2111Idaaa = model1.id, title = "testmodel3__111" };
+            model3_1.id = (int)g.sqlite.Insert(model3_1).ExecuteIdentity();
+            var model3_2 = new TestInclude_OneToManyModel3 { model2111Idaaa = model1.id, title = "testmodel3__222" };
+            model3_2.id = (int)g.sqlite.Insert(model3_2).ExecuteIdentity();
+            var model3_3 = new TestInclude_OneToManyModel3 { model2111Idaaa = model1.id, title = "testmodel3__333" };
+            model3_3.id = (int)g.sqlite.Insert(model3_2).ExecuteIdentity();
+
+            var model4s = new[] {
+                new TestInclude_OneToManyModel4{ model3333Id333 = model3_1.id, title444 = "testmodel3_4__111" },
+                new TestInclude_OneToManyModel4{ model3333Id333 = model3_1.id, title444 = "testmodel3_4__222" },
+                new TestInclude_OneToManyModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__111" },
+                new TestInclude_OneToManyModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__222" },
+                new TestInclude_OneToManyModel4{ model3333Id333 = model3_2.id, title444 = "testmodel3_4__333" }
+            };
+            Assert.Equal(5, g.sqlite.Insert(model4s).ExecuteAffrows());
+
+            var t0 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+            var t001 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList(a => new
+                {
+                    a.model1.id,
+                    a.childs,
+                    childs2 = a.childs
+                });
+
+            var t1 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var t111 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+
+            var t2 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var t222 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+
+            var t00 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+            var t0001 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id))
+                .Where(a => a.model2id <= model1.id)
+                .ToList(a => new
+                {
+                    a.model1.id,
+                    a.childs,
+                    childs2 = a.childs
+                });
+
+            var t11 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var t1111 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                 .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id))
+                 .Where(a => a.id <= model1.id)
+                 .ToList(a => new
+                 {
+                     a.id,
+                     a.model2.childs,
+                     childs2 = a.model2.childs
+                 });
+
+            var t22 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var t2222 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id)))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+
+            //---- Select ----
+
+            var at0 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+            var at001 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList(a => new
+                {
+                    a.model2id,
+                    a.childs,
+                    childs2 = a.childs
+                });
+
+            var at1 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var at111 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                 .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                 .Where(a => a.id <= model1.id)
+                 .ToList(a => new
+                 {
+                     a.id,
+                     a.model2.childs,
+                     childs2 = a.model2.childs
+                 });
+
+            var at2 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TestInclude_OneToManyModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var at2222 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TestInclude_OneToManyModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+
+            var at00 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList();
+            var at011 = g.sqlite.Select<TestInclude_OneToManyModel2>()
+                .IncludeMany(a => a.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.model2id <= model1.id)
+                .ToList(a => new
+                {
+                    a.model2id,
+                    a.childs,
+                    childs2 = a.childs
+                });
+
+            var at11 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var at1112 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+
+            var at22 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TestInclude_OneToManyModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList();
+            var at2223 = g.sqlite.Select<TestInclude_OneToManyModel1>()
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }),
+                    then => then.IncludeMany(m3 => m3.childs2.Take(2).Where(m4 => m4.model3333Id333 == m3.id).Select(m4 => new TestInclude_OneToManyModel4 { id = m4.id })))
+                .Where(a => a.id <= model1.id)
+                .ToList(a => new
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
+        }
+
+        public class TestInclude_OneToManyModel11
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public int model2id { get; set; }
+            public string m3setting { get; set; }
+            public TestInclude_OneToManyModel22 model2 { get; set; }
+            public string m1name { get; set; }
+        }
+
+        public class TestInclude_OneToManyModel22
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string m2setting { get; set; }
+            public string aaa { get; set; }
+            public string bbb { get; set; }
+            public List<TestInclude_OneToManyModel33> childs { get; set; }
+        }
+        public class TestInclude_OneToManyModel33
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public int model2Id { get; set; }
+            public string title { get; set; }
+            public string setting { get; set; }
+        }
+        [Fact]
+        public void Include_OneToMany2()
+        {
+            string setting = "x";
+            var model2 = new TestInclude_OneToManyModel22 { m2setting = DateTime.Now.Second.ToString(), aaa = "aaa" + DateTime.Now.Second, bbb = "bbb" + DateTime.Now.Second };
+            model2.id = (int)g.sqlite.Insert(model2).ExecuteIdentity();
+
+            var model3s = new[]
+            {
+                new TestInclude_OneToManyModel33 {model2Id = model2.id, title = "testmodel3__111", setting = setting},
+                new TestInclude_OneToManyModel33 {model2Id = model2.id, title = "testmodel3__222", setting = setting},
+                new TestInclude_OneToManyModel33 {model2Id = model2.id, title = "testmodel3__333", setting = setting}
+            };
+            Assert.Equal(3, g.sqlite.Insert(model3s).ExecuteAffrows());
+
+            var model1 = new TestInclude_OneToManyModel11 { m1name = DateTime.Now.Second.ToString(), model2id = model2.id, m3setting = setting };
+            model1.id = (int)g.sqlite.Insert(model1).ExecuteIdentity();
+
+            var t1 = g.sqlite.Select<TestInclude_OneToManyModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            var t11 = g.sqlite.Select<TestInclude_OneToManyModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            //---- Select ----
+
+            var at1 = g.sqlite.Select<TestInclude_OneToManyModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting).Select(m3 => new TestInclude_OneToManyModel33 { title = m3.title }))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+
+            var at11 = g.sqlite.Select<TestInclude_OneToManyModel11>()
+                .LeftJoin(a => a.model2id == a.model2.id)
+                .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2Id == a.model2.id && m3.setting == a.m3setting).Select(m3 => new TestInclude_OneToManyModel33 { title = m3.title }))
+                .Where(a => a.id <= model1.id)
+                .ToList(true);
+        }
+
+        [Fact]
+        public void Include_OneToChilds()
+        {
+            var tag1 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_中国"
+            };
+            tag1.Id = (int)g.sqlite.Insert(tag1).ExecuteIdentity();
+            var tag1_1 = new Tag
+            {
+                Parent_id = tag1.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_北京"
+            };
+            tag1_1.Id = (int)g.sqlite.Insert(tag1_1).ExecuteIdentity();
+            var tag1_2 = new Tag
+            {
+                Parent_id = tag1.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_01_上海"
+            };
+            tag1_2.Id = (int)g.sqlite.Insert(tag1_2).ExecuteIdentity();
+
+            var tag2 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_美国"
+            };
+            tag2.Id = (int)g.sqlite.Insert(tag2).ExecuteIdentity();
+            var tag2_1 = new Tag
+            {
+                Parent_id = tag2.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_纽约"
+            };
+            tag2_1.Id = (int)g.sqlite.Insert(tag2_1).ExecuteIdentity();
+            var tag2_2 = new Tag
+            {
+                Parent_id = tag2.Id,
+                Ddd = DateTime.Now.Second,
+                Name = "test_oneToChilds_02_华盛顿"
+            };
+            tag2_2.Id = (int)g.sqlite.Insert(tag2_2).ExecuteIdentity();
+
+            var tags0 = g.sqlite.Select<Tag>()
+                .Include(a => a.Parent)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags1 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags)
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags2 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags,
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags3 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags,
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs).IncludeMany(a => a.Tags))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags11 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags22 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1)))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var tags33 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1)).IncludeMany(a => a.Tags.Take(1)))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            // --- Select ---
+
+            var atags0 = g.sqlite.Select<Tag>()
+                .Include(a => a.Parent)
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags1 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags2 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags3 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })).IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags11 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags22 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+
+            var atags33 = g.sqlite.Select<Tag>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.Include(a => a.Parent).IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })).IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name })))
+                .Include(a => a.Parent)
+                .IncludeMany(a => a.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Id == tag1.Id || a.Id == tag2.Id)
+                .ToList();
+        }
+
+        [Fact]
+        public void Include_ManyToMany()
+        {
+            var tag1 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_01_中国"
+            };
+            tag1.Id = (int)g.sqlite.Insert(tag1).ExecuteIdentity();
+            var tag2 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_02_美国"
+            };
+            tag2.Id = (int)g.sqlite.Insert(tag2).ExecuteIdentity();
+            var tag3 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_03_日本"
+            };
+            tag3.Id = (int)g.sqlite.Insert(tag3).ExecuteIdentity();
+
+            var song1 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_01_我是中国人.mp3",
+                Url = "http://ww.baidu.com/"
+            };
+            song1.Id = (int)g.sqlite.Insert(song1).ExecuteIdentity();
+            var song2 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_02_爱你一万年.mp3",
+                Url = "http://ww.163.com/"
+            };
+            song2.Id = (int)g.sqlite.Insert(song2).ExecuteIdentity();
+            var song3 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_03_千年等一回.mp3",
+                Url = "http://ww.sina.com/"
+            };
+            song3.Id = (int)g.sqlite.Insert(song3).ExecuteIdentity();
+
+            g.sqlite.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.sqlite.Insert(new Song_tag { Song_id = song2.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag1.Id }).ExecuteAffrows();
+            g.sqlite.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag2.Id }).ExecuteAffrows();
+            g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag2.Id }).ExecuteAffrows();
+            g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag3.Id }).ExecuteAffrows();
+
+            new List<Song>(new[] { song1, song2, song3 }).IncludeMany(g.sqlite, a => a.Tags);
+
+            var songs1 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags)
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var songs1chunks = new List<Song>();
+            g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags)
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToChunk(2, ft =>
+                {
+                    songs1chunks.AddRange(ft.Object);
+                });
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var songs2 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags,
+                    then => then.IncludeMany(t => t.Songs))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var tags3 = g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs)
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+            var tags3chunks = new List<Song_tag>();
+            g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs)
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToChunk(2, ft =>
+                {
+                    tags3chunks.AddRange(ft.Object);
+                });
+
+            var songs11 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var songs22 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.IncludeMany(t => t.Songs.Take(1)))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var tags33 = g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+            // --- Select ---
+
+            new List<Song>(new[] { song1, song2, song3 }).IncludeMany(g.sqlite, a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }));
+
+            var asongs1 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var asongs2 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var atags3 = g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+
+            var asongs11 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var asongs22 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var asongs222211 = g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToList();
+
+            var atags33 = g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToList(true);
+
+            var asongs2222 = g.sqlite.Select<Song>()
+               .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                   then => then.IncludeMany(t => t.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })))
+               .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+               .ToList(a => new
+               {
+                   a.Id,
+                   a.Is_deleted,
+                   a.Tags
+               });
+        }
+
+        [Fact]
+        async public Task Include_ManyToManyAsync()
+        {
+            ThreadPool.SetMinThreads(100, 100);
+            await Task.Yield();
+
+            var tag1 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_01_中国"
+            };
+            tag1.Id = (int)await g.sqlite.Insert(tag1).ExecuteIdentityAsync();
+            var tag2 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_02_美国"
+            };
+            tag2.Id = (int)await g.sqlite.Insert(tag2).ExecuteIdentityAsync();
+            var tag3 = new Tag
+            {
+                Ddd = DateTime.Now.Second,
+                Name = "test_manytoMany_03_日本"
+            };
+            tag3.Id = (int)await g.sqlite.Insert(tag3).ExecuteIdentityAsync();
+
+            var song1 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_01_我是中国人.mp3",
+                Url = "http://ww.baidu.com/"
+            };
+            song1.Id = (int)await g.sqlite.Insert(song1).ExecuteIdentityAsync();
+            var song2 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_02_爱你一万年.mp3",
+                Url = "http://ww.163.com/"
+            };
+            song2.Id = (int)await g.sqlite.Insert(song2).ExecuteIdentityAsync();
+            var song3 = new Song
+            {
+                Create_time = DateTime.Now,
+                Title = "test_manytoMany_03_千年等一回.mp3",
+                Url = "http://ww.sina.com/"
+            };
+            song3.Id = (int)await g.sqlite.Insert(song3).ExecuteIdentityAsync();
+
+            await g.sqlite.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag1.Id }).ExecuteAffrowsAsync();
+            await g.sqlite.Insert(new Song_tag { Song_id = song2.Id, Tag_id = tag1.Id }).ExecuteAffrowsAsync();
+            await g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag1.Id }).ExecuteAffrowsAsync();
+            await g.sqlite.Insert(new Song_tag { Song_id = song1.Id, Tag_id = tag2.Id }).ExecuteAffrowsAsync();
+            await g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag2.Id }).ExecuteAffrowsAsync();
+            await g.sqlite.Insert(new Song_tag { Song_id = song3.Id, Tag_id = tag3.Id }).ExecuteAffrowsAsync();
+
+            await new List<Song>(new[] { song1, song2, song3 }).IncludeManyAsync(g.sqlite, a => a.Tags);
+
+            var songs1 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags)
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var songs2 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags,
+                    then => then.IncludeMany(t => t.Songs))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var tags3 = await g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs)
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToListAsync(true);
+
+
+            var songs11 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var songs22 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1),
+                    then => then.IncludeMany(t => t.Songs.Take(1)))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var tags33 = await g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToListAsync(true);
+
+            // --- Select ---
+
+            await new List<Song>(new[] { song1, song2, song3 }).IncludeManyAsync(g.sqlite, a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }));
+
+            var asongs1 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs1.Count);
+            Assert.Equal(2, songs1[0].Tags.Count);
+            Assert.Equal(1, songs1[1].Tags.Count);
+            Assert.Equal(3, songs1[2].Tags.Count);
+
+            var asongs2 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs2.Count);
+            Assert.Equal(2, songs2[0].Tags.Count);
+            Assert.Equal(1, songs2[1].Tags.Count);
+            Assert.Equal(3, songs2[2].Tags.Count);
+
+            var atags3 = await g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToListAsync(true);
+
+
+            var asongs11 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs11.Count);
+            Assert.Equal(1, songs11[0].Tags.Count);
+            Assert.Equal(1, songs11[1].Tags.Count);
+            Assert.Equal(1, songs11[2].Tags.Count);
+
+            var asongs22 = await g.sqlite.Select<Song>()
+                .IncludeMany(a => a.Tags.Take(1).Select(b => new Tag { Id = b.Id, Name = b.Name }),
+                    then => then.IncludeMany(t => t.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title })))
+                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
+                .ToListAsync();
+            Assert.Equal(3, songs22.Count);
+            Assert.Equal(1, songs22[0].Tags.Count);
+            Assert.Equal(1, songs22[1].Tags.Count);
+            Assert.Equal(1, songs22[2].Tags.Count);
+
+            var atags33 = await g.sqlite.Select<Song_tag>()
+                .Include(a => a.Tag.Parent)
+                .IncludeMany(a => a.Tag.Songs.Take(1).Select(b => new Song { Id = b.Id, Title = b.Title }))
+                .Where(a => a.Tag.Id == tag1.Id || a.Tag.Id == tag2.Id)
+                .ToListAsync(true);
+        }
+
+        public class ToDel1Pk
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        public class ToDel2Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk2 { get; set; }
+            public string name { get; set; }
+        }
+        public class ToDel3Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int pk2 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk3 { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void ToDelete()
+        {
+            g.sqlite.Select<ToDel1Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToDel1Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToDel1Pk{ name = "name1"},
+                new ToDel1Pk{ name = "name2"},
+                new ToDel1Pk{ name = "nick1"},
+                new ToDel1Pk{ name = "nick2"},
+                new ToDel1Pk{ name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToDel1Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.sqlite.Select<ToDel1Pk>().Count());
+            Assert.Equal(3, g.sqlite.Select<ToDel1Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.sqlite.Select<ToDel2Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToDel2Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name1"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name2"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick1"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick2"},
+                new ToDel2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToDel2Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.sqlite.Select<ToDel2Pk>().Count());
+            Assert.Equal(3, g.sqlite.Select<ToDel2Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.sqlite.Select<ToDel3Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToDel3Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name1"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name2"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick1"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick2"},
+                new ToDel3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToDel3Pk>().Where(a => a.name.StartsWith("name")).ToDelete().ExecuteAffrows());
+            Assert.Equal(3, g.sqlite.Select<ToDel3Pk>().Count());
+            Assert.Equal(3, g.sqlite.Select<ToDel3Pk>().Where(a => a.name.StartsWith("nick")).Count());
+        }
+
+        public class ToUpd1Pk
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+        public class ToUpd2Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk2 { get; set; }
+            public string name { get; set; }
+        }
+        public class ToUpd3Pk
+        {
+            [Column(IsPrimary = true)]
+            public Guid pk1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int pk2 { get; set; }
+            [Column(IsPrimary = true)]
+            public string pk3 { get; set; }
+            public string name { get; set; }
+        }
+        [Fact]
+        public void ToUpdate()
+        {
+            g.sqlite.Select<ToUpd1Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToUpd1Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToUpd1Pk{ name = "name1"},
+                new ToUpd1Pk{ name = "name2"},
+                new ToUpd1Pk{ name = "nick1"},
+                new ToUpd1Pk{ name = "nick2"},
+                new ToUpd1Pk{ name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToUpd1Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.sqlite.Select<ToUpd1Pk>().Count());
+            Assert.Equal(5, g.sqlite.Select<ToUpd1Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.sqlite.Select<ToUpd2Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToUpd2Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name1"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "name2"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick1"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick2"},
+                new ToUpd2Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = "pk2", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToUpd2Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.sqlite.Select<ToUpd2Pk>().Count());
+            Assert.Equal(5, g.sqlite.Select<ToUpd2Pk>().Where(a => a.name.StartsWith("nick")).Count());
+
+            g.sqlite.Select<ToUpd3Pk>().ToDelete().ExecuteAffrows();
+            Assert.Equal(0, g.sqlite.Select<ToUpd3Pk>().Count());
+            g.sqlite.Insert(new[] {
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name1"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "name2"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick1"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick2"},
+                new ToUpd3Pk{ pk1 = FreeUtil.NewMongodbId(), pk2 = 1, pk3 = "pk3", name = "nick3"}
+            }).ExecuteAffrows();
+            Assert.Equal(2, g.sqlite.Select<ToUpd3Pk>().Where(a => a.name.StartsWith("name")).ToUpdate().Set(a => a.name, "nick?").ExecuteAffrows());
+            Assert.Equal(5, g.sqlite.Select<ToUpd3Pk>().Count());
+            Assert.Equal(5, g.sqlite.Select<ToUpd3Pk>().Where(a => a.name.StartsWith("nick")).Count());
+        }
+
+        [Fact]
+        public void ForUpdate()
+        {
+            var orm = g.sqlite;
+
+            Assert.Equal("安全起见，请务必在事务开启之后，再使用 ForUpdate",
+                Assert.Throws<Exception>(() => orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToList())?.Message);
+
+            orm.Transaction(() =>
+            {
+                var sql = orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToSql().Replace("\r\n", "");
+                Assert.Equal("SELECT a.\"id\", a.\"name\" FROM \"ToUpd1Pk\" a limit 0,1", sql);
+                orm.Select<ToUpd1Pk>().ForUpdate().Limit(1).ToList();
+
+                sql = orm.Select<ToUpd1Pk>().ForUpdate(true).Limit(1).ToSql().Replace("\r\n", "");
+                Assert.Equal("SELECT a.\"id\", a.\"name\" FROM \"ToUpd1Pk\" a limit 0,1", sql);
+                orm.Select<ToUpd1Pk>().ForUpdate(true).Limit(1).ToList();
+            });
+        }
+
+        [Fact]
+        public void ToTreeList()
+        {
+            var fsql = g.sqlite;
+            fsql.Delete<BaseDistrict>().Where("1=1").ExecuteAffrows();
+            var repo = fsql.GetRepository<VM_District_Child>();
+            repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
+            repo.DbContextOptions.NoneParameter = true;
+            repo.Insert(new VM_District_Child
+            {
+                Code = "100000",
+                Name = "中国",
+                Childs = new List<VM_District_Child>(new[] {
+                    new VM_District_Child
+                    {
+                        Code = "110000",
+                        Name = "北京",
+                        Childs = new List<VM_District_Child>(new[] {
+                            new VM_District_Child{ Code="110100", Name = "北京市" },
+                            new VM_District_Child{ Code="110101", Name = "东城区" },
+                        })
+                    }
+                })
+            });
+
+            var t1 = fsql.Select<VM_District_Parent>()
+                .InnerJoin(a => a.ParentCode == a.Parent.Code)
+                .Where(a => a.Code == "110101")
+                .ToList(true);
+            Assert.Single(t1);
+            Assert.Equal("110101", t1[0].Code);
+            Assert.NotNull(t1[0].Parent);
+            Assert.Equal("110000", t1[0].Parent.Code);
+
+            var t2 = fsql.Select<VM_District_Parent>()
+                .InnerJoin(a => a.ParentCode == a.Parent.Code)
+                .InnerJoin(a => a.Parent.ParentCode == a.Parent.Parent.Code)
+                .Where(a => a.Code == "110101")
+                .ToList(true);
+            Assert.Single(t2);
+            Assert.Equal("110101", t2[0].Code);
+            Assert.NotNull(t2[0].Parent);
+            Assert.Equal("110000", t2[0].Parent.Code);
+            Assert.NotNull(t2[0].Parent.Parent);
+            Assert.Equal("100000", t2[0].Parent.Parent.Code);
+
+            var t3 = fsql.Select<VM_District_Child>().ToTreeList();
+            Assert.Single(t3);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Single(t3[0].Childs);
+            Assert.Equal("110000", t3[0].Childs[0].Code);
+            Assert.Equal(2, t3[0].Childs[0].Childs.Count);
+            Assert.Equal("110100", t3[0].Childs[0].Childs[0].Code);
+            Assert.Equal("110101", t3[0].Childs[0].Childs[1].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte().OrderBy(a => a.Code).ToTreeList();
+            Assert.Single(t3);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Single(t3[0].Childs);
+            Assert.Equal("110000", t3[0].Childs[0].Code);
+            Assert.Equal(2, t3[0].Childs[0].Childs.Count);
+            Assert.Equal("110100", t3[0].Childs[0].Childs[0].Code);
+            Assert.Equal("110101", t3[0].Childs[0].Childs[1].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte().OrderBy(a => a.Code).ToList();
+            Assert.Equal(4, t3.Count);
+            Assert.Equal("100000", t3[0].Code);
+            Assert.Equal("110000", t3[1].Code);
+            Assert.Equal("110100", t3[2].Code);
+            Assert.Equal("110101", t3[3].Code);
+
+            t3 = fsql.Select<VM_District_Child>().Where(a => a.Name == "北京").AsTreeCte().OrderBy(a => a.Code).ToList();
+            Assert.Equal(3, t3.Count);
+            Assert.Equal("110000", t3[0].Code);
+            Assert.Equal("110100", t3[1].Code);
+            Assert.Equal("110101", t3[2].Code);
+
+            var t4 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte(a => a.Name).OrderBy(a => a.Code)
+                .ToList(a => new { item = a, level = Convert.ToInt32("a.cte_level"), path = "a.cte_path" });
+            Assert.Equal(4, t4.Count);
+            Assert.Equal("100000", t4[0].item.Code);
+            Assert.Equal("110000", t4[1].item.Code);
+            Assert.Equal("110100", t4[2].item.Code);
+            Assert.Equal("110101", t4[3].item.Code);
+            Assert.Equal("中国", t4[0].path);
+            Assert.Equal("中国 -> 北京", t4[1].path);
+            Assert.Equal("中国 -> 北京 -> 北京市", t4[2].path);
+            Assert.Equal("中国 -> 北京 -> 东城区", t4[3].path);
+
+            t4 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国").AsTreeCte(a => a.Name + "[" + a.Code + "]").OrderBy(a => a.Code)
+                .ToList(a => new { item = a, level = Convert.ToInt32("a.cte_level"), path = "a.cte_path" });
+            Assert.Equal(4, t4.Count);
+            Assert.Equal("100000", t4[0].item.Code);
+            Assert.Equal("110000", t4[1].item.Code);
+            Assert.Equal("110100", t4[2].item.Code);
+            Assert.Equal("110101", t4[3].item.Code);
+            Assert.Equal("中国[100000]", t4[0].path);
+            Assert.Equal("中国[100000] -> 北京[110000]", t4[1].path);
+            Assert.Equal("中国[100000] -> 北京[110000] -> 北京市[110100]", t4[2].path);
+            Assert.Equal("中国[100000] -> 北京[110000] -> 东城区[110101]", t4[3].path);
+
+            var select = fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte()
+                //.OrderBy("a.cte_level desc") //递归层级
+                ;
+            // var list = select.ToList(); //自己调试看查到的数据
+            select.ToUpdate().Set(a => a.testint, 855).ExecuteAffrows();
+            Assert.Equal(855, fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte().Distinct().First(a => a.testint));
+
+            Assert.Equal(4, select.ToDelete().ExecuteAffrows());
+            Assert.False(fsql.Select<VM_District_Child>()
+                .Where(a => a.Name == "中国")
+                .AsTreeCte().Any());
+        }
+
+        [Table(Name = "D_District")]
+        public class BaseDistrict
+        {
+            [Column(IsPrimary = true, StringLength = 6)]
+            public string Code { get; set; }
+
+            [Column(StringLength = 20, IsNullable = false)]
+            public string Name { get; set; }
+
+            [Column(StringLength = 6)]
+            public virtual string ParentCode { get; set; }
+
+            public DateTime CreateTime { get; set; }
+
+            public int testint { get; set; }
+        }
+        [Table(Name = "D_District", DisableSyncStructure = true)]
+        public class VM_District_Child : BaseDistrict
+        {
+            public override string ParentCode { get => base.ParentCode; set => base.ParentCode = value; }
+
+            [Navigate(nameof(ParentCode))]
+            public List<VM_District_Child> Childs { get; set; }
+        }
+        [Table(Name = "D_District", DisableSyncStructure = true)]
+        public class VM_District_Parent : BaseDistrict
+        {
+            public override string ParentCode { get => base.ParentCode; set => base.ParentCode = value; }
+
+            [Navigate(nameof(ParentCode))]
+            public VM_District_Parent Parent { get; set; }
+        }
+
+        [Fact]
+        public void WhereDynamicFilter()
+        {
+            var fsql = g.sqlite;
+            fsql.CodeFirst.SyncStructure<VM_District_Parent>();
+            fsql.CodeFirst.SyncStructure<ts_dyfilter_enum01>();
+            var sql = fsql.Select<VM_District_Parent>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""Code"",
+      ""Operator"" : ""Contains"",
+      ""Value"" : ""val1"",
+      ""Filters"" :
+      [
+        {
+          ""Field"" : ""Name"",
+          ""Operator"" : ""StartsWith"",
+          ""Value"" : ""val2"",
+        }
+      ]
+    },
+    {
+      ""Field"" : ""Name"",
+      ""Operator"" : ""EndsWith"",
+      ""Value"" : ""val3""
+    },
+    {
+      ""Field"" : ""ParentCode"",
+      ""Operator"" : ""Equals"",
+      ""Value"" : ""val4""
+    },
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""GreaterThanOrEqual"",
+      ""Value"" : ""2010-10-10""
+    },
+    {
+        ""Field"" : ""Name"",
+        ""Operator"" : ""GreaterThan"",
+        ""Value"" : ""val31"",
+    },
+    {
+        ""Field"" : ""Name"",
+        ""Operator"" : ""GreaterThanOrEqual"",
+        ""Value"" : ""val32"",
+    },
+    {
+        ""Field"" : ""Name"",
+        ""Operator"" : ""LessThan"",
+        ""Value"" : ""val33"",
+    },
+    {
+        ""Field"" : ""Name"",
+        ""Operator"" : ""LessThanOrEqual"",
+        ""Value"" : ""val34"",
+    }
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""Code"", a.""Name"", a.""CreateTime"", a.""testint"", a.""ParentCode"" 
+FROM ""D_District"" a 
+WHERE (((a.""Code"") LIKE '%val1%' AND (a.""Name"") LIKE 'val2%' OR (a.""Name"") LIKE '%val3' OR a.""ParentCode"" = 'val4' OR a.""CreateTime"" >= '2010-10-10 00:00:00' OR a.""Name"" > 'val31' OR a.""Name"" >= 'val32' OR a.""Name"" < 'val33' OR a.""Name"" <= 'val34'))", sql);
+
+            sql = fsql.Select<VM_District_Parent>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""DateRange"",
+      ""Value"" : [""2010-10-10"", ""2010-11-10""]
+    },
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""DateRange"",
+      ""Value"" : ""2010-10,2010-11""
+    },
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""DateRange"",
+      ""Value"" : ""2010,2010""
+    },
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""DateRange"",
+      ""Value"" : ""2010-10-10 11,2010-11-10 11""
+    },
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""DateRange"",
+      ""Value"" : ""2010-10-10 11:20,2010-11-10 11:20""
+    },
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""Code"", a.""Name"", a.""CreateTime"", a.""testint"", a.""ParentCode"" 
+FROM ""D_District"" a 
+WHERE ((a.""CreateTime"" >= '2010-10-10 00:00:00' AND a.""CreateTime"" < '2010-11-11 00:00:00' OR a.""CreateTime"" >= '2010-10-01 00:00:00' AND a.""CreateTime"" < '2010-12-01 00:00:00' OR a.""CreateTime"" >= '2010-01-01 00:00:00' AND a.""CreateTime"" < '2011-01-01 00:00:00' OR a.""CreateTime"" >= '2010-10-10 11:00:00' AND a.""CreateTime"" < '2010-11-10 12:00:00' OR a.""CreateTime"" >= '2010-10-10 11:20:00' AND a.""CreateTime"" < '2010-11-10 11:21:00'))", sql);
+
+            sql = fsql.Select<VM_District_Parent>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""CreateTime"",
+      ""Operator"" : ""Range"",
+      ""Value"" : ""2010-10-10,2010-12-10""
+    },
+    {
+      ""Field"" : ""Name"",
+      ""Operator"" : ""Any"",
+      ""Value"" : ""val1,val2,val3,val4""
+    },
+    {
+      ""Field"" : ""testint"",
+      ""Operator"" : ""Range"",
+      ""Value"" : ""100,555""
+    },
+    {
+      ""Field"" : ""testint"",
+      ""Operator"" : ""Any"",
+      ""Value"" : ""1,5,11,15""
+    }
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""Code"", a.""Name"", a.""CreateTime"", a.""testint"", a.""ParentCode"" 
+FROM ""D_District"" a 
+WHERE ((a.""CreateTime"" >= '2010-10-10 00:00:00' AND a.""CreateTime"" < '2010-12-10 00:00:00' OR ((a.""Name"") in ('val1','val2','val3','val4')) OR a.""testint"" >= 100 AND a.""testint"" < 555 OR ((a.""testint"") in (1,5,11,15))))", sql);
+
+            sql = fsql.Select<VM_District_Parent>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""Code"",
+      ""Operator"" : ""NotContains"",
+      ""Value"" : ""val1"",
+      ""Filters"" :
+      [
+        {
+          ""Field"" : ""Name"",
+          ""Operator"" : ""NotStartsWith"",
+          ""Value"" : ""val2"",
+        }
+      ]
+    },
+    {
+      ""Field"" : ""Name"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""val3""
+    },
+    {
+      ""Field"" : ""ParentCode"",
+      ""Operator"" : ""NotEqual"",
+      ""Value"" : ""val4""
+    },
+
+    {
+      ""Field"" : ""Parent.Code"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val11"",
+      ""Filters"" :
+      [
+        {
+          ""Field"" : ""Parent.Name"",
+          ""Operator"" : ""contains"",
+          ""Value"" : ""val22"",
+        }
+      ]
+    },
+    {
+      ""Field"" : ""Parent.Name"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val33""
+    },
+    {
+      ""Field"" : ""Parent.ParentCode"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val44""
+    }
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""Code"", a.""Name"", a.""CreateTime"", a.""testint"", a.""ParentCode"", a__Parent.""Code"" as6, a__Parent.""Name"" as7, a__Parent.""CreateTime"" as8, a__Parent.""testint"" as9, a__Parent.""ParentCode"" as10 
+FROM ""D_District"" a 
+LEFT JOIN ""D_District"" a__Parent ON a__Parent.""Code"" = a.""ParentCode"" 
+WHERE ((not((a.""Code"") LIKE '%val1%') AND not((a.""Name"") LIKE 'val2%') OR not((a.""Name"") LIKE '%val3') OR a.""ParentCode"" <> 'val4' OR a__Parent.""Code"" = 'val11' AND (a__Parent.""Name"") LIKE '%val22%' OR a__Parent.""Name"" = 'val33' OR a__Parent.""ParentCode"" = 'val44'))", sql);
+
+            sql = fsql.Select<VM_District_Parent>().OrderByPropertyName("Parent.Name").WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""Code"",
+      ""Operator"" : ""NotContains"",
+      ""Value"" : ""val1"",
+      ""Filters"" :
+      [
+        {
+          ""Field"" : ""Name"",
+          ""Operator"" : ""NotStartsWith"",
+          ""Value"" : ""val2"",
+        }
+      ]
+    },
+    {
+      ""Field"" : ""Name"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""val3""
+    },
+    {
+      ""Field"" : ""ParentCode"",
+      ""Operator"" : ""NotEqual"",
+      ""Value"" : ""val4""
+    },
+
+    {
+      ""Field"" : ""Parent.Code"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val11"",
+      ""Filters"" :
+      [
+        {
+          ""Field"" : ""Parent.Name"",
+          ""Operator"" : ""contains"",
+          ""Value"" : ""val22"",
+        }
+      ]
+    },
+    {
+      ""Field"" : ""Parent.Name"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val33""
+    },
+    {
+      ""Field"" : ""Parent.ParentCode"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""val44""
+    }
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""Code"", a.""Name"", a.""CreateTime"", a.""testint"", a.""ParentCode"", a__Parent.""Code"" as6, a__Parent.""Name"" as7, a__Parent.""CreateTime"" as8, a__Parent.""testint"" as9, a__Parent.""ParentCode"" as10 
+FROM ""D_District"" a 
+LEFT JOIN ""D_District"" a__Parent ON a__Parent.""Code"" = a.""ParentCode"" 
+WHERE ((not((a.""Code"") LIKE '%val1%') AND not((a.""Name"") LIKE 'val2%') OR not((a.""Name"") LIKE '%val3') OR a.""ParentCode"" <> 'val4' OR a__Parent.""Code"" = 'val11' AND (a__Parent.""Name"") LIKE '%val22%' OR a__Parent.""Name"" = 'val33' OR a__Parent.""ParentCode"" = 'val44')) 
+ORDER BY a__Parent.""Name""", sql);
+
+            sql = fsql.Select<ts_dyfilter_enum01>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""name"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""testname01""
+    },
+    {
+      ""Field"" : ""no"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""testname01""
+    },
+    {
+      ""Field"" : ""id"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""testname01""
+    },
+    {
+      ""Field"" : ""status"",
+      ""Operator"" : ""eq"",
+      ""Value"" : ""finished""
+    },
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""id"", a.""name"", a.""no"", a.""status"" 
+FROM ""ts_dyfilter_enum01"" a 
+WHERE ((not((a.""name"") LIKE '%testname01') OR not((a.""no"") LIKE '%testname01') OR not((a.""id"") LIKE '%testname01') OR a.""status"" = 2))", sql);
+
+            sql = fsql.Select<ts_dyfilter_enum01>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""MyRawSql FreeSql.Tests.Sqlite.DynamicFilterMyCustom, FreeSql.Tests.Provider.Sqlite.Data"",
+      ""Operator"" : ""Custom"",
+      ""Value"" : ""(name,no) in (('testname01','testname01'))""
+    },
+    {
+      ""Field"" : ""no"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""testname01""
+    },
+    {
+      ""Field"" : ""MyRawSql FreeSql.Tests.Sqlite.DynamicFilterMyCustom, FreeSql.Tests.Provider.Sqlite.Data"",
+      ""Operator"" : ""Custom"",
+      ""Value"" : ""(id,status) in (('testname01','finished'))""
+    },
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""id"", a.""name"", a.""no"", a.""status"" 
+FROM ""ts_dyfilter_enum01"" a 
+WHERE (((name,no) in (('testname01','testname01')) OR not((a.""no"") LIKE '%testname01') OR (id,status) in (('testname01','finished'))))", sql);
+        }
+
+        class ts_dyfilter_enum01
+        {
+            public Guid id { get; set; }
+            public string name { get; set; }
+            public int no { get; set; }
+            public ts_dyfilter_enum01_status status { get; set; }
+        }
+        public enum ts_dyfilter_enum01_status { staring, stoped, finished }
+    }
+
+    public class DynamicFilterMyCustom
+    {
+        [DynamicFilterCustom]
+        public static string MyRawSql(string value) => value;
+
+        public static string TupleIn(string value)
+        {
+            var sb = new StringBuilder();
+            var array = JArray.Parse(value);
+            var row = 0;
+            foreach(JObject item in array)
+            {
+                if (row++ == 0)
+                {
+                    sb.Append("(");
+                    var propNames = item.Properties().Select(a => a.Name);
+                    sb.Append(string.Join(", ", propNames));
+                    sb.Append(") IN (");
+                }
+                if (row == array.Count - 1)
+                {
+                    sb.Append(")");
+                }
+                if (row > 1) sb.Append(", ");
+                sb.Append("(");
+                var propValues = item.Values().Select(a => a?.ToString().Replace("'", "''")); //注入处理
+                sb.Append(string.Join(", ", propValues));
+                sb.Append(")");
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteUpdateTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteUpdateTest.cs
new file mode 100644
index 00000000..738852d4
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteUpdateTest.cs
@@ -0,0 +1,243 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteUpdateTest
+    {
+        IUpdate<Topic> update => g.sqlite.Update<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int? Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Table(Name = "tb_topic_setsource")]
+        class Topic22
+        {
+            [Column(IsPrimary = true)]
+            public int Id { get; set; }
+            public int? Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+        [Fact]
+        public void Dywhere()
+        {
+            Assert.Null(g.sqlite.Update<Topic>().ToSql());
+            Assert.Equal("UPDATE \"tb_topic\" SET title='test' \r\nWHERE (\"Id\" IN (1,2))", g.sqlite.Update<Topic>(new[] { 1, 2 }).SetRaw("title='test'").ToSql());
+            Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"Id\" = 1)", g.sqlite.Update<Topic>(new Topic { Id = 1, Title = "test" }).SetRaw("title='test1'").ToSql());
+            Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"Id\" IN (1,2))", g.sqlite.Update<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).SetRaw("title='test1'").ToSql());
+            Assert.Equal("UPDATE \"tb_topic\" SET title='test1' \r\nWHERE (\"Id\" = 1)", g.sqlite.Update<Topic>(new { id = 1 }).SetRaw("title='test1'").ToSql());
+        }
+
+        [Fact]
+        public void SetSource()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = @p_0, \"Title\" = @p_1, \"CreateTime\" = @p_2 WHERE (\"Id\" = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            items[0].Clicks = null;
+
+            sql = update.SetSource(items).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = CASE \"Id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END, \"Title\" = CASE \"Id\" WHEN 1 THEN @p_10 WHEN 2 THEN @p_11 WHEN 3 THEN @p_12 WHEN 4 THEN @p_13 WHEN 5 THEN @p_14 WHEN 6 THEN @p_15 WHEN 7 THEN @p_16 WHEN 8 THEN @p_17 WHEN 9 THEN @p_18 WHEN 10 THEN @p_19 END, \"CreateTime\" = CASE \"Id\" WHEN 1 THEN @p_20 WHEN 2 THEN @p_21 WHEN 3 THEN @p_22 WHEN 4 THEN @p_23 WHEN 5 THEN @p_24 WHEN 6 THEN @p_25 WHEN 7 THEN @p_26 WHEN 8 THEN @p_27 WHEN 9 THEN @p_28 WHEN 10 THEN @p_29 END WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = update.SetSource(items).IgnoreColumns(a => new { a.Clicks, a.CreateTime, a.TypeGuid }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = CASE \"Id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = update.SetSource(items).IgnoreColumns(a => a.TypeGuid).Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"CreateTime\" = @p_0 WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = g.sqlite.Update<ts_source_mpk>().SetSource(new[] {
+                new ts_source_mpk { id1 = 1, id2 = 7, xx = "a1" },
+                new ts_source_mpk { id1 = 1, id2 = 8, xx = "b122" }
+            }).NoneParameter().ToSql().Replace("\r\n", "");
+        }
+        public class ts_source_mpk
+        {
+            [Column(IsPrimary = true)]
+            public int id1 { get; set; }
+            [Column(IsPrimary = true)]
+            public int id2 { get; set; }
+            public string xx { get; set; }
+        }
+        [Fact]
+        public void SetSourceNoIdentity()
+        {
+            var fsql = g.sqlite;
+            fsql.Delete<Topic22>().Where("1=1").ExecuteAffrows();
+            var sql = fsql.Update<Topic22>().SetSource(new Topic22 { Id = 1, Title = "newtitle" }).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic_setsource\" SET \"Clicks\" = @p_0, \"Title\" = @p_1, \"CreateTime\" = @p_2 WHERE (\"Id\" = 1)", sql);
+
+            var items = new List<Topic22>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic22 { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            Assert.Equal(10, fsql.Insert(items).ExecuteAffrows());
+            items[0].Clicks = null;
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => a.TypeGuid).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic_setsource\" SET \"Clicks\" = CASE \"Id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END, \"Title\" = CASE \"Id\" WHEN 1 THEN @p_10 WHEN 2 THEN @p_11 WHEN 3 THEN @p_12 WHEN 4 THEN @p_13 WHEN 5 THEN @p_14 WHEN 6 THEN @p_15 WHEN 7 THEN @p_16 WHEN 8 THEN @p_17 WHEN 9 THEN @p_18 WHEN 10 THEN @p_19 END, \"CreateTime\" = CASE \"Id\" WHEN 1 THEN @p_20 WHEN 2 THEN @p_21 WHEN 3 THEN @p_22 WHEN 4 THEN @p_23 WHEN 5 THEN @p_24 WHEN 6 THEN @p_25 WHEN 7 THEN @p_26 WHEN 8 THEN @p_27 WHEN 9 THEN @p_28 WHEN 10 THEN @p_29 END WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => new { a.Clicks, a.CreateTime, a.TypeGuid }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic_setsource\" SET \"Title\" = CASE \"Id\" WHEN 1 THEN @p_0 WHEN 2 THEN @p_1 WHEN 3 THEN @p_2 WHEN 4 THEN @p_3 WHEN 5 THEN @p_4 WHEN 6 THEN @p_5 WHEN 7 THEN @p_6 WHEN 8 THEN @p_7 WHEN 9 THEN @p_8 WHEN 10 THEN @p_9 END WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+
+            sql = fsql.Update<Topic22>().SetSource(items).IgnoreColumns(a => a.TypeGuid).Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic_setsource\" SET \"CreateTime\" = @p_0 WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void SetSourceIgnore()
+        {
+            Assert.Equal("UPDATE \"tssi01\" SET \"tint\" = 10 WHERE (\"id\" = '00000000-0000-0000-0000-000000000000')",
+                g.sqlite.Update<tssi01>().NoneParameter()
+                    .SetSourceIgnore(new tssi01 { id = Guid.Empty, tint = 10 }, col => col == null).ToSql().Replace("\r\n", ""));
+        }
+        public class tssi01
+        {
+            [Column(CanUpdate = false)]
+            public Guid id { get; set; }
+            public int tint { get; set; }
+            public string title { get; set; }
+        }
+        [Fact]
+        public void IgnoreColumns()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new { a.Clicks, a.CreateTime, a.TypeGuid }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new object[] { a.Clicks, a.CreateTime, a.TypeGuid }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => new[] { "Clicks", "CreateTime", "TypeGuid" }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+
+            var cols = new[] { "Clicks", "CreateTime", "TypeGuid" };
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(a => cols).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+
+            cols = new[] { "Clicks", "CreateTime", "TypeGuid" };
+            sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).IgnoreColumns(cols).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+        }
+        [Fact]
+        public void UpdateColumns()
+        {
+            var sql = update.SetSource(new Topic { Id = 1, Title = "newtitle" }).UpdateColumns(a => a.Title).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+        }
+        [Fact]
+        public void Set()
+        {
+            var sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Where(a => a.Id == 1).Set(a => a.Title, "newtitle").Set(a => a.CreateTime, new DateTime(2020, 1, 1)).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Title\" = @p_0, \"CreateTime\" = @p_1 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = ifnull(\"Clicks\", 0) * 10 / 1 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Id - 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Id\" = (\"Id\" - 10) WHERE (\"Id\" = 1)", sql);
+
+            int incrv = 10;
+            sql = update.Set(a => a.Clicks * incrv / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = ifnull(\"Clicks\", 0) * 10 / 1 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Id - incrv).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Id\" = (\"Id\" - 10) WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.CreateTime.AddYears(1)).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"CreateTime\" = datetime(\"CreateTime\",(1)||' years') WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Clicks == a.Clicks * 10 / 1).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = \"Clicks\" * 10 / 1 WHERE (\"Id\" = 1)", sql);
+
+            var dt2000 = DateTime.Parse("2000-01-01");
+            sql = update.Set(a => a.Clicks == (a.CreateTime > dt2000 ? 1 : 2)).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = case when \"CreateTime\" > '2000-01-01 00:00:00' then 1 else 2 end WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Id == 10).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Id\" = 10 WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Set(a => a.Clicks == null).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = NULL WHERE (\"Id\" = 1)", sql);
+        }
+        [Fact]
+        public void SetRaw()
+        {
+            var sql = update.Where(a => a.Id == 1).SetRaw("clicks = clicks + :incrClick", new { incrClick = 1 }).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET clicks = clicks + :incrClick WHERE (\"Id\" = 1)", sql);
+        }
+        [Fact]
+        public void SetDto()
+        {
+            var sql = update.SetDto(new { clicks = 1, title = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = @p_0, \"Title\" = @p_1 WHERE (\"Id\" = 1)", sql);
+            sql = update.NoneParameter().SetDto(new { clicks = 1, title = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = 1, \"Title\" = 'xxx' WHERE (\"Id\" = 1)", sql);
+
+            sql = update.SetDto(new Dictionary<string, object> { ["clicks"] = 1, ["title"] = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = @p_0, \"Title\" = @p_1 WHERE (\"Id\" = 1)", sql);
+            sql = update.NoneParameter().SetDto(new Dictionary<string, object> { ["clicks"] = 1, ["title"] = "xxx" }).Where(a => a.Id == 1).ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET \"Clicks\" = 1, \"Title\" = 'xxx' WHERE (\"Id\" = 1)", sql);
+        }
+        [Fact]
+        public void Where()
+        {
+            var sql = update.Where(a => a.Id == 1).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"Id\" = 1)", sql);
+
+            sql = update.Where("id = :id", new { id = 1 }).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (id = :id)", sql);
+
+            var item = new Topic { Id = 1, Title = "newtitle" };
+            sql = update.Where(item).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"Id\" = 1)", sql);
+
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+            sql = update.Where(items).SetRaw("title='newtitle'").ToSql().Replace("\r\n", "");
+            Assert.Equal("UPDATE \"tb_topic\" SET title='newtitle' WHERE (\"Id\" IN (1,2,3,4,5,6,7,8,9,10))", sql);
+        }
+        [Fact]
+        public void ExecuteAffrows()
+        {
+            var items = new List<Topic>();
+            for (var a = 0; a < 10; a++) items.Add(new Topic { Id = a + 1, Title = $"newtitle{a}", Clicks = a * 100 });
+
+            var time = DateTime.Now;
+            var items222 = g.sqlite.Select<Topic>().Where(a => a.CreateTime > time).Limit(10).ToList();
+
+            update.SetSource(items.First()).NoneParameter().ExecuteAffrows();
+            update.SetSource(items).NoneParameter().ExecuteAffrows();
+        }
+        [Fact]
+        public void ExecuteUpdated()
+        {
+
+        }
+
+        [Fact]
+        public void AsTable()
+        {
+            Assert.Null(g.sqlite.Update<Topic>().ToSql());
+            Assert.Equal("UPDATE \"tb_topicAsTable\" SET title='test' \r\nWHERE (\"Id\" IN (1,2))", g.sqlite.Update<Topic>(new[] { 1, 2 }).SetRaw("title='test'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE \"tb_topicAsTable\" SET title='test1' \r\nWHERE (\"Id\" = 1)", g.sqlite.Update<Topic>(new Topic { Id = 1, Title = "test" }).SetRaw("title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE \"tb_topicAsTable\" SET title='test1' \r\nWHERE (\"Id\" IN (1,2))", g.sqlite.Update<Topic>(new[] { new Topic { Id = 1, Title = "test" }, new Topic { Id = 2, Title = "test" } }).SetRaw("title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+            Assert.Equal("UPDATE \"tb_topicAsTable\" SET title='test1' \r\nWHERE (\"Id\" = 1)", g.sqlite.Update<Topic>(new { id = 1 }).SetRaw("title='test1'").AsTable(a => "tb_topicAsTable").ToSql());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolNullableTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolNullableTest.cs
new file mode 100644
index 00000000..78d46bd2
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolNullableTest.cs
@@ -0,0 +1,1571 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteMapType
+{
+    public class BoolNullableTest
+    {
+        class BoolNullableMap
+        {
+            public Guid id { get; set; }
+            [Column(MapType = typeof(bool))]
+            public bool? tobool { get; set; } = true;
+
+            [Column(MapType = typeof(sbyte))]
+            public bool? tosbyte { get; set; } = true;
+            [Column(MapType = typeof(sbyte?))]
+            public bool? tosbytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(short))]
+            public bool? toshort { get; set; } = true;
+
+            [Column(MapType = typeof(short?))]
+            public bool? toshortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(int))]
+            public bool? toint { get; set; } = true;
+
+            [Column(MapType = typeof(int?))]
+            public bool? tointnullable { get; set; } = true;
+
+            [Column(MapType = typeof(long))]
+            public bool? tolong { get; set; } = true;
+            [Column(MapType = typeof(long?))]
+            public bool? tolongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(byte))]
+            public bool? tobyte { get; set; } = true;
+            [Column(MapType = typeof(byte?))]
+            public bool? tobytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(ushort))]
+            public bool? toushort { get; set; } = true;
+
+            [Column(MapType = typeof(ushort?))]
+            public bool? toushortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(uint))]
+            public bool? touint { get; set; } = true;
+
+            [Column(MapType = typeof(uint?))]
+            public bool? touintnullable { get; set; } = true;
+
+            [Column(MapType = typeof(ulong))]
+            public bool? toulong { get; set; } = true;
+            [Column(MapType = typeof(ulong?))]
+            public bool? toulongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(string))]
+            public bool? tostring { get; set; } = true;
+        }
+        [Fact]
+        public void Bool()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(true, find.tobool);
+
+            item = new BoolNullableMap { tobool = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            item = new BoolNullableMap { tobool = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            //update all
+            item.tobool = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(true, find.tobool);
+
+            item.tobool = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            item.tobool = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobool, find.tobool);
+            Assert.Equal(false, find.tobool);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobool);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobool);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobool, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobool);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobool == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByte()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(true, find.tosbyte);
+
+            item = new BoolNullableMap { tosbyte = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            item = new BoolNullableMap { tosbyte = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            //update all
+            item.tosbyte = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(true, find.tosbyte);
+
+            item.tosbyte = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            item.tosbyte = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tosbyte, find.tosbyte);
+            Assert.Equal(false, find.tosbyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByteNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(true, find.tosbytenullable);
+
+            item = new BoolNullableMap { tosbytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(false, find.tosbytenullable);
+
+            item = new BoolNullableMap { tosbytenullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Null(find.tosbytenullable);
+
+            //update all
+            item.tosbytenullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(true, find.tosbytenullable);
+
+            item.tosbytenullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Equal(false, find.tosbytenullable);
+
+            item.tosbytenullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.Null(find.tosbytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tosbytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tosbytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Short()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(true, find.toshort);
+
+            item = new BoolNullableMap { toshort = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            item = new BoolNullableMap { toshort = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            //update all
+            item.toshort = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(true, find.toshort);
+
+            item.toshort = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            item.toshort = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toshort, find.toshort);
+            Assert.Equal(false, find.toshort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshort, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ShortNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(true, find.toshortnullable);
+
+            item = new BoolNullableMap { toshortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(false, find.toshortnullable);
+
+            item = new BoolNullableMap { toshortnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Null(find.toshortnullable);
+
+            //update all
+            item.toshortnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(true, find.toshortnullable);
+
+            item.toshortnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Equal(false, find.toshortnullable);
+
+            item.toshortnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.Null(find.toshortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toshortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toshortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Int()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(true, find.toint);
+
+            item = new BoolNullableMap { toint = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            item = new BoolNullableMap { toint = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            //update all
+            item.toint = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(true, find.toint);
+
+            item.toint = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            item.toint = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toint, find.toint);
+            Assert.Equal(false, find.toint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toint, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void IntNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(true, find.tointnullable);
+
+            item = new BoolNullableMap { tointnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(false, find.tointnullable);
+
+            item = new BoolNullableMap { tointnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Null(find.tointnullable);
+
+            //update all
+            item.tointnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(true, find.tointnullable);
+
+            item.tointnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Equal(false, find.tointnullable);
+
+            item.tointnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.Null(find.tointnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tointnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tointnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Long()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(true, find.tolong);
+
+            item = new BoolNullableMap { tolong = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            item = new BoolNullableMap { tolong = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            //update all
+            item.tolong = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(true, find.tolong);
+
+            item.tolong = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            item.tolong = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tolong, find.tolong);
+            Assert.Equal(false, find.tolong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolong, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void LongNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(true, find.tolongnullable);
+
+            item = new BoolNullableMap { tolongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(false, find.tolongnullable);
+
+            item = new BoolNullableMap { tolongnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Null(find.tolongnullable);
+
+            //update all
+            item.tolongnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(true, find.tolongnullable);
+
+            item.tolongnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Equal(false, find.tolongnullable);
+
+            item.tolongnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.Null(find.tolongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tolongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tolongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Byte()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(true, find.tobyte);
+
+            item = new BoolNullableMap { tobyte = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            item = new BoolNullableMap { tobyte = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            //update all
+            item.tobyte = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(true, find.tobyte);
+
+            item.tobyte = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            item.tobyte = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.tobyte, find.tobyte);
+            Assert.Equal(false, find.tobyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobyte, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ByteNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(true, find.tobytenullable);
+
+            item = new BoolNullableMap { tobytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(false, find.tobytenullable);
+
+            item = new BoolNullableMap { tobytenullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Null(find.tobytenullable);
+
+            //update all
+            item.tobytenullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(true, find.tobytenullable);
+
+            item.tobytenullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Equal(false, find.tobytenullable);
+
+            item.tobytenullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.Null(find.tobytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tobytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tobytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShort()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(true, find.toushort);
+
+            item = new BoolNullableMap { toushort = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            item = new BoolNullableMap { toushort = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            //update all
+            item.toushort = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(true, find.toushort);
+
+            item.toushort = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            item.toushort = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toushort, find.toushort);
+            Assert.Equal(false, find.toushort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushort, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShortNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(true, find.toushortnullable);
+
+            item = new BoolNullableMap { toushortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(false, find.toushortnullable);
+
+            item = new BoolNullableMap { toushortnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Null(find.toushortnullable);
+
+            //update all
+            item.toushortnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(true, find.toushortnullable);
+
+            item.toushortnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Equal(false, find.toushortnullable);
+
+            item.toushortnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.Null(find.toushortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toushortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toushortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UInt()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(true, find.touint);
+
+            item = new BoolNullableMap { touint = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            item = new BoolNullableMap { touint = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            //update all
+            item.touint = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(true, find.touint);
+
+            item.touint = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            item.touint = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.touint, find.touint);
+            Assert.Equal(false, find.touint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.touint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touint);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touint, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UIntNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(true, find.touintnullable);
+
+            item = new BoolNullableMap { touintnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(false, find.touintnullable);
+
+            item = new BoolNullableMap { touintnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Null(find.touintnullable);
+
+            //update all
+            item.touintnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(true, find.touintnullable);
+
+            item.touintnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Equal(false, find.touintnullable);
+
+            item.touintnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.Null(find.touintnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.touintnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.touintnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULong()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(true, find.toulong);
+
+            item = new BoolNullableMap { toulong = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            item = new BoolNullableMap { toulong = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            //update all
+            item.toulong = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(true, find.toulong);
+
+            item.toulong = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            item.toulong = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.NotEqual(item.toulong, find.toulong);
+            Assert.Equal(false, find.toulong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulong, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == null).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULongNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(true, find.toulongnullable);
+
+            item = new BoolNullableMap { toulongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(false, find.toulongnullable);
+
+            item = new BoolNullableMap { toulongnullable = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Null(find.toulongnullable);
+
+            //update all
+            item.toulongnullable = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(true, find.toulongnullable);
+
+            item.toulongnullable = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Equal(false, find.toulongnullable);
+
+            item.toulongnullable = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.Null(find.toulongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.toulongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == null).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.toulongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void TimeSpan()
+        {
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+        }
+        [Fact]
+        public void DateTime()
+        {
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+        }
+
+        [Fact]
+        public void ByteArray()
+        {
+        }
+        [Fact]
+        public void String()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolNullableMap { };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(true, find.tostring);
+
+            item = new BoolNullableMap { tostring = false };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(false, find.tostring);
+
+            item = new BoolNullableMap { tostring = null };
+            Assert.Equal(1, orm.Insert<BoolNullableMap>().AppendData(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Null(find.tostring);
+
+            //update all
+            item.tostring = true;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(true, find.tostring);
+
+            item.tostring = false;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Equal(false, find.tostring);
+
+            item.tostring = null;
+            Assert.Equal(1, orm.Update<BoolNullableMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.Null(find.tostring);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, true).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(true, find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, false).ExecuteAffrows());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(false, find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolNullableMap>().Where(a => a.id == item.id).Set(a => a.tostring, null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).First());
+            find = orm.Select<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.tostring);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == true).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == false).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolNullableMap>().Where(a => a.id == item.id && a.tostring == null).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolNullableMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid()
+        {
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolTest.cs
new file mode 100644
index 00000000..367910bd
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/BoolTest.cs
@@ -0,0 +1,1105 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteMapType
+{
+    public class BoolTest
+    {
+
+        class BoolMap
+        {
+            public Guid id { get; set; }
+            [Column(MapType = typeof(bool?))]
+            public bool toboolnullable { get; set; } = true;
+
+            [Column(MapType = typeof(sbyte))]
+            public bool tosbyte { get; set; } = true;
+            [Column(MapType = typeof(sbyte?))]
+            public bool tosbytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(short))]
+            public bool toshort { get; set; } = true;
+
+            [Column(MapType = typeof(short?))]
+            public bool toshortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(int))]
+            public bool toint { get; set; } = true;
+
+            [Column(MapType = typeof(int?))]
+            public bool tointnullable { get; set; } = true;
+
+            [Column(MapType = typeof(long))]
+            public bool tolong { get; set; } = true;
+            [Column(MapType = typeof(long?))]
+            public bool tolongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(byte))]
+            public bool tobyte { get; set; } = true;
+            [Column(MapType = typeof(byte?))]
+            public bool tobytenullable { get; set; } = true;
+
+            [Column(MapType = typeof(ushort))]
+            public bool toushort { get; set; } = true;
+
+            [Column(MapType = typeof(ushort?))]
+            public bool toushortnullable { get; set; } = true;
+
+            [Column(MapType = typeof(uint))]
+            public bool touint { get; set; } = true;
+
+            [Column(MapType = typeof(uint?))]
+            public bool touintnullable { get; set; } = true;
+
+            [Column(MapType = typeof(ulong))]
+            public bool toulong { get; set; } = true;
+            [Column(MapType = typeof(ulong?))]
+            public bool toulongnullable { get; set; } = true;
+
+            [Column(MapType = typeof(string))]
+            public bool tostring { get; set; } = true;
+        }
+
+        [Fact]
+        public void BoolNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.True(find.toboolnullable);
+
+            item = new BoolMap { toboolnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.False(find.toboolnullable);
+
+            //update all
+            item.toboolnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.True(find.toboolnullable);
+
+            item.toboolnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toboolnullable, find.toboolnullable);
+            Assert.False(find.toboolnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toboolnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toboolnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toboolnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toboolnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toboolnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByte()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.True(find.tosbyte);
+
+            item = new BoolMap { tosbyte = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.False(find.tosbyte);
+
+            //update all
+            item.tosbyte = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.True(find.tosbyte);
+
+            item.tosbyte = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbyte, find.tosbyte);
+            Assert.False(find.tosbyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tosbyte);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbyte, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tosbyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbyte == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void SByteNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.True(find.tosbytenullable);
+
+            item = new BoolMap { tosbytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.False(find.tosbytenullable);
+
+            //update all
+            item.tosbytenullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.True(find.tosbytenullable);
+
+            item.tosbytenullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tosbytenullable, find.tosbytenullable);
+            Assert.False(find.tosbytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tosbytenullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tosbytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tosbytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tosbytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Short()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.True(find.toshort);
+
+            item = new BoolMap { toshort = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.False(find.toshort);
+
+            //update all
+            item.toshort = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.True(find.toshort);
+
+            item.toshort = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshort, find.toshort);
+            Assert.False(find.toshort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshort, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toshort);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshort, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toshort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshort == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ShortNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.True(find.toshortnullable);
+
+            item = new BoolMap { toshortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.False(find.toshortnullable);
+
+            //update all
+            item.toshortnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.True(find.toshortnullable);
+
+            item.toshortnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toshortnullable, find.toshortnullable);
+            Assert.False(find.toshortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toshortnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toshortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toshortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toshortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Int()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.True(find.toint);
+
+            item = new BoolMap { toint = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.False(find.toint);
+
+            //update all
+            item.toint = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.True(find.toint);
+
+            item.toint = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toint, find.toint);
+            Assert.False(find.toint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toint, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toint);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toint, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toint == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void IntNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.True(find.tointnullable);
+
+            item = new BoolMap { tointnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.False(find.tointnullable);
+
+            //update all
+            item.tointnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.True(find.tointnullable);
+
+            item.tointnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tointnullable, find.tointnullable);
+            Assert.False(find.tointnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tointnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tointnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tointnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tointnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tointnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void Long()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.True(find.tolong);
+
+            item = new BoolMap { tolong = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.False(find.tolong);
+
+            //update all
+            item.tolong = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.True(find.tolong);
+
+            item.tolong = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolong, find.tolong);
+            Assert.False(find.tolong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolong, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tolong);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolong, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tolong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolong == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void LongNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.True(find.tolongnullable);
+
+            item = new BoolMap { tolongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.False(find.tolongnullable);
+
+            //update all
+            item.tolongnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.True(find.tolongnullable);
+
+            item.tolongnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tolongnullable, find.tolongnullable);
+            Assert.False(find.tolongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tolongnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tolongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tolongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tolongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Byte()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.True(find.tobyte);
+
+            item = new BoolMap { tobyte = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.False(find.tobyte);
+
+            //update all
+            item.tobyte = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.True(find.tobyte);
+
+            item.tobyte = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobyte, find.tobyte);
+            Assert.False(find.tobyte);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobyte, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tobyte);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobyte, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tobyte);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobyte == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobyte == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ByteNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.True(find.tobytenullable);
+
+            item = new BoolMap { tobytenullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.False(find.tobytenullable);
+
+            //update all
+            item.tobytenullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.True(find.tobytenullable);
+
+            item.tobytenullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tobytenullable, find.tobytenullable);
+            Assert.False(find.tobytenullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tobytenullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tobytenullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tobytenullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tobytenullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShort()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.True(find.toushort);
+
+            item = new BoolMap { toushort = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.False(find.toushort);
+
+            //update all
+            item.toushort = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.True(find.toushort);
+
+            item.toushort = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushort, find.toushort);
+            Assert.False(find.toushort);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushort, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toushort);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushort, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushort == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toushort);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushort == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushort == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UShortNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.True(find.toushortnullable);
+
+            item = new BoolMap { toushortnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.False(find.toushortnullable);
+
+            //update all
+            item.toushortnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.True(find.toushortnullable);
+
+            item.toushortnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toushortnullable, find.toushortnullable);
+            Assert.False(find.toushortnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toushortnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toushortnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toushortnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toushortnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UInt()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.True(find.touint);
+
+            item = new BoolMap { touint = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.False(find.touint);
+
+            //update all
+            item.touint = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.True(find.touint);
+
+            item.touint = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touint, find.touint);
+            Assert.False(find.touint);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touint, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.touint);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touint, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touint == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.touint);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touint == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touint == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void UIntNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.True(find.touintnullable);
+
+            item = new BoolMap { touintnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.False(find.touintnullable);
+
+            //update all
+            item.touintnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.True(find.touintnullable);
+
+            item.touintnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.touintnullable, find.touintnullable);
+            Assert.False(find.touintnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.touintnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.touintnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.touintnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touintnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.touintnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULong()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.True(find.toulong);
+
+            item = new BoolMap { toulong = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.False(find.toulong);
+
+            //update all
+            item.toulong = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.True(find.toulong);
+
+            item.toulong = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulong, find.toulong);
+            Assert.False(find.toulong);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulong, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toulong);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulong, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulong == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toulong);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulong == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulong == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void ULongNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.True(find.toulongnullable);
+
+            item = new BoolMap { toulongnullable = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.False(find.toulongnullable);
+
+            //update all
+            item.toulongnullable = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.True(find.toulongnullable);
+
+            item.toulongnullable = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.toulongnullable, find.toulongnullable);
+            Assert.False(find.toulongnullable);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.toulongnullable);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.toulongnullable, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.toulongnullable);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.toulongnullable == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void TimeSpan()
+        {
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+        }
+        [Fact]
+        public void DateTime()
+        {
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+        }
+
+        [Fact]
+        public void ByteArray()
+        {
+        }
+        [Fact]
+        public void String()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new BoolMap { };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.True(find.tostring);
+
+            item = new BoolMap { tostring = false };
+            Assert.Equal(1, orm.Insert<BoolMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.False(find.tostring);
+
+            //update all
+            item.tostring = true;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.True(find.tostring);
+
+            item.tostring = false;
+            Assert.Equal(1, orm.Update<BoolMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.tostring, find.tostring);
+            Assert.False(find.tostring);
+
+            //update set
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tostring, true).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == true).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.True(find.tostring);
+
+            Assert.Equal(1, orm.Update<BoolMap>().Where(a => a.id == item.id).Set(a => a.tostring, false).ExecuteAffrows());
+            find = orm.Select<BoolMap>().Where(a => a.id == item.id && a.tostring == false).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.False(find.tostring);
+
+            //delete
+            Assert.Equal(0, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tostring == true).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<BoolMap>().Where(a => a.id == item.id && a.tostring == false).ExecuteAffrows());
+            Assert.Null(orm.Select<BoolMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid()
+        {
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/DateTimeOffSetTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/DateTimeOffSetTest.cs
new file mode 100644
index 00000000..d3b466dc
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/DateTimeOffSetTest.cs
@@ -0,0 +1,54 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteMapType
+{
+    public class DateTimeOffSetTest
+    {
+        class DateTimeOffSetTestMap
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(DateTime))]
+            public DateTimeOffset dtos_to_dt { get; set; }
+            [Column(MapType = typeof(DateTime))]
+            public DateTimeOffset? dtosnullable_to_dt { get; set; }
+        }
+        [Fact]
+        public void DateTimeToDateTimeOffSet()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new DateTimeOffSetTestMap { dtos_to_dt = DateTimeOffset.Now, dtosnullable_to_dt = DateTimeOffset.Now };
+            Assert.Equal(1, orm.Insert<DateTimeOffSetTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<DateTimeOffSetTestMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtosnullable_to_dt.Value.ToString("g"), find.dtosnullable_to_dt.Value.ToString("g"));
+
+            //update all
+            item.dtos_to_dt = DateTimeOffset.Now;
+            Assert.Equal(1, orm.Update<DateTimeOffSetTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<DateTimeOffSetTestMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtosnullable_to_dt.Value.ToString("g"), find.dtosnullable_to_dt.Value.ToString("g"));
+
+            //update set
+            Assert.Equal(1, orm.Update<DateTimeOffSetTestMap>().Where(a => a.id == item.id).Set(a => a.dtos_to_dt, item.dtos_to_dt = DateTimeOffset.Now).ExecuteAffrows());
+            find = orm.Select<DateTimeOffSetTestMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.dtos_to_dt.ToString("g"), find.dtos_to_dt.ToString("g"));
+            Assert.Equal(item.dtosnullable_to_dt.Value.ToString("g"), find.dtosnullable_to_dt.Value.ToString("g"));
+
+            //delete
+            Assert.Equal(1, orm.Delete<DateTimeOffSetTestMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<DateTimeOffSetTestMap>().Where(a => a.id == item.id).First());
+        }
+        
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/EnumTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/EnumTest.cs
new file mode 100644
index 00000000..1797019c
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/EnumTest.cs
@@ -0,0 +1,261 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteMapType
+{
+    public class EnumTest
+    {
+        class EnumTestMap
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum enum_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum? enumnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(int))]
+            public ToStringMapEnum enum_to_int { get; set; }
+            [Column(MapType = typeof(int?))]
+            public ToStringMapEnum? enumnullable_to_int { get; set; }
+        }
+        public enum ToStringMapEnum { ���, abc, ��� }
+        [Fact]
+        public void EnumToString()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item = new EnumTestMap { enum_to_string = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //update all
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullableToString()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            item = new EnumTestMap { enumnullable_to_string = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            //update all
+            item.enumnullable_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            item.enumnullable_to_string = null;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void EnumToInt()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            item = new EnumTestMap { enum_to_int = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_int);
+
+            //update all
+            item.enum_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            item.enum_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_int, find.enum_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_int, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_int);
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enum_to_int, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_int);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enum_to_int == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullableToInt()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new EnumTestMap { };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Null(find.enumnullable_to_int);
+
+            item = new EnumTestMap { enumnullable_to_int = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<EnumTestMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_int);
+
+            //update all
+            item.enumnullable_to_int = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_int);
+
+            item.enumnullable_to_int = null;
+            Assert.Equal(1, orm.Update<EnumTestMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_int, find.enumnullable_to_int);
+            Assert.Null(find.enumnullable_to_int);
+
+            //update set
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_int, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_int);
+
+
+            Assert.Equal(1, orm.Update<EnumTestMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_int, null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.abc).First());
+            find = orm.Select<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_int);
+
+            //delete
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<EnumTestMap>().Where(a => a.id == item.id && a.enumnullable_to_int == null).ExecuteAffrows());
+            Assert.Null(orm.Select<EnumTestMap>().Where(a => a.id == item.id).First());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/ToStringTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/ToStringTest.cs
new file mode 100644
index 00000000..c71a4753
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/MapType/ToStringTest.cs
@@ -0,0 +1,570 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Numerics;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteMapType
+{
+    public class ToStringTest
+    {
+        class ToStringMap
+        {
+            public Guid id { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public TimeSpan timespan_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public TimeSpan? timespannullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public DateTime datetime_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public DateTime? datetimenullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public Guid guid_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public Guid? guidnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum enum_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public ToStringMapEnum? enumnullable_to_string { get; set; }
+
+            [Column(MapType = typeof(string))]
+            public BigInteger biginteger_to_string { get; set; }
+            [Column(MapType = typeof(string))]
+            public BigInteger? bigintegernullable_to_string { get; set; }
+        }
+        public enum ToStringMapEnum { ���, abc, ��� }
+        [Fact]
+        public void Enum1()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item = new ToStringMap { enum_to_string = ToStringMapEnum.abc };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //update all
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            item.enum_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enum_to_string, find.enum_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.���).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.���, find.enum_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enum_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enum_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enum_to_string == ToStringMapEnum.abc).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void EnumNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            item = new ToStringMap { enumnullable_to_string = ToStringMapEnum.��� };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            //update all
+            item.enumnullable_to_string = ToStringMapEnum.���;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Equal(ToStringMapEnum.���, find.enumnullable_to_string);
+
+            item.enumnullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.enumnullable_to_string, find.enumnullable_to_string);
+            Assert.Null(find.enumnullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, ToStringMapEnum.abc).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(ToStringMapEnum.abc, find.enumnullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.enumnullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.abc).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.enumnullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == ToStringMapEnum.���).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.enumnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void BigInteger1()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 0).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(0, find.biginteger_to_string);
+
+            item = new ToStringMap { biginteger_to_string = 100 };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 100).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(100, find.biginteger_to_string);
+
+            //update all
+            item.biginteger_to_string = 200;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 200).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(200, find.biginteger_to_string);
+
+            item.biginteger_to_string = 205;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 205).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.biginteger_to_string, find.biginteger_to_string);
+            Assert.Equal(205, find.biginteger_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.biginteger_to_string, 522).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 522).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(522, find.biginteger_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.biginteger_to_string, 10005).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 10005).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(10005, find.biginteger_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 522).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 205).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.biginteger_to_string == 10005).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void BigIntegerNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            item = new ToStringMap { bigintegernullable_to_string = 101 };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 101).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Equal(101, find.bigintegernullable_to_string);
+
+            //update all
+            item.bigintegernullable_to_string = 2004;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Equal(2004, find.bigintegernullable_to_string);
+
+            item.bigintegernullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.bigintegernullable_to_string, find.bigintegernullable_to_string);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.bigintegernullable_to_string, 998).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(998, find.bigintegernullable_to_string);
+
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.bigintegernullable_to_string, null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).First());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.bigintegernullable_to_string);
+
+            //delete
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 998).ExecuteAffrows());
+            Assert.Equal(0, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == 2004).ExecuteAffrows());
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.bigintegernullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void TimeSpan1()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.Zero, find.timespan_to_string);
+
+            item = new ToStringMap { timespan_to_string = TimeSpan.FromDays(1) };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.FromDays(1), find.timespan_to_string);
+
+            //update all
+            item.timespan_to_string = TimeSpan.FromHours(10);
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespan_to_string, find.timespan_to_string);
+            Assert.Equal(TimeSpan.FromHours(10), find.timespan_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespan_to_string, TimeSpan.FromHours(11)).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(TimeSpan.FromHours(11), find.timespan_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void TimeSpanNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Null(find.timespannullable_to_string);
+
+            item = new ToStringMap { timespannullable_to_string = TimeSpan.FromDays(1) };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Equal(TimeSpan.FromDays(1), find.timespannullable_to_string);
+
+            //update all
+            item.timespannullable_to_string = TimeSpan.FromHours(10);
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Equal(TimeSpan.FromHours(10), find.timespannullable_to_string);
+
+            item.timespannullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.timespannullable_to_string, find.timespannullable_to_string);
+            Assert.Null(find.timespannullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespannullable_to_string, TimeSpan.FromHours(11)).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(TimeSpan.FromHours(11), find.timespannullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.timespannullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.timespannullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void DateTime1()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.MinValue, find.datetime_to_string);
+
+            item = new ToStringMap { datetime_to_string = DateTime.Parse("2000-1-1") };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-1"), find.datetime_to_string);
+
+            //update all
+            item.datetime_to_string = DateTime.Parse("2000-1-11");
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetime_to_string, find.datetime_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-11"), find.datetime_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetime_to_string, DateTime.Parse("2000-1-12")).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(DateTime.Parse("2000-1-12"), find.datetime_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void DateTimeNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Null(find.datetimenullable_to_string);
+
+            item = new ToStringMap { datetimenullable_to_string = DateTime.Parse("2000-1-1") };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-1"), find.datetimenullable_to_string);
+
+            //update all
+            item.datetimenullable_to_string = DateTime.Parse("2000-1-11");
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Equal(DateTime.Parse("2000-1-11"), find.datetimenullable_to_string);
+
+            item.datetimenullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.datetimenullable_to_string, find.datetimenullable_to_string);
+            Assert.Null(find.datetimenullable_to_string);
+
+            //update set
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetimenullable_to_string, DateTime.Parse("2000-1-12")).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(DateTime.Parse("2000-1-12"), find.datetimenullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.datetimenullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.datetimenullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+
+        [Fact]
+        public void Guid1()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == Guid.Empty).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(Guid.Empty, find.guid_to_string);
+
+            var newid = Guid.NewGuid();
+            item = new ToStringMap { guid_to_string = newid };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //update all
+            newid = Guid.NewGuid();
+            item.guid_to_string = newid;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guid_to_string, find.guid_to_string);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //update set
+            newid = Guid.NewGuid();
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guid_to_string, newid).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(newid, find.guid_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.guid_to_string == newid).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+        [Fact]
+        public void GuidNullable()
+        {
+            //insert
+            var orm = g.sqlite;
+            var item = new ToStringMap { };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            var find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Null(find.guidnullable_to_string);
+
+            var newid = Guid.NewGuid();
+            item = new ToStringMap { guidnullable_to_string = newid };
+            Assert.Equal(1, orm.Insert<ToStringMap>().AppendData(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            //update all
+            newid = Guid.NewGuid();
+            item.guidnullable_to_string = newid;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            item.guidnullable_to_string = null;
+            Assert.Equal(1, orm.Update<ToStringMap>().SetSource(item).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(item.guidnullable_to_string, find.guidnullable_to_string);
+            Assert.Null(find.guidnullable_to_string);
+
+            //update set
+            newid = Guid.NewGuid();
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guidnullable_to_string, newid).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == newid).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal(newid, find.guidnullable_to_string);
+
+            Assert.Equal(1, orm.Update<ToStringMap>().Where(a => a.id == item.id).Set(a => a.guidnullable_to_string, null).ExecuteAffrows());
+            find = orm.Select<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Null(find.guidnullable_to_string);
+
+            //delete
+            Assert.Equal(1, orm.Delete<ToStringMap>().Where(a => a.id == item.id && a.guidnullable_to_string == null).ExecuteAffrows());
+            Assert.Null(orm.Select<ToStringMap>().Where(a => a.id == item.id).First());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAdo/SqliteAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAdo/SqliteAdoTest.cs
new file mode 100644
index 00000000..9063e5d3
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAdo/SqliteAdoTest.cs
@@ -0,0 +1,90 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteAdoTest
+    {
+        [Fact]
+        public void Pool()
+        {
+            var t1 = g.sqlite.Ado.MasterPool.StatisticsFullily;
+        }
+
+        [Fact]
+        public void SlavePools()
+        {
+            var t2 = g.sqlite.Ado.SlavePools.Count;
+        }
+
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.sqlite.Ado.ExecuteConnectTest());
+        }
+        [Fact]
+        public void ExecuteReader()
+        {
+
+        }
+        [Fact]
+        public void ExecuteArray()
+        {
+
+        }
+        [Fact]
+        public void ExecuteNonQuery()
+        {
+
+        }
+        [Fact]
+        public void ExecuteScalar()
+        {
+
+        }
+
+        [Fact]
+        public void Query()
+        {
+            g.sqlite.CodeFirst.SyncStructure<Song>();
+            var t0 = g.sqlite.Ado.Query<testallDto>("select * from \"song\"");
+
+            var t1 = g.sqlite.Ado.Query<testallDto>("select id, url, create_time from \"song\"");
+
+            var t2 = g.sqlite.Ado.Query<testallDto>("select id, url, create_time test_time from \"song\"");
+
+            var t3 = g.sqlite.Ado.Query<xxx>("select * from \"song\"");
+
+            var t4 = g.sqlite.Ado.Query<(int, string, string)>("select * from \"song\"");
+
+            var t5 = g.sqlite.Ado.Query<dynamic>("select * from \"song\"");
+
+            var t6 = g.sqlite.Ado.Query<xxx>("select * from song where id in @ids", new { ids = new[] { 1, 2, 3 } });
+        }
+
+        [Fact]
+        public void QueryMultipline()
+        {
+            g.sqlite.CodeFirst.SyncStructure<Song>();
+            var t3 = g.sqlite.Ado.Query<xxx, (int, string, string), dynamic>("select * from song; select * from song; select * from song");
+        }
+
+        class xxx
+        {
+            public int Id { get; set; }
+            public string Path { get; set; }
+            public string Title2 { get; set; }
+        }
+
+        class testallDto
+        {
+            public int Id { get; set; }
+            public string Title { get; set; }
+            public string Url { get; set; }
+            public DateTime Test_time { get; set; }
+            public DateTime Create_time { get; set; }
+            public bool Is_deleted { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAopTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAopTest.cs
new file mode 100644
index 00000000..dd5e9517
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteAopTest.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var date = DateTime.Now.Date;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now.Date;
+             };
+            g.sqlite.Aop.AuditValue += audit;
+
+            g.sqlite.Insert(item).ExecuteAffrows();
+
+            g.sqlite.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime, date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteCodeFirstTest.cs
new file mode 100644
index 00000000..774629de
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteCodeFirstTest.cs
@@ -0,0 +1,420 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteCodeFirstTest
+    {
+        [Fact]
+        public void InsertUpdateParameter()
+        {
+            var fsql = g.sqlite;
+            fsql.CodeFirst.SyncStructure<ts_iupstr_bak>();
+            var item = new ts_iupstr { id = Guid.NewGuid(), title = string.Join(",", Enumerable.Range(0, 2000).Select(a => "�������")) };
+            Assert.Equal(1, fsql.Insert(item).ExecuteAffrows());
+            var find = fsql.Select<ts_iupstr>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(find.id, item.id);
+            Assert.Equal(find.title, item.title);
+        }
+        [Table(Name = "ts_iupstr_bak", DisableSyncStructure = true)]
+        class ts_iupstr
+        {
+            public Guid id { get; set; }
+            public string title { get; set; }
+        }
+        class ts_iupstr_bak
+        {
+            public Guid id { get; set; }
+            [Column(StringLength = -1)]
+            public string title { get; set; }
+        }
+
+        [Fact]
+        public void Blob()
+        {
+            var str1 = string.Join(",", Enumerable.Range(0, 10000).Select(a => "�������"));
+            var data1 = Encoding.UTF8.GetBytes(str1);
+
+            var item1 = new TS_BLB01 { Data = data1 };
+            Assert.Equal(1, g.sqlite.Insert(item1).ExecuteAffrows());
+
+            var item2 = g.sqlite.Select<TS_BLB01>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(item1.Data.Length, item2.Data.Length);
+
+            var str2 = Encoding.UTF8.GetString(item2.Data);
+            Assert.Equal(str1, str2);
+
+            //NoneParameter
+            item1 = new TS_BLB01 { Data = data1 };
+            Assert.Equal(1, g.sqlite.Insert<TS_BLB01>().NoneParameter().AppendData(item1).ExecuteAffrows());
+
+            item2 = g.sqlite.Select<TS_BLB01>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(item1.Data.Length, item2.Data.Length);
+
+            str2 = Encoding.UTF8.GetString(item2.Data);
+            Assert.Equal(str1, str2);
+
+            Assert.Equal(1, g.sqlite.InsertOrUpdate<TS_BLB01>().SetSource(new TS_BLB01 { Data = data1 }).ExecuteAffrows());
+            item2 = g.sqlite.Select<TS_BLB01>().Where(a => a.Id == item1.Id).First();
+            Assert.Equal(item1.Data.Length, item2.Data.Length);
+
+            str2 = Encoding.UTF8.GetString(item2.Data);
+            Assert.Equal(str1, str2);
+        }
+        class TS_BLB01
+        {
+            public Guid Id { get; set; }
+            [MaxLength(-1)]
+            public byte[] Data { get; set; }
+        }
+
+        [Fact]
+        public void StringLength()
+        {
+            var dll = g.sqlite.CodeFirst.GetComparisonDDLStatements<TS_SLTB>();
+            g.sqlite.CodeFirst.SyncStructure<TS_SLTB>();
+        }
+        class TS_SLTB
+        {
+            public Guid Id { get; set; }
+            [Column(StringLength = 50)]
+            public string Title { get; set; }
+
+            [Column(IsNullable = false, StringLength = 50)]
+            public string TitleSub { get; set; }
+        }
+
+        [Fact]
+        public void �������е�()
+        {
+            var item = new tbdot01 { name = "insert" };
+            g.sqlite.Insert(item).ExecuteAffrows();
+
+            var find = g.sqlite.Select<tbdot01>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal("insert", find.name);
+
+            Assert.Equal(1, g.sqlite.Update<tbdot01>().Set(a => a.name == "update").Where(a => a.id == item.id).ExecuteAffrows());
+            find = g.sqlite.Select<tbdot01>().Where(a => a.id == item.id).First();
+            Assert.NotNull(find);
+            Assert.Equal(item.id, find.id);
+            Assert.Equal("update", find.name);
+
+            Assert.Equal(1, g.sqlite.Delete<tbdot01>().Where(a => a.id == item.id).ExecuteAffrows());
+            find = g.sqlite.Select<tbdot01>().Where(a => a.id == item.id).First();
+            Assert.Null(find);
+        }
+        [Table(Name = "\"sys.tbdot01\"")]
+        class tbdot01
+        {
+            public Guid id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void ���ı�_�ֶ�()
+        {
+            var sql = g.sqlite.CodeFirst.GetComparisonDDLStatements<�������ı�>();
+            g.sqlite.CodeFirst.SyncStructure<�������ı�>();
+
+            var item = new �������ı�
+            {
+                ���� = "���Ա���",
+                ����ʱ�� = DateTime.Now
+            };
+            Assert.Equal(1, g.sqlite.Insert<�������ı�>().AppendData(item).ExecuteAffrows());
+            Assert.NotEqual(Guid.Empty, item.���);
+            var item2 = g.sqlite.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.sqlite.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.sqlite.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.sqlite.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlite.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlite.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+        }
+        class �������ı�
+        {
+            [Column(IsPrimary = true)]
+            public Guid ��� { get; set; }
+
+            public string ���� { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+            public DateTime ����ʱ�� { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime ����ʱ�� { get; set; }
+        }
+
+        [Fact]
+        public void AddUniques()
+        {
+            var sql = g.sqlite.CodeFirst.GetComparisonDDLStatements<AddUniquesInfo>();
+            g.sqlite.CodeFirst.SyncStructure<AddUniquesInfo>();
+            g.sqlite.CodeFirst.SyncStructure(typeof(AddUniquesInfo), "AddUniquesInfo1");
+        }
+        [Table(Name = "AddUniquesInfo2", OldName = "AddUniquesInfo")]
+        [Index("{tablename}_uk_phone", "phone", true)]
+        [Index("{tablename}_uk_group_index", "group,index", true)]
+        [Index("{tablename}_uk_group_index22", "group desc, index22", true)]
+        class AddUniquesInfo
+        {
+            public Guid id { get; set; }
+            public string phone { get; set; }
+
+            public string group { get; set; }
+            public int index { get; set; }
+            public string index22 { get; set; }
+        }
+
+        public class Topic
+        {
+            public Guid Id { get; set; }
+            public string Title { get; set; }
+            public string Content { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Table(Name = "Comment")]
+        public class Comment
+        {
+            public Guid Id { get; set; }
+            public Guid TopicId { get; set; }
+            public virtual Topic Topic { get; set; }
+            public string Nickname { get; set; }
+            public string Content { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+
+
+        [Fact]
+        public void AddField()
+        {
+
+            //��һ�� FreeSql.Repository ��չ����dotnet add package FreeSql.Repository
+            var topicRepository = g.sqlite.GetGuidRepository<Topic>();
+            var commentRepository = g.sqlite.GetGuidRepository<Comment>();
+
+            //���Ӳ�������
+            var topic = topicRepository.Insert(new Topic
+            {
+                Title = "���±���1",
+                Content = "��������1",
+                CreateTime = DateTime.Now
+            });
+
+            //����10����������
+            var comments = Enumerable.Range(0, 10).Select(a => new Comment
+            {
+                TopicId = topic.Id,
+                Nickname = $"�dz�{a}",
+                Content = $"��������{a}",
+                CreateTime = DateTime.Now
+            }).ToArray();
+            var affrows = commentRepository.Insert(comments);
+
+            var find = commentRepository.Select.Where(a => a.Topic.Title == "���±���1").ToList();
+
+
+
+
+            var sql = g.sqlite.CodeFirst.GetComparisonDDLStatements<TopicAddField>();
+
+            var id = g.sqlite.Insert<TopicAddField>().AppendData(new TopicAddField { }).ExecuteIdentity();
+
+            //var inserted = g.Sqlite.Insert<TopicAddField>().AppendData(new TopicAddField { }).ExecuteInserted();
+        }
+
+        [Table(Name = "TopicAddField", OldName = "TopicAddField")]
+        public class TopicAddField
+        {
+            [Column(IsIdentity = true)]
+            public int Id { get; set; }
+
+            public string name { get; set; }
+
+            [Column(DbType = "varchar(200) not null", OldName = "title2")]
+            public string title3223 { get; set; } = "10";
+
+            [Column(IsIgnore = true)]
+            public DateTime ct { get; set; } = DateTime.Now;
+        }
+
+        [Fact]
+        public void GetComparisonDDLStatements()
+        {
+
+            var sql = g.sqlite.CodeFirst.GetComparisonDDLStatements<TableAllType>();
+            Assert.True(string.IsNullOrEmpty(sql)); //�����������κ�
+            //sql = g.Sqlite.CodeFirst.GetComparisonDDLStatements<Tb_alltype>();
+        }
+
+        IInsert<TableAllType> insert => g.sqlite.Insert<TableAllType>();
+        ISelect<TableAllType> select => g.sqlite.Select<TableAllType>();
+
+        [Fact]
+        public void CurdAllField()
+        {
+            var item = new TableAllType { };
+            item.Id = (int)insert.AppendData(item).ExecuteIdentity();
+
+            var newitem = select.Where(a => a.Id == item.Id).ToOne();
+
+            var item2 = new TableAllType
+            {
+                Bool = true,
+                BoolNullable = true,
+                Byte = 255,
+                ByteNullable = 127,
+                Bytes = Encoding.UTF8.GetBytes("�������"),
+                DateTime = DateTime.Now,
+                DateTimeNullable = DateTime.Now.AddHours(-1),
+                Decimal = 99.99M,
+                DecimalNullable = 99.98M,
+                Double = 999.99,
+                DoubleNullable = 999.98,
+                Enum1 = TableAllTypeEnumType1.e5,
+                Enum1Nullable = TableAllTypeEnumType1.e3,
+                Enum2 = TableAllTypeEnumType2.f2,
+                Enum2Nullable = TableAllTypeEnumType2.f3,
+                Float = 19.99F,
+                FloatNullable = 19.98F,
+                Guid = Guid.NewGuid(),
+                GuidNullable = Guid.NewGuid(),
+                Int = int.MaxValue,
+                IntNullable = int.MinValue,
+                SByte = 100,
+                SByteNullable = 99,
+                Short = short.MaxValue,
+                ShortNullable = short.MinValue,
+                String = "�������string'\\?!@#$%^&*()_+{}}{~?><<>",
+                Char = 'X',
+                TimeSpan = TimeSpan.FromSeconds(999),
+                TimeSpanNullable = TimeSpan.FromSeconds(60),
+                //UInt = uint.MaxValue,
+                //UIntNullable = uint.MinValue,
+                //ULong = ulong.MaxValue - 10000000,
+                //ULongNullable = ulong.MinValue,
+                //UShort = ushort.MaxValue,
+                //UShortNullable = ushort.MinValue,
+                //testFielLongNullable = long.MinValue
+            };
+            item2.Id = (int)insert.AppendData(item2).ExecuteIdentity();
+            var newitem2 = select.Where(a => a.Id == item2.Id).ToOne();
+            Assert.Equal(item2.String, newitem2.String);
+            Assert.Equal(item2.Char, newitem2.Char);
+
+            item2.Id = (int)insert.NoneParameter().AppendData(item2).ExecuteIdentity();
+            newitem2 = select.Where(a => a.Id == item2.Id).ToOne();
+            Assert.Equal(item2.String, newitem2.String);
+            Assert.Equal(item2.Char, newitem2.Char);
+
+            var items = select.ToList();
+            var itemstb = select.ToDataTable();
+        }
+
+        [Fact]
+        public void UpdateSetFlag()
+        {
+            var sql1 = g.sqlite.Update<TableAllType>()
+                .Set(a => a.Enum2 | TableAllTypeEnumType2.f2)
+                .Where(a => a.Id == 10)
+                .ToSql();
+            Assert.Equal(@"UPDATE ""tb_alltype"" SET ""Enum2"" = (""Enum2"" | 1), ""DateTime"" = datetime(current_timestamp,'localtime'), ""DateTimeOffSet"" = datetime(current_timestamp,'localtime'), ""DateTimeNullable"" = datetime(current_timestamp,'localtime'), ""DateTimeOffSetNullable"" = datetime(current_timestamp,'localtime') 
+WHERE (""Id"" = 10)", sql1);
+        }
+
+        [Table(Name = "tb_alltype")]
+        class TableAllType
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+
+            //public string id2 { get; set; } = "id2=10";
+
+            public bool Bool { get; set; }
+            public sbyte SByte { get; set; }
+            public short Short { get; set; }
+            public int Int { get; set; }
+            public long Long { get; set; }
+            public byte Byte { get; set; }
+            public ushort UShort { get; set; }
+            public uint UInt { get; set; }
+            public ulong ULong { get; set; }
+            public double Double { get; set; }
+            public float Float { get; set; }
+            public decimal Decimal { get; set; }
+            public TimeSpan TimeSpan { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime DateTime { get; set; }
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime DateTimeOffSet { get; set; }
+
+            public byte[] Bytes { get; set; }
+            public string String { get; set; }
+            public char Char { get; set; }
+            public Guid Guid { get; set; }
+
+            public bool? BoolNullable { get; set; }
+            public sbyte? SByteNullable { get; set; }
+            public short? ShortNullable { get; set; }
+            public int? IntNullable { get; set; }
+            public long? testFielLongNullable { get; set; }
+            public byte? ByteNullable { get; set; }
+            public ushort? UShortNullable { get; set; }
+            public uint? UIntNullable { get; set; }
+            public ulong? ULongNullable { get; set; }
+            public double? DoubleNullable { get; set; }
+            public float? FloatNullable { get; set; }
+            public decimal? DecimalNullable { get; set; }
+            public TimeSpan? TimeSpanNullable { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime? DateTimeNullable { get; set; }
+            [Column(ServerTime = DateTimeKind.Local)]
+            public DateTime? DateTimeOffSetNullable { get; set; }
+
+            public Guid? GuidNullable { get; set; }
+
+            public TableAllTypeEnumType1 Enum1 { get; set; }
+            public TableAllTypeEnumType1? Enum1Nullable { get; set; }
+            public TableAllTypeEnumType2 Enum2 { get; set; }
+            public TableAllTypeEnumType2? Enum2Nullable { get; set; }
+
+            public TableAllTypeEnumType3 testFieldEnum3 { get; set; }
+            public TableAllTypeEnumType3? testFieldEnum3Nullable { get; set; }
+
+            public enum TableAllTypeEnumType3 { }
+        }
+
+        public enum TableAllTypeEnumType1 { e1, e2, e3, e5 }
+        [Flags] public enum TableAllTypeEnumType2 { f1, f2, f3 }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteDbFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteDbFirstTest.cs
new file mode 100644
index 00000000..8013575a
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteDbFirstTest.cs
@@ -0,0 +1,83 @@
+using FreeSql.DataAnnotations;
+using System;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteDbFirstTest
+    {
+        [Fact]
+        public void GetDatabases()
+        {
+            var t1 = g.sqlite.DbFirst.GetDatabases();
+        }
+
+        [Fact]
+        public void GetTablesByDatabase()
+        {
+            var t2 = g.sqlite.DbFirst.GetTablesByDatabase();
+            Assert.True(t2.Count > 0);
+        }
+
+        [Fact]
+        public void GetTableByName()
+        {
+            var fsql = g.sqlite;
+            var t1 = fsql.DbFirst.GetTableByName("tb_alltype");
+            var t2 = fsql.DbFirst.GetTableByName("main.tb_alltype");
+            Assert.NotNull(t1);
+            Assert.NotNull(t2);
+            Assert.True(t1.Columns.Count > 0);
+            Assert.True(t2.Columns.Count > 0);
+            Assert.Equal(t1.Columns.Count, t2.Columns.Count);
+            var t3 = fsql.DbFirst.GetTableByName("notexists_tb");
+            Assert.Null(t3);
+        }
+
+        [Fact]
+        public void ExistsTable()
+        {
+            var fsql = g.sqlite;
+            Assert.False(fsql.DbFirst.ExistsTable("test_existstb01"));
+            Assert.False(fsql.DbFirst.ExistsTable("main.test_existstb01"));
+            Assert.False(fsql.DbFirst.ExistsTable("test_existstb01", false));
+            Assert.False(fsql.DbFirst.ExistsTable("main.test_existstb01", false));
+            fsql.CodeFirst.SyncStructure(typeof(test_existstb01));
+            Assert.True(fsql.DbFirst.ExistsTable("test_existstb01"));
+            Assert.True(fsql.DbFirst.ExistsTable("main.test_existstb01"));
+            Assert.False(fsql.DbFirst.ExistsTable("Test_existstb01", false));
+            Assert.False(fsql.DbFirst.ExistsTable("main.Test_existstb01", false));
+            fsql.Ado.ExecuteNonQuery("drop table test_existstb01");
+
+            //Assert.False(fsql.DbFirst.ExistsTable("xxxtb.test_existstb01"));
+            //Assert.False(fsql.DbFirst.ExistsTable("xxxtb.test_existstb01", false));
+            //fsql.CodeFirst.SyncStructure(typeof(test_existstb01), "xxxtb.test_existstb01");
+            //Assert.True(fsql.DbFirst.ExistsTable("xxxtb.test_existstb01"));
+            //Assert.False(fsql.DbFirst.ExistsTable("xxxtb.Test_existstb01", false));
+            //fsql.Ado.ExecuteNonQuery("drop table xxxtb.test_existstb01");
+        }
+        class test_existstb01
+        {
+            public Guid id { get; set; }
+        }
+
+        [Fact]
+        public void TestIdentity()
+        {
+            var fsql = g.sqlite;
+            fsql.CodeFirst.SyncStructure<ts_identity01>();
+
+            var tb = fsql.DbFirst.GetTableByName("ts_identity01");
+            Assert.NotNull(tb);
+            Assert.True(tb.Primarys.Count == 1);
+            Assert.True(tb.Primarys[0].IsIdentity);
+        }
+        class ts_identity01
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+
+            public string name { get; set; }
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/ConvertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/ConvertTest.cs
new file mode 100644
index 00000000..6f881231
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/ConvertTest.cs
@@ -0,0 +1,169 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class ConvertTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        [Fact]
+        public void ToBoolean()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (Convert.ToBoolean(a.Clicks) ? 1 : 0) > 0).ToList());
+            data.Add(select.Where(a => (bool.Parse(a.Clicks.ToString()) ? 1 : 0) > 0).ToList());
+        }
+        [Fact]
+        public void ToByte()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToByte(a.Clicks % 255) > 0).ToList());
+            data.Add(select.Where(a => byte.Parse((a.Clicks % 255).ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToChar()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToChar(a.Clicks) == '1').ToList());
+            data.Add(select.Where(a => char.Parse(a.Clicks.ToString()) == '1').ToList());
+        }
+        [Fact]
+        public void ToDateTime()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDateTime(a.CreateTime.ToString()).Year > 0).ToList());
+            data.Add(select.Where(a => DateTime.Parse(a.CreateTime.ToString()).Year > 0).ToList());
+        }
+        [Fact]
+        public void ToDecimal()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDecimal(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => decimal.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToDouble()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToDouble(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => double.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt16()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToInt16(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => short.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt32()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (int)a.Clicks > 0).ToList());
+            data.Add(select.Where(a => Convert.ToInt32(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => int.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToInt64()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToInt64(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => long.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToSByte()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToSByte(a.Clicks % 128) > 0).ToList());
+            data.Add(select.Where(a => sbyte.Parse((a.Clicks % 128).ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToSingle()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToSingle(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => float.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToString(a.Clicks).Equals("")).ToList());
+            data.Add(select.Where(a => a.Clicks.ToString().Equals("")).ToList());
+        }
+        [Fact]
+        public void ToUInt16()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt16(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => ushort.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToUInt32()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt32(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => uint.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+        [Fact]
+        public void ToUInt64()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Convert.ToUInt64(a.Clicks) > 0).ToList());
+            data.Add(select.Where(a => ulong.Parse(a.Clicks.ToString()) > 0).ToList());
+        }
+
+        [Fact]
+        public void Guid_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Guid.Parse(Guid.Empty.ToString()) == Guid.Empty).ToList());
+        }
+
+        [Fact]
+        public void Guid_NewGuid()
+        {
+            var data = new List<object>();
+            //data.Add(select.OrderBy(a => Guid.NewGuid()).Limit(10).ToList());
+        }
+
+        [Fact]
+        public void Random()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => new Random().Next() > a.Clicks).Limit(10).ToList());
+            data.Add(select.Where(a => new Random().NextDouble() > a.Clicks).Limit(10).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/DateTimeTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/DateTimeTest.cs
new file mode 100644
index 00000000..c0c76b6a
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/DateTimeTest.cs
@@ -0,0 +1,721 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class DateTimeTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic111333")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        [Table(Name = "TestTypeInfo333")]
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+            public DateTime Time { get; set; }
+        }
+        [Table(Name = "TestTypeParentInfo23123")]
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+            public DateTime Time2 { get; set; }
+        }
+
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.ToString().Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).ToString().Equals(DateTime.Now)).ToList());
+
+            g.sqlite.Insert(new Topic()).ExecuteAffrows();
+            var dtn = DateTime.Parse("2020-1-1 0:0:0");
+            var dts = Enumerable.Range(1, 12).Select(a => dtn.AddMonths(a))
+                .Concat(Enumerable.Range(1, 31).Select(a => dtn.AddDays(a)))
+                .Concat(Enumerable.Range(1, 24).Select(a => dtn.AddHours(a)))
+                .Concat(Enumerable.Range(1, 60).Select(a => dtn.AddMinutes(a)))
+                .Concat(Enumerable.Range(1, 60).Select(a => dtn.AddSeconds(a)));
+            foreach (var dt in dts)
+            {
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm:ss.fff"), select.First(a => dt.ToString()));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm:ss"), select.First(a => dt.ToString("yyyy-MM-dd HH:mm:ss")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH:mm"), select.First(a => dt.ToString("yyyy-MM-dd HH:mm")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd HH"), select.First(a => dt.ToString("yyyy-MM-dd HH")));
+                Assert.Equal(dt.ToString("yyyy-MM-dd"), select.First(a => dt.ToString("yyyy-MM-dd")));
+                Assert.Equal(dt.ToString("yyyy-MM"), select.First(a => dt.ToString("yyyy-MM")));
+                Assert.Equal(dt.ToString("yyyyMMddHHmmss"), select.First(a => dt.ToString("yyyyMMddHHmmss")));
+                Assert.Equal(dt.ToString("yyyyMMddHHmm"), select.First(a => dt.ToString("yyyyMMddHHmm")));
+                Assert.Equal(dt.ToString("yyyyMMddHH"), select.First(a => dt.ToString("yyyyMMddHH")));
+                Assert.Equal(dt.ToString("yyyyMMdd"), select.First(a => dt.ToString("yyyyMMdd")));
+                Assert.Equal(dt.ToString("yyyyMM"), select.First(a => dt.ToString("yyyyMM")));
+                Assert.Equal(dt.ToString("yyyy"), select.First(a => dt.ToString("yyyy")));
+                Assert.Equal(dt.ToString("HH:mm:ss"), select.First(a => dt.ToString("HH:mm:ss")));
+                Assert.Equal(dt.ToString("yyyy MM dd HH mm ss yy M d H hh h"), select.First(a => dt.ToString("yyyy MM dd HH mm ss yy M d H hh h")));
+                Assert.Equal(dt.ToString("yyyy MM dd HH mm ss yy M d H hh h m s tt t").Replace("����", "AM").Replace("����", "PM").Replace("��", "A").Replace("��", "P"), select.First(a => dt.ToString("yyyy MM dd HH mm ss yy M d H hh h m s tt t")));
+            }
+        }
+        [Fact]
+        public void Now()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void UtcNow()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.UtcNow.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(utc_timestamp(), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void MinValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.MinValue.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('0001/1/1 0:00:00' as datetime), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void MaxValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.MaxValue.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(cast('9999/12/31 23:59:59' as datetime), '%Y-%m-%d') as datetime))
+        }
+        [Fact]
+        public void Date()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Date == DateTime.Now.Date).ToList());
+            data.Add(select.Where(a => a.Type.Time.Date > DateTime.Now.Date).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Date > DateTime.Now.Date).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime) = cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime) > cast(date_format(now(), '%Y-%m-%d') as datetime));
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.CreateTime.Date).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Time.Date).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => DateTime.Now.Subtract(a.Type.Parent.Time2.Date).TotalSeconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a.`CreateTime`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a__Type.`Time`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((timestampdiff(microsecond, cast(date_format(a__Type__Parent.`Time2`, '%Y-%m-%d') as datetime), now())) / 1000000) > 0)
+        }
+        [Fact]
+        public void TimeOfDay()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay == DateTime.Now.TimeOfDay).ToList());
+            data.Add(select.Where(a => a.Type.Time.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.TimeOfDay > DateTime.Now.TimeOfDay).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((timestampdiff(microsecond, date_format(a__Type.`Time`, '1970-1-1 %H:%i:%s.%f'), a__Type.`Time`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((timestampdiff(microsecond, date_format(a__Type__Parent.`Time2`, '1970-1-1 %H:%i:%s.%f'), a__Type__Parent.`Time2`) + 62135596800000000) > (timestampdiff(microsecond, date_format(now(), '1970-1-1 %H:%i:%s.%f'), now()) + 62135596800000000))
+        }
+        [Fact]
+        public void DayOfWeek()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            data.Add(select.Where(a => a.Type.Time.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.DayOfWeek > DateTime.Now.DayOfWeek).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((dayofweek(a.`CreateTime`) - 1) > (dayofweek(now()) - 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((dayofweek(a__Type.`Time`) - 1) > (dayofweek(now()) - 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((dayofweek(a__Type__Parent.`Time2`) - 1) > (dayofweek(now()) - 1))
+        }
+        [Fact]
+        public void Day()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Day > DateTime.Now.Day).ToList());
+            data.Add(select.Where(a => a.Type.Time.Day > DateTime.Now.Day).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Day > DateTime.Now.Day).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofmonth(a.`CreateTime`) > dayofmonth(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofmonth(a__Type.`Time`) > dayofmonth(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofmonth(a__Type__Parent.`Time2`) > dayofmonth(now()))
+        }
+        [Fact]
+        public void DayOfYear()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            data.Add(select.Where(a => a.Type.Time.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.DayOfYear > DateTime.Now.DayOfYear).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofyear(a.`CreateTime`) > dayofyear(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofyear(a__Type.`Time`) > dayofyear(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofyear(a__Type__Parent.`Time2`) > dayofyear(now()))
+        }
+        [Fact]
+        public void Month()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Month > DateTime.Now.Month).ToList());
+            data.Add(select.Where(a => a.Type.Time.Month > DateTime.Now.Month).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Month > DateTime.Now.Month).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (month(a.`CreateTime`) > month(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (month(a__Type.`Time`) > month(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (month(a__Type__Parent.`Time2`) > month(now()))
+        }
+        [Fact]
+        public void Year()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Year > DateTime.Now.Year).ToList());
+            data.Add(select.Where(a => a.Type.Time.Year > DateTime.Now.Year).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Year > DateTime.Now.Year).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (year(a.`CreateTime`) > year(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (year(a__Type.`Time`) > year(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (year(a__Type__Parent.`Time2`) > year(now()))
+        }
+        [Fact]
+        public void Hour()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Hour > DateTime.Now.Hour).ToList());
+            data.Add(select.Where(a => a.Type.Time.Hour > DateTime.Now.Hour).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Hour > DateTime.Now.Hour).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (hour(a.`CreateTime`) > hour(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (hour(a__Type.`Time`) > hour(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (hour(a__Type__Parent.`Time2`) > hour(now()))
+        }
+        [Fact]
+        public void Minute()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Minute > DateTime.Now.Minute).ToList());
+            data.Add(select.Where(a => a.Type.Time.Minute > DateTime.Now.Minute).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Minute > DateTime.Now.Minute).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (minute(a.`CreateTime`) > minute(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (minute(a__Type.`Time`) > minute(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (minute(a__Type__Parent.`Time2`) > minute(now()))
+        }
+        [Fact]
+        public void Second()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Second > DateTime.Now.Second).ToList());
+            data.Add(select.Where(a => a.Type.Time.Second > DateTime.Now.Second).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Second > DateTime.Now.Second).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (second(a.`CreateTime`) > second(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (second(a__Type.`Time`) > second(now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (second(a__Type__Parent.`Time2`) > second(now()))
+        }
+        [Fact]
+        public void Millisecond()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Millisecond > DateTime.Now.Millisecond).ToList());
+            data.Add(select.Where(a => a.Type.Time.Millisecond > DateTime.Now.Millisecond).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Millisecond > DateTime.Now.Millisecond).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (floor(microsecond(a.`CreateTime`) / 1000) > floor(microsecond(now()) / 1000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (floor(microsecond(a__Type.`Time`) / 1000) > floor(microsecond(now()) / 1000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (floor(microsecond(a__Type__Parent.`Time2`) / 1000) > floor(microsecond(now()) / 1000))
+        }
+        [Fact]
+        public void Ticks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Ticks > DateTime.Now.Ticks).ToList());
+            data.Add(select.Where(a => a.Type.Time.Ticks > DateTime.Now.Ticks).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Ticks > DateTime.Now.Ticks).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((timestampdiff(microsecond, '1970-1-1', a.`CreateTime`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((timestampdiff(microsecond, '1970-1-1', a__Type.`Time`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((timestampdiff(microsecond, '1970-1-1', a__Type__Parent.`Time2`) * 10 + 621355968000000000) > (timestampdiff(microsecond, '1970-1-1', now()) * 10 + 621355968000000000))
+        }
+        [Fact]
+        public void Add()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Add(TimeSpan.FromDays(1)) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval ((1 * 86400000000)) microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval ((1 * 86400000000)) microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval ((1 * 86400000000)) microsecond) > now())
+        }
+        [Fact]
+        public void AddDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddDays(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddDays(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddDays(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) day) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) day) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) day) > now())
+        }
+        [Fact]
+        public void AddHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddHours(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddHours(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddHours(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) hour) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) hour) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) hour) > now())
+        }
+        [Fact]
+        public void AddMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMilliseconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMilliseconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMilliseconds(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) * 1000 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) * 1000 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) * 1000 microsecond) > now())
+        }
+        [Fact]
+        public void AddMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMinutes(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMinutes(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMinutes(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) minute) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) minute) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) minute) > now())
+        }
+        [Fact]
+        public void AddMonths()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddMonths(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddMonths(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddMonths(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) month) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) month) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) month) > now())
+        }
+        [Fact]
+        public void AddSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddSeconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddSeconds(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddSeconds(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) second) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) second) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) second) > now())
+        }
+        [Fact]
+        public void AddTicks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddTicks(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddTicks(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddTicks(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) / 10 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) / 10 microsecond) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) / 10 microsecond) > now())
+        }
+        [Fact]
+        public void AddYears()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddYears(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1) > DateTime.Now).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (date_add(a.`CreateTime`, interval (1) year) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (date_add(a__Type.`Time`, interval (1) year) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (date_add(a__Type__Parent.`Time2`, interval (1) year) > now())
+        }
+        [Fact]
+        public void Subtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => a.Type.Time.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Subtract(DateTime.Now).TotalSeconds > 0).ToList());
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //WHERE (((strftime('%s',a."CreateTime")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //WHERE (((strftime('%s',a__Type."Time")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //LEFT JOIN "TestTypeParentInfo23123" a__Type__Parent ON a__Type__Parent."Id" = a__Type."ParentId" 
+            //WHERE (((strftime('%s',a__Type__Parent."Time2")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+            data.Add(select.Where(a => a.CreateTime.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            data.Add(select.Where(a => a.Type.Time.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.Subtract(TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //WHERE (datetime(a."CreateTime",(-((1)*86400))||' seconds') > a."CreateTime")
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //WHERE (datetime(a__Type."Time",(-((1)*86400))||' seconds') > a."CreateTime")
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //LEFT JOIN "TestTypeParentInfo23123" a__Type__Parent ON a__Type__Parent."Id" = a__Type."ParentId" 
+            //WHERE (datetime(a__Type__Parent."Time2",(-((1)*86400))||' seconds') > a."CreateTime")
+        }
+        [Fact]
+        public void �����������_Ч��ͬSubtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (a.CreateTime - DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => (a.Type.Time - DateTime.Now).TotalSeconds > 0).ToList());
+            data.Add(select.Where(a => (a.Type.Parent.Time2 - DateTime.Now).TotalSeconds > 0).ToList());
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //WHERE (((strftime('%s',a."CreateTime")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //WHERE (((strftime('%s',a__Type."Time")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //LEFT JOIN "TestTypeParentInfo23123" a__Type__Parent ON a__Type__Parent."Id" = a__Type."ParentId" 
+            //WHERE (((strftime('%s',a__Type__Parent."Time2")-strftime('%s',datetime(current_timestamp,'localtime')))) > 0)
+            data.Add(select.Where(a => (a.CreateTime - TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            data.Add(select.Where(a => (a.Type.Time - TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            data.Add(select.Where(a => (a.Type.Parent.Time2 - TimeSpan.FromDays(1)) > a.CreateTime).ToList());
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //WHERE (datetime(a."CreateTime",(-((1)*86400))||' seconds') > a."CreateTime")
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //WHERE (datetime(a__Type."Time",(-((1)*86400))||' seconds') > a."CreateTime")
+
+            //SELECT a."Id", a."Clicks", a."TypeGuid", a__Type."Guid", a__Type."ParentId", a__Type."Name", a__Type."Time", a."Title", a."CreateTime" 
+            //FROM "tb_topic111333" a 
+            //LEFT JOIN "TestTypeInfo333" a__Type ON a__Type."Guid" = a."TypeGuid" 
+            //LEFT JOIN "TestTypeParentInfo23123" a__Type__Parent ON a__Type__Parent."Id" = a__Type."ParentId" 
+            //WHERE (datetime(a__Type__Parent."Time2",(-((1)*86400))||' seconds') > a."CreateTime")
+        }
+        [Fact]
+        public void this_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.AddYears(1).Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).Equals(DateTime.Now)).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).Equals(DateTime.Now)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+        }
+        [Fact]
+        public void DateTime_Compare()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.CompareTo(DateTime.Now) == 0).ToList());
+            data.Add(select.Where(a => a.Type.Time.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+            data.Add(select.Where(a => a.Type.Parent.Time2.AddYears(1).CompareTo(DateTime.Now) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((a.`CreateTime`) - (now())) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((date_add(a__Type.`Time`, interval (1) year)) - (now())) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((date_add(a__Type__Parent.`Time2`, interval (1) year)) - (now())) = 0)
+        }
+        [Fact]
+        public void DateTime_DaysInMonth()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.DaysInMonth(a.CreateTime.Year, a.CreateTime.Month) > 30).ToList());
+            data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Time.Year, a.Type.Time.Month) > 30).ToList());
+            data.Add(select.Where(a => DateTime.DaysInMonth(a.Type.Parent.Time2.Year, a.Type.Parent.Time2.Month) > 30).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (dayofmonth(last_day(concat(year(a.`CreateTime`), month(a.`CreateTime`), '-01'))) > 30);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (dayofmonth(last_day(concat(year(a__Type.`Time`), month(a__Type.`Time`), '-01'))) > 30);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (dayofmonth(last_day(concat(year(a__Type__Parent.`Time2`), month(a__Type__Parent.`Time2`), '-01'))) > 30)
+        }
+        [Fact]
+        public void DateTime_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.Equals(a.CreateTime.AddYears(1), DateTime.Now)).ToList());
+            data.Add(select.Where(a => DateTime.Equals(a.Type.Time.AddYears(1), DateTime.Now)).ToList());
+            data.Add(select.Where(a => DateTime.Equals(a.Type.Parent.Time2.AddYears(1), DateTime.Now)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE ((date_add(a.`CreateTime`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE ((date_add(a__Type.`Time`, interval (1) year) = now()));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE ((date_add(a__Type__Parent.`Time2`, interval (1) year) = now()))
+        }
+        [Fact]
+        public void DateTime_IsLeapYear()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.CreateTime.Year)).ToList());
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Time.AddYears(1).Year)).ToList());
+            data.Add(select.Where(a => DateTime.IsLeapYear(a.Type.Parent.Time2.AddYears(1).Year)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (((year(a.`CreateTime`)) % 4 = 0 AND (year(a.`CreateTime`)) % 100 <> 0 OR (year(a.`CreateTime`)) % 400 = 0));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (((year(date_add(a__Type.`Time`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type.`Time`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type.`Time`, interval (1) year))) % 400 = 0));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (((year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 4 = 0 AND (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 100 <> 0 OR (year(date_add(a__Type__Parent.`Time2`, interval (1) year))) % 400 = 0))
+        }
+        [Fact]
+        public void DateTime_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => DateTime.Parse(a.CreateTime.ToString()) > DateTime.Now).ToList());
+            data.Add(select.Where(a => DateTime.Parse(a.Type.Time.AddYears(1).ToString()) > DateTime.Now).ToList());
+            data.Add(select.Where(a => DateTime.Parse(a.Type.Parent.Time2.AddYears(1).ToString()) > DateTime.Now).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic111333` a 
+            //WHERE (cast(date_format(a.`CreateTime`, '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type 
+            //WHERE (cast(date_format(date_add(a__Type.`Time`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now());
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a__Type.`Time` as7, a.`Title` as8, a.`CreateTime` as9 
+            //FROM `tb_topic111333` a, `TestTypeInfo333` a__Type, `TestTypeParentInfo23123` a__Type__Parent 
+            //WHERE (cast(date_format(date_add(a__Type__Parent.`Time2`, interval (1) year), '%Y-%m-%d %H:%i:%s.%f') as datetime) > now())
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/MathTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/MathTest.cs
new file mode 100644
index 00000000..3183a14d
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/MathTest.cs
@@ -0,0 +1,156 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class MathTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+
+        [Fact]
+        public void PI()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.PI + a.Clicks > 0).ToList());
+        }
+        [Fact]
+        public void Abs()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Abs(-a.Clicks) > 0).ToList());
+        }
+        [Fact]
+        public void Sign()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sign(-a.Clicks) > 0).ToList());
+        }
+        [Fact]
+        public void Floor()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Floor(a.Clicks + 0.5) == a.Clicks).ToList());
+        }
+        [Fact]
+        public void Ceiling()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Ceiling(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Round()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Round(a.Clicks + 0.5) == a.Clicks).ToList());
+            data.Add(select.Where(a => Math.Round(a.Clicks + 0.5, 1) > a.Clicks).ToList());
+        }
+        [Fact]
+        public void Exp()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Exp(1) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Log()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Log(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Log10()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Log10(a.Clicks + 0.5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Pow()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Pow(2, a.Clicks % 5) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Sqrt()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sqrt(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Cos()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Cos(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Sin()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Sin(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Tan()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Tan(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Acos()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Acos(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Asin()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Asin(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Atan()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => Math.Atan(Math.Pow(2, a.Clicks % 5)) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Atan2()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Atan2(2, a.Clicks) == a.Clicks + 1).ToList());
+        }
+        [Fact]
+        public void Truncate()
+        {
+            var data = new List<object>();
+            //data.Add(select.Where(a => Math.Truncate(a.Clicks * 1.0 / 3) == a.Clicks + 1).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/OtherTest.cs
new file mode 100644
index 00000000..c40c4e42
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/OtherTest.cs
@@ -0,0 +1,164 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class OtherTest
+    {
+
+        ISelect<TableAllType> select => g.sqlite.Select<TableAllType>();
+
+        public OtherTest()
+        {
+        }
+
+        [Fact]
+        public void Div()
+        {
+            var t1 = select.Where(a => a.Int / 3 > 3).Limit(10).ToList();
+            var t2 = select.Where(a => a.Long / 3 > 3).Limit(10).ToList();
+            var t3 = select.Where(a => a.Short / 3 > 3).Limit(10).ToList();
+
+            var t4 = select.Where(a => a.Int / 3.0 > 3).Limit(10).ToList();
+            var t5 = select.Where(a => a.Long / 3.0 > 3).Limit(10).ToList();
+            var t6 = select.Where(a => a.Short / 3.0 > 3).Limit(10).ToList();
+
+            var t7 = select.Where(a => a.Double / 3 > 3).Limit(10).ToList();
+            var t8 = select.Where(a => a.Decimal / 3 > 3).Limit(10).ToList();
+            var t9 = select.Where(a => a.Float / 3 > 3).Limit(10).ToList();
+        }
+
+        [Fact]
+        public void Boolean()
+        {
+            var t1 = select.Where(a => a.Bool == true).ToList();
+            var t2 = select.Where(a => a.Bool != true).ToList();
+            var t3 = select.Where(a => a.Bool == false).ToList();
+            var t4 = select.Where(a => !a.Bool).ToList();
+            var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).Limit(10).ToList();
+
+            var t11 = select.Where(a => a.BoolNullable == true).ToList();
+            var t22 = select.Where(a => a.BoolNullable != true).ToList();
+            var t33 = select.Where(a => a.BoolNullable == false).ToList();
+            var t44 = select.Where(a => !a.BoolNullable.Value).ToList();
+            var t55 = select.Where(a => a.BoolNullable.Value).ToList();
+
+            var t111 = select.Where(a => a.Bool == true && a.Id > 0).ToList();
+            var t222 = select.Where(a => a.Bool != true && a.Id > 0).ToList();
+            var t333 = select.Where(a => a.Bool == false && a.Id > 0).ToList();
+            var t444 = select.Where(a => !a.Bool && a.Id > 0).ToList();
+            var t555 = select.Where(a => a.Bool && a.Id > 0).ToList();
+
+            var t1111 = select.Where(a => a.BoolNullable == true && a.Id > 0).ToList();
+            var t2222 = select.Where(a => a.BoolNullable != true && a.Id > 0).ToList();
+            var t3333 = select.Where(a => a.BoolNullable == false && a.Id > 0).ToList();
+            var t4444 = select.Where(a => !a.BoolNullable.Value && a.Id > 0).ToList();
+            var t5555 = select.Where(a => a.BoolNullable.Value && a.Id > 0).ToList();
+
+            var t11111 = select.Where(a => a.Bool == true && a.Id > 0 && a.Bool == true).ToList();
+            var t22222 = select.Where(a => a.Bool != true && a.Id > 0 && a.Bool != true).ToList();
+            var t33333 = select.Where(a => a.Bool == false && a.Id > 0 && a.Bool == false).ToList();
+            var t44444 = select.Where(a => !a.Bool && a.Id > 0 && !a.Bool).ToList();
+            var t55555 = select.Where(a => a.Bool && a.Id > 0 && a.Bool).ToList();
+
+            var t111111 = select.Where(a => a.BoolNullable == true && a.Id > 0 && a.BoolNullable == true).ToList();
+            var t222222 = select.Where(a => a.BoolNullable != true && a.Id > 0 && a.BoolNullable != true).ToList();
+            var t333333 = select.Where(a => a.BoolNullable == false && a.Id > 0 && a.BoolNullable == false).ToList();
+            var t444444 = select.Where(a => !a.BoolNullable.Value && a.Id > 0 && !a.BoolNullable.Value).ToList();
+            var t555555 = select.Where(a => a.BoolNullable.Value && a.Id > 0 && a.BoolNullable.Value).ToList();
+        }
+
+        [Fact]
+        public void Array()
+        {
+            IEnumerable<int> testlinqlist = new List<int>(new[] { 1, 2, 3 });
+            var testlinq = select.Where(a => testlinqlist.Contains(a.Int)).ToList();
+
+            //in not in
+            var sql111 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
+            var sql112 = select.Where(a => new[] { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+            var sql113 = select.Where(a => !new[] { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+            var inarray = new[] { 1, 2, 3 };
+            var sql1111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+            var sql1122 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+            var sql1133 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+            //in not in
+            var sql11111 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+            var sql11222 = select.Where(a => new List<int>() { 1, 2, 3 }.Contains(a.Int) == false).ToList();
+            var sql11333 = select.Where(a => !new List<int>() { 1, 2, 3 }.Contains(a.Int)).ToList();
+
+            var sql11111a = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+            var sql11222b = select.Where(a => new List<int>(new[] { 1, 2, 3 }).Contains(a.Int) == false).ToList();
+            var sql11333c = select.Where(a => !new List<int>(new[] { 1, 2, 3 }).Contains(a.Int)).ToList();
+
+            var inarray2 = new List<int>() { 1, 2, 3 };
+            var sql111111 = select.Where(a => inarray.Contains(a.Int)).ToList();
+            var sql112222 = select.Where(a => inarray.Contains(a.Int) == false).ToList();
+            var sql113333 = select.Where(a => !inarray.Contains(a.Int)).ToList();
+
+            var inarray2n = Enumerable.Range(1, 3333).ToArray();
+            var sql1111111 = select.Where(a => inarray2n.Contains(a.Int)).ToList();
+            var sql1122222 = select.Where(a => inarray2n.Contains(a.Int) == false).ToList();
+            var sql1133333 = select.Where(a => !inarray2n.Contains(a.Int)).ToList();
+        }
+
+        [Table(Name = "tb_alltype")]
+        class TableAllType
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+
+            public string id2 { get; set; } = "id2=10";
+
+            public bool Bool { get; set; }
+            public sbyte SByte { get; set; }
+            public short Short { get; set; }
+            public int Int { get; set; }
+            public long Long { get; set; }
+            public byte Byte { get; set; }
+            public ushort UShort { get; set; }
+            public uint UInt { get; set; }
+            public ulong ULong { get; set; }
+            public double Double { get; set; }
+            public float Float { get; set; }
+            public decimal Decimal { get; set; }
+            public TimeSpan TimeSpan { get; set; }
+            public DateTime DateTime { get; set; }
+            public DateTime DateTimeOffSet { get; set; }
+            public byte[] Bytes { get; set; }
+            public string String { get; set; }
+            public Guid Guid { get; set; }
+
+            public bool? BoolNullable { get; set; }
+            public sbyte? SByteNullable { get; set; }
+            public short? ShortNullable { get; set; }
+            public int? IntNullable { get; set; }
+            public long? testFielLongNullable { get; set; }
+            public byte? ByteNullable { get; set; }
+            public ushort? UShortNullable { get; set; }
+            public uint? UIntNullable { get; set; }
+            public ulong? ULongNullable { get; set; }
+            public double? DoubleNullable { get; set; }
+            public float? FloatNullable { get; set; }
+            public decimal? DecimalNullable { get; set; }
+            public TimeSpan? TimeSpanNullable { get; set; }
+            public DateTime? DateTimeNullable { get; set; }
+            public DateTime? DateTimeOffSetNullable { get; set; }
+            public Guid? GuidNullable { get; set; }
+
+            public TableAllTypeEnumType1 Enum1 { get; set; }
+            public TableAllTypeEnumType1? Enum1Nullable { get; set; }
+            public TableAllTypeEnumType2 Enum2 { get; set; }
+            public TableAllTypeEnumType2? Enum2Nullable { get; set; }
+        }
+
+        public enum TableAllTypeEnumType1 { e1, e2, e3, e5 }
+        [Flags] public enum TableAllTypeEnumType2 { f1, f2, f3 }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/StringTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/StringTest.cs
new file mode 100644
index 00000000..e1c2e382
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/StringTest.cs
@@ -0,0 +1,818 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class StringTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            [Column(IsIdentity = true)]
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+        class TestEqualsGuid
+        {
+            public Guid id { get; set; }
+        }
+
+        [Fact]
+        public void Equals__()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.Equals("aaa")).ToList());
+            list.Add(g.sqlite.Select<TestEqualsGuid>().Where(a => a.id.Equals(Guid.Empty)).ToList());
+        }
+
+        [Fact]
+        public void StringJoin()
+        {
+            var fsql = g.sqlite;
+            fsql.Delete<StringJoin01>().Where("1=1").ExecuteAffrows();
+            fsql.Insert(new[] { new StringJoin01 { name = "����" }, new StringJoin01 { name = "�Ϻ�" }, new StringJoin01 { name = "����" }, }).ExecuteAffrows();
+
+            var val1 = string.Join(",", fsql.Select<StringJoin01>().ToList(a => a.name));
+            var val2 = fsql.Select<StringJoin01>().ToList(a => string.Join(",", fsql.Select<StringJoin01>().As("b").ToList(b => b.name)));
+            Assert.Equal(val1, val2[0]);
+
+            val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.name));
+            val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.name)));
+            Assert.Equal(val1, val2[0]);
+
+            val1 = string.Join(",", fsql.Select<StringJoin01>().ToList(a => a.id));
+            val2 = fsql.Select<StringJoin01>().ToList(a => string.Join(",", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
+            Assert.Equal(val1, val2[0]);
+
+            val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.id));
+            val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
+            Assert.Equal(val1, val2[0]);
+        }
+        class StringJoin01
+        {
+            [Column(IsIdentity = true)]
+            public int id { get; set; }
+            public string name { get; set; }
+        }
+
+        [Fact]
+        public void First()
+        {
+            Assert.Equal('x', select.First(a => "x1".First()));
+            Assert.Equal('z', select.First(a => "z1".First()));
+        }
+        [Fact]
+        public void FirstOrDefault()
+        {
+            Assert.Equal('x', select.First(a => "x1".FirstOrDefault()));
+            Assert.Equal('z', select.First(a => "z1".FirstOrDefault()));
+        }
+
+        [Fact]
+        public void Format()
+        {
+            var item = g.sqlite.GetRepository<Topic>().Insert(new Topic { Clicks = 101, Title = "�������101", CreateTime = DateTime.Parse("2020-7-5") });
+            var sql = select.WhereDynamic(item).ToSql(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title)
+            });
+            Assert.Equal($@"SELECT 'x'||ifnull((a.""Id"" + 1), '')||'z-'||ifnull(strftime('%Y%m',a.""CreateTime""), '')||''||ifnull(a.""Title"", '')||'' as1, ''||ifnull((a.""Id"" + 1), '')||'x'||ifnull((a.""Id"" + 1), '')||'z-'||ifnull(strftime('%Y%m',a.""CreateTime""), '')||''||ifnull(a.""Title"", '')||'' as2 
+FROM ""tb_topic"" a 
+WHERE (a.""Id"" = {item.Id})", sql);
+
+            var item2 = select.WhereDynamic(item).First(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title)
+            });
+            Assert.NotNull(item2);
+            Assert.Equal($"x{item.Id + 1}z-{item.CreateTime.ToString("yyyyMM")}{item.Title}", item2.str);
+            Assert.Equal(string.Format("{0}x{0}z-{1}{2}", item.Id + 1, item.CreateTime.ToString("yyyyMM"), item.Title), item2.str2);
+        }
+
+        [Fact]
+        public void Format4()
+        {
+            //3�� {} ʱ��Arguments ���������Ƿֿ���
+            //4�� {} ʱ��Arguments[1] ֻ�ܽ������������Ȼ�������� NewArray []
+            var item = g.sqlite.GetRepository<Topic>().Insert(new Topic { Clicks = 101, Title = "�������101", CreateTime = DateTime.Parse("2020-7-5") });
+            var sql = select.WhereDynamic(item).ToSql(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}{3}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title, a.Title)
+            });
+            Assert.Equal($@"SELECT 'x'||ifnull((a.""Id"" + 1), '')||'z-'||ifnull(strftime('%Y%m',a.""CreateTime""), '')||''||ifnull(a.""Title"", '')||''||ifnull(a.""Title"", '')||'' as1, ''||ifnull((a.""Id"" + 1), '')||'x'||ifnull((a.""Id"" + 1), '')||'z-'||ifnull(strftime('%Y%m',a.""CreateTime""), '')||''||ifnull(a.""Title"", '')||''||ifnull(a.""Title"", '')||'' as2 
+FROM ""tb_topic"" a 
+WHERE (a.""Id"" = {item.Id})", sql);
+
+            var item2 = select.WhereDynamic(item).First(a => new
+            {
+                str = $"x{a.Id + 1}z-{a.CreateTime.ToString("yyyyMM")}{a.Title}{a.Title}",
+                str2 = string.Format("{0}x{0}z-{1}{2}{3}", a.Id + 1, a.CreateTime.ToString("yyyyMM"), a.Title, a.Title)
+            });
+            Assert.NotNull(item2);
+            Assert.Equal($"x{item.Id + 1}z-{item.CreateTime.ToString("yyyyMM")}{item.Title}{item.Title}", item2.str);
+            Assert.Equal(string.Format("{0}x{0}z-{1}{2}{3}", item.Id + 1, item.CreateTime.ToString("yyyyMM"), item.Title, item.Title), item2.str2);
+        }
+
+        [Fact]
+        public void Empty()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => (a.Title ?? "") == string.Empty).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (ifnull(a.`Title`, '') = '')
+        }
+
+        [Fact]
+        public void StartsWith()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.StartsWith("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.StartsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE '%aaa')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title`))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', concat(a.`Title`, 1)))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`))
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").StartsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1)))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`))
+        }
+        [Fact]
+        public void EndsWith()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.EndsWith("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.EndsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE 'aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat(a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat(concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat(a__Type.`Name`, '%'))
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").EndsWith(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE 'aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat(a__Type.`Name`, '%'))
+        }
+        [Fact]
+        public void Contains()
+        {
+            var list = new List<object>();
+            list.Add(select.Where(a => a.Title.Contains("aaa")).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Title)).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Title + 1)).ToList());
+            list.Add(select.Where(a => a.Title.Contains(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE '%aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((a.`Title`) LIKE concat('%', a.`Title` +1, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((a.`Title`) LIKE concat('%', a__Type.`Name`, '%'))
+            list.Add(select.Where(a => (a.Title + "aaa").Contains("aaa")).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Title + 1)).ToList());
+            list.Add(select.Where(a => (a.Title + "aaa").Contains(a.Type.Name)).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE '%aaa%')
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a.`Title`, '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', concat(a.`Title`, 1), '%'))
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE((concat(a.`Title`, 'aaa')) LIKE concat('%', a__Type.`Name`, '%'))
+        }
+        [Fact]
+        public void ToLower()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.ToLower() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.ToLower() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(a.`Title`) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE(lower(a.`Title`) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.ToLower() + "aaa").ToLower() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
+            //FROM `tb_topic` a
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type
+            //WHERE(lower(concat(lower(a.`Title`), 'aaa')) = a__Type.`Name`)
+        }
+        [Fact]
+        public void ToUpper()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.ToUpper() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.ToUpper() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(a.`Title`) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (upper(a.`Title`) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.ToUpper() + "aaa").ToUpper() == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (upper(concat(upper(a.`Title`), 'aaa')) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Substring()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Substring(0) == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Substring(0) == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(a.`Title`, 1) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (substr(a.`Title`, 1) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(a.Title.Length) == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, a.Title.Length) == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(0, 3) == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Substring(0) + "aaa").Substring(1, 2) == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), char_length(a.`Title`) + 1) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, char_length(a.`Title`)) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 1, 3) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (substr(concat(substr(a.`Title`, 1), 'aaa'), 2, 2) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Length()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Length == 0).ToList());
+            data.Add(select.Where(a => a.Title.Length == 1).ToList());
+            data.Add(select.Where(a => a.Title.Length == a.Title.Length + 1).ToList());
+            data.Add(select.Where(a => a.Title.Length == a.Type.Name.Length).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(a.`Title`) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (char_length(a.`Title`) = char_length(a__Type.`Name`));
+            data.Add(select.Where(a => (a.Title + "aaa").Length == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == 1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == a.Title.Length + 1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").Length == a.Type.Name.Length).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (char_length(concat(a.`Title`, 'aaa')) = char_length(a__Type.`Name`))
+        }
+        [Fact]
+        public void IndexOf()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.IndexOf("aaa") == -1).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == -1).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+            data.Add(select.Where(a => a.Title.IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa') - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE ((locate(a.`Title`, 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1);
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa") == -1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == -1).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == (a.Title.Length + 1)).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").IndexOf("aaa", 2) == a.Type.Name.Length + 1).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa') - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = -1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a.`Title`) + 1);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE ((locate(concat(a.`Title`, 'aaa'), 'aaa', 3) - 1) = char_length(a__Type.`Name`) + 1)
+        }
+        [Fact]
+        public void PadLeft()
+        {
+            //var data = new List<object>();
+            //data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == "aaa").ToList());
+            //data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Title).ToList());
+            //data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == (a.Title + 1)).ToList());
+            //data.Add(select.Where(a => a.Title.PadLeft(10, 'a') == a.Type.Name).ToList());
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(a.`Title`, 10, 'a') = 'aaa');
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(a.`Title`, 10, 'a') = a.`Title`);
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            ////FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            ////WHERE (lpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+            //data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == "aaa").ToList());
+            //data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Title).ToList());
+            //data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == (a.Title + 1)).ToList());
+            //data.Add(select.Where(a => (a.Title.PadLeft(10, 'a') + "aaa").PadLeft(20, 'b') == a.Type.Name).ToList());
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            ////FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            ////WHERE (lpad(concat(lpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+        }
+        [Fact]
+        public void PadRight()
+        {
+            //var data = new List<object>();
+            //data.Add(select.Where(a => a.Title.PadRight(10, 'a') == "aaa").ToList());
+            //data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Title).ToList());
+            //data.Add(select.Where(a => a.Title.PadRight(10, 'a') == (a.Title + 1)).ToList());
+            //data.Add(select.Where(a => a.Title.PadRight(10, 'a') == a.Type.Name).ToList());
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(a.`Title`, 10, 'a') = 'aaa');
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(a.`Title`, 10, 'a') = a.`Title`);
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(a.`Title`, 10, 'a') = concat(a.`Title`, 1));
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            ////FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            ////WHERE (rpad(a.`Title`, 10, 'a') = a__Type.`Name`);
+            //data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == "aaa").ToList());
+            //data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Title).ToList());
+            //data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == (a.Title + 1)).ToList());
+            //data.Add(select.Where(a => (a.Title.PadRight(10, 'a') + "aaa").PadRight(20, 'b') == a.Type.Name).ToList());
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = 'aaa');
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a.`Title`);
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            ////FROM `tb_topic` a 
+            ////WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = concat(a.`Title`, 1));
+
+            ////SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            ////FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            ////WHERE (rpad(concat(rpad(a.`Title`, 10, 'a'), 'aaa'), 20, 'b') = a__Type.`Name`)
+        }
+        [Fact]
+        public void Trim()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Trim() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Trim('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Trim('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Trim('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('a' from a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('b' from trim('a' from a.`Title`)) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim('c' from trim('b' from trim('a' from a.`Title`))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Trim() + "aaa").Trim() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a') + "aaa").Trim('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a', 'b') + "aaa").Trim('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Trim('a', 'b', 'c') + "aaa").Trim('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(concat(trim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('a' from concat(trim('a' from a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim('b' from trim('a' from concat(trim('b' from trim('a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim('c' from trim('b' from trim('a' from concat(trim('c' from trim('b' from trim('a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void TrimStart()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.TrimStart() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (ltrim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from trim(leading 'a' from a.`Title`)) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.TrimStart() + "aaa").TrimStart() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a') + "aaa").TrimStart('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a', 'b') + "aaa").TrimStart('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.TrimStart('a', 'b', 'c') + "aaa").TrimStart('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (ltrim(concat(ltrim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'a' from trim(leading 'a' from a.`Title`)), 'aaa'))) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))), 'aaa'))))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from concat(trim(trailing 'c' from trim(leading 'c' from trim(trailing 'b' from trim(leading 'b' from trim(trailing 'a' from trim(leading 'a' from a.`Title`)))))), 'aaa'))))))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void TrimEnd()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rtrim(a.`Title`) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from a.`Title`) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(trailing 'a' from a.`Title`)) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))) = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.TrimEnd() + "aaa").TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a') + "aaa").TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b') + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.TrimEnd('a', 'b', 'c') + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (rtrim(concat(rtrim(a.`Title`), 'aaa')) = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'a' from concat(trim(trailing 'a' from a.`Title`), 'aaa')) = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'b' from trim(trailing 'a' from a.`Title`)), 'aaa'))) = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from concat(trim(trailing 'c' from trim(trailing 'b' from trim(trailing 'a' from a.`Title`))), 'aaa')))) = a__Type.`Name`)
+        }
+        [Fact]
+        public void Replace()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.Replace("a", "b") == "aaa").ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c") == a.Title).ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(a.`Title`, 'a', 'b') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(replace(a.`Title`, 'a', 'b'), 'b', 'c') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a') = a__Type.`Name`);
+            data.Add(select.Where(a => (a.Title.Replace("a", "b") + "aaa").TrimEnd() == "aaa").ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c") + "aaa").TrimEnd('a') == a.Title).ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace("c", "a") + "aaa").TrimEnd('a', 'b') == (a.Title + 1)).ToList());
+            data.Add(select.Where(a => (a.Title.Replace("a", "b").Replace("b", "c").Replace(a.Type.Name, "a") + "aaa").TrimEnd('a', 'b', 'c') == a.Type.Name).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(a.`Title`, 'a', 'b'), 'aaa') = 'aaa');
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'aaa') = a.`Title`);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), 'c', 'a'), 'aaa') = concat(a.`Title`, 1));
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (concat(replace(replace(replace(a.`Title`, 'a', 'b'), 'b', 'c'), a__Type.`Name`, 'a'), 'aaa') = a__Type.`Name`)
+        }
+        [Fact]
+        public void CompareTo()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title) == 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title) > 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title + 1) == 0).ToList());
+            data.Add(select.Where(a => a.Title.CompareTo(a.Title + a.Type.Name) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, a.`Title`) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, a.`Title`) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(a.`Title`, concat(a.`Title`, 1)) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (strcmp(a.`Title`, concat(a.`Title`, a__Type.`Name`)) = 0);
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo("aaa") == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title) > 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Title + 1) == 0).ToList());
+            data.Add(select.Where(a => (a.Title + "aaa").CompareTo(a.Type.Name) == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), 'aaa') = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), a.`Title`) > 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), concat(a.`Title`, 1)) = 0);
+
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a__Type.`Guid` as4, a__Type.`ParentId` as5, a__Type.`Name` as6, a.`Title` as7, a.`CreateTime` as8 
+            //FROM `tb_topic` a, `TestTypeInfo` a__Type 
+            //WHERE (strcmp(concat(a.`Title`, 'aaa'), a__Type.`Name`) = 0)
+        }
+
+        [Fact]
+        public void string_IsNullOrEmpty()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => string.IsNullOrEmpty(a.Title)).ToList());
+            //data.Add(select.Where(a => string.IsNullOrEmpty(a.Title) == false).ToList());
+            data.Add(select.Where(a => !string.IsNullOrEmpty(a.Title)).ToList());
+        }
+
+        [Fact]
+        public void string_IsNullOrWhiteSpace()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => string.IsNullOrWhiteSpace(a.Title)).ToList());
+            //data.Add(select.Where(a => string.IsNullOrWhiteSpace(a.Title) == false).ToList());
+            data.Add(select.Where(a => !string.IsNullOrWhiteSpace(a.Title)).ToList());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/TimeSpanTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/TimeSpanTest.cs
new file mode 100644
index 00000000..8ad219f6
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/SqliteExpression/TimeSpanTest.cs
@@ -0,0 +1,293 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace FreeSql.Tests.SqliteExpression
+{
+    public class TimeSpanTest
+    {
+
+        ISelect<Topic> select => g.sqlite.Select<Topic>();
+
+        [Table(Name = "tb_topic")]
+        class Topic
+        {
+            [Column(IsIdentity = true, IsPrimary = true)]
+            public int Id { get; set; }
+            public int Clicks { get; set; }
+            public int TypeGuid { get; set; }
+            public TestTypeInfo Type { get; set; }
+            public string Title { get; set; }
+            public DateTime CreateTime { get; set; }
+        }
+        class TestTypeInfo
+        {
+            public int Guid { get; set; }
+            public int ParentId { get; set; }
+            public TestTypeParentInfo Parent { get; set; }
+            public string Name { get; set; }
+        }
+        class TestTypeParentInfo
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+
+            public List<TestTypeInfo> Types { get; set; }
+        }
+        [Fact]
+        public void Zero()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > 0)
+        }
+        [Fact]
+        public void MinValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay > TimeSpan.MinValue).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) > -922337203685477580)
+        }
+        [Fact]
+        public void MaxValue()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay < TimeSpan.MaxValue).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) < 922337203685477580)
+        }
+        [Fact]
+        public void Days()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Days == 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 86400000000) = 0)
+        }
+        [Fact]
+        public void Hours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Hours > 0).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 3600000000) mod 24 > 0)
+        }
+        [Fact]
+        public void Milliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Milliseconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000 mod 1000) > 0)
+        }
+        [Fact]
+        public void Minutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Minutes > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 60000000 mod 60) > 0)
+        }
+        [Fact]
+        public void Seconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Seconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) div 1000000 mod 60) > 0)
+        }
+        [Fact]
+        public void Ticks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Ticks > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) * 10) > 0)
+        }
+        [Fact]
+        public void TotalDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalDays > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 86400000000) > 0)
+        }
+        [Fact]
+        public void TotalHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalHours > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 3600000000) > 0)
+        }
+        [Fact]
+        public void TotalMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMilliseconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000) > 0)
+        }
+        [Fact]
+        public void TotalMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalMinutes > 0).ToSql());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 60000000) > 0)
+        }
+        [Fact]
+        public void TotalSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.TotalSeconds > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) / 1000000) > 0)
+        }
+        [Fact]
+        public void Add()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Add(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) + (1 * 86400000000)) > 0)
+        }
+        [Fact]
+        public void Subtract()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Subtract(TimeSpan.FromDays(1)) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) - (1 * 86400000000)) > 0)
+        }
+        [Fact]
+        public void CompareTo()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.CompareTo(TimeSpan.FromDays(1)) > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+        }
+        [Fact]
+        public void this_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.Equals(TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void this_ToString()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => a.CreateTime.TimeOfDay.ToString() == "ssss").ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') = 'ssss')
+        }
+
+        [Fact]
+        public void TimeSpan_Compare()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Compare(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1)) > 0).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) - ((1 * 86400000000))) > 0)
+        }
+        [Fact]
+        public void TimeSpan_Equals()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromDays()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromDays(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 86400000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromHours()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromHours(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 3600000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromMilliseconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMilliseconds(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000)))
+        }
+        [Fact]
+        public void TimeSpan_FromMinutes()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromMinutes(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 60000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromSeconds()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromSeconds(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 * 1000000)))
+        }
+        [Fact]
+        public void TimeSpan_FromTicks()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Equals(a.CreateTime.TimeOfDay, TimeSpan.FromTicks(1))).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE ((timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000) = (1 / 10)))
+        }
+        [Fact]
+        public void TimeSpan_Parse()
+        {
+            var data = new List<object>();
+            data.Add(select.Where(a => TimeSpan.Parse(a.CreateTime.TimeOfDay.ToString()) > TimeSpan.Zero).ToList());
+            //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 
+            //FROM `tb_topic` a 
+            //WHERE (cast(date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') as signed) > 0)
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs
new file mode 100644
index 00000000..748bdf63
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs
@@ -0,0 +1,93 @@
+using FreeSql.DataAnnotations;
+using Microsoft.Data.Sqlite;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Xunit;
+
+[Table(Name = "TestTypeInfoT1")]
+class TestTypeInfo
+{
+    [Column(IsIdentity = true)]
+    public int Guid { get; set; }
+    public int ParentId { get; set; }
+    public TestTypeParentInfo Parent { get; set; }
+    public string Name { get; set; }
+}
+
+[Table(Name = "TestTypeParentInfoT1")]
+class TestTypeParentInfo
+{
+    [Column(IsIdentity = true)]
+    public int Id { get; set; }
+    public string Name { get; set; }
+
+    public int ParentId { get; set; }
+    public TestTypeParentInfo Parent { get; set; }
+    public ICollection<TestTypeParentInfo> Childs { get; set; }
+
+    public List<TestTypeInfo> Types { get; set; }
+}
+
+[Table(Name = "TestInfoT1")]
+class TestInfo
+{
+    [Column(IsIdentity = true, IsPrimary = true)]
+    public int Id { get; set; }
+    public int TypeGuid { get; set; }
+    public TestTypeInfo Type { get; set; }
+    public string Title { get; set; }
+    public DateTime CreateTime { get; set; }
+}
+
+public partial class Song
+{
+    [Column(IsIdentity = true)]
+    public int Id { get; set; }
+    public DateTime? Create_time { get; set; }
+    public bool? Is_deleted { get; set; }
+    public string Title { get; set; }
+    public string Url { get; set; }
+
+    public virtual ICollection<Tag> Tags { get; set; }
+}
+public partial class Song_tag
+{
+    public int Song_id { get; set; }
+    public virtual Song Song { get; set; }
+
+    public int Tag_id { get; set; }
+    public virtual Tag Tag { get; set; }
+}
+public partial class Tag
+{
+    [Column(IsIdentity = true)]
+    public int Id { get; set; }
+    public int? Parent_id { get; set; }
+    public virtual Tag Parent { get; set; }
+
+    public decimal? Ddd { get; set; }
+    public string Name { get; set; }
+
+    public virtual ICollection<Song> Songs { get; set; }
+    public virtual ICollection<Tag> Tags { get; set; }
+}
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test()
+    {
+        string dataSubDirectory = Path.Combine(AppContext.BaseDirectory);
+
+        if (!Directory.Exists(dataSubDirectory))
+            Directory.CreateDirectory(dataSubDirectory);
+
+        AppDomain.CurrentDomain.SetData("DataDirectory", dataSubDirectory);
+        using (var connection = new SqliteConnection("Data Source=|DataDirectory|local.db"))
+        {
+            connection.Open();
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/g.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/g.cs
new file mode 100644
index 00000000..f59e8586
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/g.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+
+public class g
+{
+
+    static Lazy<IFreeSql> sqliteLazy = new Lazy<IFreeSql>(() =>
+    {
+
+        string dataSubDirectory = Path.Combine(AppContext.BaseDirectory);
+
+        if (!Directory.Exists(dataSubDirectory))
+            Directory.CreateDirectory(dataSubDirectory);
+
+        AppDomain.CurrentDomain.SetData("DataDirectory", dataSubDirectory);
+
+        var fsql = new FreeSql.FreeSqlBuilder()
+                .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|local.db")
+                //.UseConnectionFactory(FreeSql.DataType.Sqlite, () =>
+                //{
+                //    var conn = new System.Data.SQLite.SQLiteConnection(@"Data Source=|DataDirectory|\document.db;Pooling=true;");
+                //    //conn.Open();
+                //    //var cmd = conn.CreateCommand();
+                //    //cmd.CommandText = $"attach database [xxxtb.db] as [xxxtb];\r\n";
+                //    //cmd.ExecuteNonQuery();
+                //    //cmd.Dispose();
+                //    return conn;
+                //})
+                .UseAutoSyncStructure(true)
+                //.UseGenerateCommandParameterWithLambda(true)
+                .UseLazyLoading(true)
+                .UseMonitorCommand(
+                    cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
+                                                                                                                     //, (cmd, traceLog) => Console.WriteLine(traceLog)
+                    )
+                .Build();
+
+        return fsql;
+    }
+   );
+    public static IFreeSql sqlite => sqliteLazy.Value;
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/SqlConnectionExtensionsTest.cs b/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/SqlConnectionExtensionsTest.cs
index 945af494..4d3f022f 100644
--- a/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/SqlConnectionExtensionsTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/SqlConnectionExtensionsTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 namespace FreeSql.Tests.AdoNetExtensions.SqlConnectionExtensions {
 	public class Methods {
 
-		string _connectString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=5";
+		string _connectString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=5;TrustServerCertificate=true";
 
 		public Methods() {
 			g.sqlserver.CodeFirst.SyncStructure<TestConnectionExt>();
diff --git a/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickHouseTest1.cs b/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickHouseTest1.cs
new file mode 100644
index 00000000..a6a26d05
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests/ClickHouse/ClickHouseTest1.cs
@@ -0,0 +1,319 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+using System.Linq;
+using System.Collections;
+using System.Diagnostics;
+using XY.Model.Business;
+using System.ComponentModel.DataAnnotations;
+using FreeSql.DataAnnotations;
+
+namespace FreeSql.Tests.MySql
+{
+    public class ClickHouseTest1
+    {
+        private class TestAuditValue
+        {
+            [FreeSql.DataAnnotations.Column(IsPrimary = true)]
+            public long Id { get; set; }
+
+            [Now]
+            public DateTime CreateTime { get; set; }
+
+            [FreeSql.DataAnnotations.Column(IsNullable = true)]
+            public string Name { get; set; }
+
+            [FreeSql.DataAnnotations.Column(IsNullable = false)]
+            public int Age { get; set; }
+
+            public bool State { get; set; }
+
+            [FreeSql.DataAnnotations.Column(IsNullable = true)]
+            public bool Enable { get; set; }
+
+            public DateTime? UpdateTime { get; set; }
+
+            public int? Points { get; set; }
+        }
+
+        [FreeSql.DataAnnotations.Table(Name = "ClickHouseTest")]
+        public class TestClickHouse
+        {
+            [FreeSql.DataAnnotations.Column(IsPrimary = true, IsIdentity = true)]
+            [Now]
+            public long Id { get; set; }
+
+            public string Name { get; set; }
+            public Decimal Money { get; set; }
+        }
+
+        private class NowAttribute : Attribute
+        { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var id = BitConverter.ToInt64(Guid.NewGuid().ToByteArray(), 0);
+            var item = new TestClickHouse();
+            item.Id = id;
+            item.Name = "李四";
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+            {
+                if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                    e.Value = BitConverter.ToInt64(Guid.NewGuid().ToByteArray(), 0);
+            };
+            g.clickHouse.Aop.AuditValue += audit;
+
+            g.clickHouse.Insert(item).ExecuteAffrows();
+
+            g.clickHouse.Aop.AuditValue -= audit;
+        }
+
+        [Fact]
+        public void CreateTalbe()
+        {
+            g.clickHouse.CodeFirst.SyncStructure<TestAuditValue>();
+        }
+
+        [Fact]
+        public void TestInsert()
+        {
+            Stopwatch stopwatch = new Stopwatch();
+            var fsql = g.clickHouse;
+            List<TestClickHouse> list = new List<TestClickHouse>();
+            List<CollectDataEntity> list1 = new List<CollectDataEntity>();
+            var date = DateTime.Now;
+            for (int i = 1; i < 1000000; i++)
+            {
+                //list.Add(new TestClickHouse
+                //{
+                //     Id=i, Name=i.ToString()
+                //});
+
+                list1.Add(new CollectDataEntity
+                {
+                    Id = new Random().Next(),
+                    CollectTime = DateTime.Now,
+                    DataFlag = "1",
+                    EquipmentCode = "11",
+                    Guid = "11111",
+                    UnitStr = "111",
+                    PropertyCode = "1111"
+                });
+            }
+            fsql.Delete<CollectDataEntity>().Where(t => 1 == 1).ExecuteAffrows();
+            stopwatch.Start();
+            var insert = fsql.Insert(list1);
+            stopwatch.Stop();
+            Debug.WriteLine("审计数据用时：" + stopwatch.ElapsedMilliseconds.ToString());
+            stopwatch.Restart();
+            insert.ExecuteAffrows();
+            //fsql.GetRepository<CollectDataEntity>().Insert(list1);
+            stopwatch.Stop();
+            Debug.WriteLine("转换并插入用时：" + stopwatch.ElapsedMilliseconds.ToString());
+            //var items = fsql.Select<TestClickHouse>().Where(o=>o.Id>900).OrderByDescending(o=>o.Id).ToList();
+            //Assert.Equal(100, items.Count);
+        }
+
+        [Fact]
+        public void TestPage()
+        {
+            var fsql = g.clickHouse;
+
+            var list = fsql.Select<TestClickHouse>()
+                .Page(1, 100)
+                .Where(o => o.Id > 200 && o.Id < 500)
+                .Count(out var count).ToList();
+            //Assert.Equal(100, list.Count);
+        }
+
+        [Fact]
+        public void TestDelete()
+        {
+            var fsql = g.clickHouse;
+            var count1 = fsql.Select<TestClickHouse>().Count();
+            fsql.Delete<TestClickHouse>().Where(o => o.Id < 500).ExecuteAffrows();
+            var count2 = fsql.Select<TestClickHouse>().Count();
+            //Assert.NotEqual(count1, count2);
+        }
+
+        [Fact]
+        public void TestUpdate()
+        {
+            var fsql = g.clickHouse;
+            fsql.Update<TestClickHouse>().Where(o => o.Id > 900)
+                .Set(o => o.Name, "修改后的值")
+                .ExecuteAffrows();
+        }
+
+        [Fact]
+        public void TestRepositorySelect()
+        {
+            var fsql = g.clickHouse;
+            var list = fsql.GetRepository<TestClickHouse>().Where(o => o.Id > 900)
+                .ToList();
+        }
+
+        [Fact]
+        public void TestRepositoryInsert()
+        {
+            var fsql = g.clickHouse;
+            long id = BitConverter.ToInt64(Guid.NewGuid().ToByteArray(), 0);
+            var list = fsql.GetRepository<TestClickHouse>().Insert(new TestClickHouse { Id = id, Name = "张三" });
+            var data = fsql.GetRepository<TestClickHouse, long>().Get(id);
+        }
+
+        [Fact]
+        public void TestDateTime()
+        {
+            var fsql = g.clickHouse;
+            long id = BitConverter.ToInt64(Guid.NewGuid().ToByteArray(), 0);
+            DateTime createTime = DateTime.Now;
+            fsql.Insert(new TestAuditValue
+            {
+                Id = id,
+                CreateTime = createTime,
+                Age = 18,
+                Name = "张三"
+            }).ExecuteAffrows();
+
+            var date1 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime == createTime)
+                .ToList();
+            var date2 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.Date == createTime.Date)
+                .ToList();
+            var date3 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.Year == createTime.Year)
+                .ToList();
+            var date4 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.Month == createTime.Month)
+                .ToList();
+            var date5 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.Second == createTime.Second)
+                .ToList();
+            var date6 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.Millisecond == createTime.Millisecond)
+                .ToList();
+            var date7 = fsql.GetRepository<TestAuditValue>().Where(o => o.CreateTime.AddSeconds(10) < createTime)
+                .ToList();
+        }
+
+        [Fact]
+        public void TestUpdateTime()
+        {
+            var fsql = g.clickHouse;
+            var state = fsql.GetRepository<TestAuditValue>().UpdateDiy.Set(o => o.UpdateTime, DateTime.Now).Where(o => 1 == 1).ExecuteAffrows();
+            //var state1 = fsql.GetRepository<TestAuditValue>().UpdateDiy.Set(o => o.UpdateTime, null).Where(o => 1 == 1).ExecuteAffrows();
+        }
+
+        [Fact]
+        public void TestRepositoryUpdateTime()
+        {
+            Stopwatch stopwatch = new Stopwatch();
+            var fsql = g.clickHouse;
+            var repository = fsql.GetRepository<TestAuditValue>();
+            List<TestAuditValue> list = new List<TestAuditValue>();
+            for (int i = 1; i < 5; i++)
+            {
+                list.Add(new TestAuditValue
+                {
+                    Id = new Random().Next(),
+                    Age = 1,
+                    Name = i.ToString(),
+                    State = true,
+                    CreateTime = DateTime.Now,
+                    UpdateTime = DateTime.Now,
+                    Enable = false
+                });
+            }
+            list = repository.Insert(list);
+            //var list = repository.Select.ToList();
+            list.ForEach(o => o.UpdateTime = DateTime.Now);
+            list.ForEach(o => o.Enable = true);
+            stopwatch.Start();
+            repository.Update(list);
+            stopwatch.Stop();
+            Debug.WriteLine("更新用时：" + stopwatch.ElapsedMilliseconds.ToString());
+        }
+
+        [Fact]
+        public async void TestInsertUpdateData()
+        {
+            //g.clickHouse.CodeFirst.SyncStructure<CollectDataEntity>();
+            Stopwatch stopwatch = new Stopwatch();
+            var fsql = g.clickHouse;
+            var repository = fsql.GetRepository<CollectDataEntity>();
+            await repository.DeleteAsync(o => o.Id > 0);
+            List<CollectDataEntity> tables = new List<CollectDataEntity>();
+            for (int i = 1; i < 3; i++)
+            {
+                tables.Add(new CollectDataEntity
+                {
+                    Id = new Random().Next(),
+                    CollectTime = DateTime.Now,
+                    DataFlag = "1",
+                    EquipmentCode = "11",
+                    UnitStr = "111",
+                    PropertyCode = "1111",
+                    NumericValue = 1111.1119999912500M
+                });
+            }
+
+            var insert = repository.Orm.Insert(tables);
+            insert.ExecuteAffrows();
+            var list = repository.Orm.Select<CollectDataEntity>().ToList();
+            //var list = repository.Insert(tables);
+            //var list = repository.Select.ToList();
+            //list.ForEach(o=>o.EquipmentCode = "666");
+            //stopwatch.Start();
+            //await repository.UpdateAsync(list);
+            //stopwatch.Stop();
+            Debug.WriteLine("更新用时：" + stopwatch.ElapsedMilliseconds.ToString());
+        }
+
+        [Fact]
+        public async void TestInsertDecimalData()
+        {
+            //g.clickHouse.CodeFirst.SyncStructure<CollectDataEntity>();
+            Stopwatch stopwatch = new Stopwatch();
+            var fsql = g.clickHouse;
+            var repository = fsql.GetRepository<CollectDataEntity>();
+            await repository.DeleteAsync(o => o.Id > 0);
+
+            var insert = repository.Insert(new CollectDataEntity
+            {
+                Id = new Random().Next(),
+                CollectTime = DateTime.Now,
+                DataFlag = "1",
+                EquipmentCode = "11",
+                UnitStr = "111",
+                PropertyCode = "1111",
+                NumericValue = 1111.1119999912500M
+            });
+            var list = repository.Orm.Select<CollectDataEntity>().ToList();
+            //var list = repository.Insert(tables);
+            //var list = repository.Select.ToList();
+            //list.ForEach(o=>o.EquipmentCode = "666");
+            //stopwatch.Start();
+            //await repository.UpdateAsync(list);
+            //stopwatch.Stop();
+            Debug.WriteLine("更新用时：" + stopwatch.ElapsedMilliseconds.ToString());
+        }
+
+        internal class Entity
+        {
+            [Required]
+            public string Id { get; set; }
+
+            [Column(StringLength = -2)]
+            public string Content { get; set; }
+        }
+
+        [Fact]
+        public void TestInsertNoneParameter()
+        {
+            var json = "[{\"date\":\"2021-12-19T02:47:53.4365075 08:00\",\"temperatureC\":6,\"temperatureF\":42,\"summary\":\"Balmy\"},{\"date\":\"2021-12-20T02:47:53.4366893 08:00\",\"temperatureC\":36,\"temperatureF\":96,\"summary\":\"Bracing\"},{\"date\":\"2021-12-21T02:47:53.4366903 08:00\",\"temperatureC\":-15,\"temperatureF\":6,\"summary\":\"Bracing\"},{\"date\":\"2021-12-22T02:47:53.4366904 08:00\",\"temperatureC\":14,\"temperatureF\":57,\"summary\":\"Cool\"},{\"date\":\"2021-12-23T02:47:53.4366905 08:00\",\"temperatureC\":29,\"temperatureF\":84,\"summary\":\"Mild\"}]";
+            var data = new Entity { Id = Guid.NewGuid().ToString(), Content = json };
+
+            var fsql = g.clickHouse;
+            fsql.Insert(data).NoneParameter().ExecuteAffrows();
+        }
+    }
+}
\ No newline at end of file
diff --git a/FreeSql.Tests/FreeSql.Tests/ClickHouse/CollectDataEntity.cs b/FreeSql.Tests/FreeSql.Tests/ClickHouse/CollectDataEntity.cs
new file mode 100644
index 00000000..0e8548e1
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests/ClickHouse/CollectDataEntity.cs
@@ -0,0 +1,168 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System;
+using System.ComponentModel;
+namespace XY.Model.Business
+{
+    /// <summary>
+    /// 实时数据
+    /// </summary>
+    [Table(Name = "CollectData")]
+    [Index("idx_{tablename}_01", nameof(Guid), true)]
+    public partial class CollectDataEntity
+    {
+
+        /// <summary>
+        /// Guid
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string Guid { get; set; }
+
+        /// <summary>
+        /// 租户Id
+        /// </summary>
+        [Description("租户Id")]
+        [Column(CanUpdate = false)]
+        public virtual long? TenantId { get; set; }
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        [Description("版本")]
+        [Column(IsVersion = false)]
+        public long Version { get; set; }
+
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        [Description("是否删除")]
+        [Column()]
+        public bool IsDeleted { get; set; } = false;
+
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        [Description("创建者Id")]
+        [Column(CanUpdate = false)]
+        public long? CreatedUserId { get; set; }
+
+        /// <summary>
+        /// 创建者
+        /// </summary>
+        [Description("创建者")]
+        [Column(CanUpdate = false, StringLength = 50)]
+        public string CreatedUserName { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Description("创建时间")]
+        [Column(CanUpdate = false, ServerTime = DateTimeKind.Local)]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 修改者Id
+        /// </summary>
+        [Description("修改者Id")]
+        [Column(CanInsert = false)]
+        public long? ModifiedUserId { get; set; }
+
+        /// <summary>
+        /// 修改者
+        /// </summary>
+        [Description("修改者")]
+        [Column(CanInsert = false, StringLength = 50)]
+        public string ModifiedUserName { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        [Description("修改时间")]
+        [Column(CanInsert = false, ServerTime = DateTimeKind.Local)]
+        public DateTime? ModifiedTime { get; set; }
+        /// <summary>
+        /// 数据标识
+        /// </summary>
+        [Description("数据标识")]
+        [Column(CanInsert = false, StringLength = 2)]
+        public string DataFlag { get; set; }
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Description("主键Id")]
+        [Column(Position = 1)]
+        public long Id { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string EquipmentCode { get; set; }
+
+        /// <summary>
+        /// 数据编号，如为空使用默认数据
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string PropertyCode { get; set; }
+        /// <summary>
+        ///  数据名称，如为空使用默认数据
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// 数值或状态是否变更
+        /// </summary>
+        public bool IsValueOrStateChanged { get; set; }
+
+        /// <summary>
+        /// 采集数值
+        /// </summary>
+        [Column(StringLength = 18)]
+        public decimal? NumericValue { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column(StringLength = 200)]
+        public string Remark { get; set; }
+    
+        /// <summary>
+        /// 服务标记
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string ServiceFlag { get; set; }
+      
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string StrState { get; set; }
+    
+        /// <summary>
+        /// 文本数值
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string StrValue { get; set; }
+    
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [Column(StringLength = 10)]
+        public string UnitStr { get; set; }
+    
+        /// <summary>
+        /// 采集时间
+        /// </summary>
+        public DateTime CollectTime { get; set; }
+
+
+        public string FieldKey
+        {
+            get
+            {
+                return EquipmentCode +"_"+ PropertyCode;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs
index 3929e55d..eea8403d 100644
--- a/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Dameng/Curd/DamengInsertTest.cs
@@ -22,6 +22,37 @@ namespace FreeSql.Tests.Dameng
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.dameng;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_0, :name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT ALL
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_0, :name_0)
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_1, :name_1)
+ SELECT 1 FROM DUAL", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT ALL
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(2, 'yyyy')
+ SELECT 1 FROM DUAL", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/DataContext/SqlServer/SqlServerFixture.cs b/FreeSql.Tests/FreeSql.Tests/DataContext/SqlServer/SqlServerFixture.cs
index 3177a215..1a59ff84 100644
--- a/FreeSql.Tests/FreeSql.Tests/DataContext/SqlServer/SqlServerFixture.cs
+++ b/FreeSql.Tests/FreeSql.Tests/DataContext/SqlServer/SqlServerFixture.cs
@@ -11,7 +11,7 @@ namespace FreeSql.Tests.DataContext.SqlServer
         public SqlServerFixture()
         {
             sqlServerLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
-             .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=2")
+             .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=2;TrustServerCertificate=true")
               //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=(localdb)\\mssqllocaldb;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=10")
               .UseAutoSyncStructure(true)
               .UseLazyLoading(true)
diff --git a/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs
index 1d7d3161..8bfe7d5f 100644
--- a/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Firebird/Curd/FirebirdInsertTest.cs
@@ -22,6 +22,35 @@ namespace FreeSql.Tests.Firebird
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.firebird;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") SELECT FIRST 1 @id_0, @name_0 FROM rdb$database 
+UNION ALL
+ SELECT FIRST 1 @id_1, @name_1 FROM rdb$database", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") SELECT FIRST 1 1, 'xxxx' FROM rdb$database 
+UNION ALL
+ SELECT FIRST 1 2, 'yyyy' FROM rdb$database", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
index 7497c508..8d8c874a 100644
--- a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
+++ b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
@@ -14,16 +14,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dapper" Version="2.0.123" />
-        <PackageReference Include="IdleBus" Version="1.5.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+		<PackageReference Include="Dapper" Version="2.0.123" />
+		<PackageReference Include="IdleBus" Version="1.5.2" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
     </ItemGroup>
 
     <ItemGroup>
@@ -37,6 +38,7 @@
       <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.Linq\FreeSql.Extensions.Linq.csproj" />
       <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
       <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+      <ProjectReference Include="..\..\Providers\FreeSql.Provider.ClickHouse\FreeSql.Provider.ClickHouse.csproj" />
       <ProjectReference Include="..\..\Providers\FreeSql.Provider.Dameng\FreeSql.Provider.Dameng.csproj" />
       <ProjectReference Include="..\..\Providers\FreeSql.Provider.Firebird\FreeSql.Provider.Firebird.csproj" />
       <ProjectReference Include="..\..\Providers\FreeSql.Provider.KingbaseES\FreeSql.Provider.KingbaseES.csproj" />
diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.xml b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.xml
index c56f837d..96d17f87 100644
--- a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.xml
+++ b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.xml
@@ -4,6 +4,11 @@
         <name>FreeSql.Tests</name>
     </assembly>
     <members>
+        <member name="M:FreeSql.Tests.MySql.MySqlCodeFirstTest.Tb_alltype.Save">
+            <summary>
+            保存或添加，如果主键有值则尝试 Update，如果影响的行为 0 则尝试 Insert
+            </summary>
+        </member>
         <member name="P:FreeSql.Tests.Firebird.FirebirdCodeFirstTest.AddUniquesInfo.id">
             <summary>
             编号
@@ -287,11 +292,6 @@
             修改人
             </summary>
         </member>
-        <member name="M:FreeSql.Tests.MySql.MySqlCodeFirstTest.Tb_alltype.Save">
-            <summary>
-            保存或添加，如果主键有值则尝试 Update，如果影响的行为 0 则尝试 Insert
-            </summary>
-        </member>
         <member name="T:FreeSql.Tests.SqlServer.SqlServerCodeFirstTest.tbdot01">
             <summary>
             表中带点
@@ -945,6 +945,126 @@
             新打印模块
             </summary>
         </member>
+        <member name="T:XY.Model.Business.CollectDataEntity">
+            <summary>
+            实时数据
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.Guid">
+            <summary>
+            Guid
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.Version">
+            <summary>
+            版本
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.IsDeleted">
+            <summary>
+            是否删除
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.CreatedUserId">
+            <summary>
+            创建者Id
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.CreatedUserName">
+            <summary>
+            创建者
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.ModifiedUserId">
+            <summary>
+            修改者Id
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.ModifiedUserName">
+            <summary>
+            修改者
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.ModifiedTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.DataFlag">
+            <summary>
+            数据标识
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.Id">
+            <summary>
+            主键Id
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.EquipmentCode">
+            <summary>
+            设备编号
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.PropertyCode">
+            <summary>
+            数据编号，如为空使用默认数据
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.PropertyName">
+            <summary>
+             数据名称，如为空使用默认数据
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.IsValueOrStateChanged">
+            <summary>
+            数值或状态是否变更
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.NumericValue">
+            <summary>
+            采集数值
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.ServiceFlag">
+            <summary>
+            服务标记
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.StrState">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.StrValue">
+            <summary>
+            文本数值
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.UnitStr">
+            <summary>
+            单位
+            </summary>
+        </member>
+        <member name="P:XY.Model.Business.CollectDataEntity.CollectTime">
+            <summary>
+            采集时间
+            </summary>
+        </member>
         <member name="T:SaleIDO.Entity.Storeage.AdjustPriceOrder">
             <summary>
             调价单
diff --git a/FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs b/FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs
new file mode 100644
index 00000000..250bae5c
--- /dev/null
+++ b/FreeSql.Tests/FreeSql.Tests/Internal/UtilsTest.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Xunit;
+
+namespace FreeSql.Tests.Internal
+{
+
+    public class UtilsTest
+    {
+        [Fact]
+        public void TestGetDbParamtersByObject()
+        {
+            var ps = FreeSql.Internal.Utils.
+                   GetDbParamtersByObject<DbParameter>("select @p",
+                   new { p = (DbParameter)new SqlParameter() { ParameterName = "p", Value = "test" } },
+                   "@",
+                   (name, type, value) =>
+                      {
+                          if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
+                          var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
+                          return ret;
+                      });
+            Assert.Single(ps);
+            Assert.Equal("test", ps[0].Value);
+            Assert.Equal("p", ps[0].ParameterName);
+            Assert.Equal(typeof(SqlParameter), ps[0].GetType());
+
+
+            var ps2 = FreeSql.Internal.Utils.
+                   GetDbParamtersByObject<DbParameter>("select @p",
+                   new Dictionary<string, DbParameter> { { "p", (DbParameter)new SqlParameter() { ParameterName = "p", Value = "test" } } },
+                   "@",
+                   (name, type, value) =>
+                   {
+                       if (value?.Equals(DateTime.MinValue) == true) value = new DateTime(1970, 1, 1);
+                       var ret = new SqlParameter { ParameterName = $"@{name}", Value = value };
+                       return ret;
+                   });
+            Assert.Single(ps2);
+            Assert.Equal("test", ps2[0].Value);
+            Assert.Equal("p", ps2[0].ParameterName);
+            Assert.Equal(typeof(SqlParameter), ps2[0].GetType());
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs
index 3e8fcf0e..3eedeada 100644
--- a/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/MsAccess/Curd/MsAccessInsertTest.cs
@@ -22,6 +22,27 @@ namespace FreeSql.Tests.MsAccess
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.msaccess;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(1, 'xxxx')", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(1, 'xxxx'), (2, 'yyyy')", sql2);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs
index ff75484b..df4eb1f4 100644
--- a/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/MySql/Curd/MySqlInsertTest.cs
@@ -30,6 +30,31 @@ namespace FreeSql.Tests.MySql
         }
         enum TestEnumInserTbType { str1, biggit, sum211 }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.mysql;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(?id_0, ?name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(?id_0, ?name_0), (?id_1, ?name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO `table1`(`id`, `name`) VALUES(1, 'xxxx'), (2, 'yyyy')", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
index 7134cc76..76e2ed88 100644
--- a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
@@ -11,6 +11,49 @@ namespace FreeSql.Tests.MySql
 {
     public class MySqlCodeFirstTest
     {
+        public enum EnumTest009
+        {
+            A, B, C
+        }
+
+        [Flags]
+        public enum SetTest009
+        {
+            A = 1, B = 2, C = 4
+        }
+
+        public class TestTable009
+        {
+            [Column(IsPrimary = true, IsIdentity = true)]
+            public int Id { get; set; }
+
+            public EnumTest009 ColEnumTest { get; set; }
+
+            public SetTest009 ColSetTest { get; set; }
+        }
+
+        [Fact]
+        public void TestEnumToSet009()
+        {
+            var fsql = g.mysql;
+            //����
+            //insert into TestTable(ColEnumTest,ColSetTest) values('B','A,B');
+            //insert into TestTable(ColEnumTest,ColSetTest) values(1,3);
+            var sql1 = fsql.Insert<TestTable009>().NoneParameter().AppendData(new TestTable009
+            {
+                ColEnumTest = EnumTest009.B,
+                ColSetTest = SetTest009.A | SetTest009.B
+            }).ToSql();
+            Assert.Equal("INSERT INTO `TestTable009`(`ColEnumTest`, `ColSetTest`) VALUES('B', 'A,B')", sql1);
+
+            //��ѯ ��չ���� contains
+            //select * from TestTable t where FIND_IN_SET('A',t.ColSetTest)>0
+            //select * from TestTable t where t.ColSetTest&1
+            var sql2 = fsql.Select<TestTable009>().Where(i => (i.ColSetTest & SetTest009.A) == SetTest009.A).ToSql();
+            var sql3 = fsql.Select<TestTable009>().Where(i => (i.ColSetTest & SetTest009.C) == SetTest009.C).ToSql();
+        }
+
+
         [Fact]
         public void InsertUpdateParameter()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs
index 4c627ad7..6b75fa19 100644
--- a/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Oracle/Curd/OracleInsertTest.cs
@@ -22,6 +22,37 @@ namespace FreeSql.Tests.Oracle
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.oracle;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_0, :name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT ALL
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_0, :name_0)
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(:id_1, :name_1)
+ SELECT 1 FROM DUAL", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT ALL
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')
+INTO ""TABLE1""(""ID"", ""NAME"") VALUES(2, 'yyyy')
+ SELECT 1 FROM DUAL", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
index 0803513d..6e05d833 100644
--- a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertTest.cs
@@ -22,6 +22,31 @@ namespace FreeSql.Tests.PostgreSQL
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.pgsql;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(@id_0, @name_0), (@id_1, @name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(1, 'xxxx'), (2, 'yyyy')", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLDbFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLDbFirstTest.cs
index bd7dfcb5..60840aca 100644
--- a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLDbFirstTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLDbFirstTest.cs
@@ -24,6 +24,17 @@ namespace FreeSql.Tests.PostgreSQL
         public void GetTableByName()
         {
             var fsql = g.pgsql;
+
+            fsql.Ado.ExecuteNonQuery(@"CREATE TABLE IF NOT EXISTS public.table_test
+(
+    id integer NOT NULL,
+    coin_list money[],
+    PRIMARY KEY (id)
+)");
+            var t111 = fsql.DbFirst.GetTableByName("table_test");
+            Assert.True(t111.Columns.Find(a => a.Name == "id").IsPrimary);
+            Assert.False(t111.Columns.Find(a => a.Name == "coin_list").IsPrimary);
+
             var t1 = fsql.DbFirst.GetTableByName("tb_alltype");
             var t2 = fsql.DbFirst.GetTableByName("public.tb_alltype");
             Assert.NotNull(t1);
diff --git a/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs
index e771cee9..f25ee748 100644
--- a/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/ShenTong/Curd/ShenTongInsertTest.cs
@@ -22,6 +22,31 @@ namespace FreeSql.Tests.ShenTong
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.shentong;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(@id_0, @name_0), (@id_1, @name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""TABLE1""(""ID"", ""NAME"") VALUES(1, 'xxxx'), (2, 'yyyy')", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs
index 7122c4fe..63fd18b2 100644
--- a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerInsertTest.cs
@@ -32,6 +32,60 @@ namespace FreeSql.Tests.SqlServer
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.sqlserver;
+            fsql.Delete<object>().AsTable("table1dict").Where("1=1").ExecuteAffrows();
+
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(@id_0, @name_0), (@id_1, @name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(1, N'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO [table1]([id], [name]) VALUES(1, N'xxxx'), (2, N'yyyy')", sql4);
+
+            Assert.Equal(1, fsql.InsertDict(dic).AsTable("table1dict").ExecuteAffrows());
+            Assert.Equal(1, fsql.DeleteDict(dic).AsTable("table1dict").ExecuteAffrows());
+            Assert.Equal(1, fsql.InsertDict(dic).AsTable("table1dict").NoneParameter().ExecuteAffrows());
+            Assert.Equal(1, fsql.DeleteDict(dic).AsTable("table1dict").ExecuteAffrows());
+
+            Assert.Equal(2, fsql.InsertDict(diclist).AsTable("table1dict").ExecuteAffrows());
+            Assert.Equal(2, fsql.DeleteDict(diclist).AsTable("table1dict").ExecuteAffrows());
+            Assert.Equal(2, fsql.InsertDict(diclist).AsTable("table1dict").NoneParameter().ExecuteAffrows());
+            Assert.Equal(2, fsql.DeleteDict(diclist).AsTable("table1dict").ExecuteAffrows());
+
+
+            var dicRet = fsql.InsertDict(dic).AsTable("table1dict").ExecuteInserted();
+            dicRet = fsql.DeleteDict(dic).AsTable("table1dict").ExecuteDeleted();
+            dicRet = fsql.InsertDict(dic).AsTable("table1dict").NoneParameter().ExecuteInserted();
+            dicRet = fsql.DeleteDict(dic).AsTable("table1dict").ExecuteDeleted();
+
+            dicRet = fsql.InsertDict(diclist).AsTable("table1dict").ExecuteInserted();
+            dicRet = fsql.DeleteDict(diclist).AsTable("table1dict").ExecuteDeleted();
+            dicRet = fsql.InsertDict(diclist).AsTable("table1dict").NoneParameter().ExecuteInserted();
+            dicRet = fsql.DeleteDict(diclist).AsTable("table1dict").ExecuteDeleted();
+
+            sql1 = fsql.InsertOrUpdateDict(dic).AsTable("table1").WherePrimary("id").ToSql();
+            sql2 = fsql.InsertOrUpdateDict(diclist).AsTable("table1").WherePrimary("id").ToSql();
+
+            sql1 = fsql.InsertOrUpdateDict(dic).AsTable("table1").WherePrimary("name").ToSql();
+            sql2 = fsql.InsertOrUpdateDict(diclist).AsTable("table1").WherePrimary("name").ToSql();
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs
index d3579aa0..cb06bf3e 100644
--- a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteInsertTest.cs
@@ -22,6 +22,31 @@ namespace FreeSql.Tests.Sqlite
             public DateTime CreateTime { get; set; }
         }
 
+        [Fact]
+        public void InsertDictionary()
+        {
+            var fsql = g.sqlite;
+            Dictionary<string, object> dic = new Dictionary<string, object>();
+            dic.Add("id", 1);
+            dic.Add("name", "xxxx");
+            var diclist = new List<Dictionary<string, object>>();
+            diclist.Add(dic);
+            diclist.Add(new Dictionary<string, object>
+            {
+                ["id"] = 2,
+                ["name"] = "yyyy"
+            });
+
+            var sql1 = fsql.InsertDict(dic).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(@id_0, @name_0)", sql1);
+            var sql2 = fsql.InsertDict(diclist).AsTable("table1").ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(@id_0, @name_0), (@id_1, @name_1)", sql2);
+            var sql3 = fsql.InsertDict(dic).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(1, 'xxxx')", sql3);
+            var sql4 = fsql.InsertDict(diclist).AsTable("table1").NoneParameter().ToSql();
+            Assert.Equal(@"INSERT INTO ""table1""(""id"", ""name"") VALUES(1, 'xxxx'), (2, 'yyyy')", sql4);
+        }
+
         [Fact]
         public void AppendData()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
index 815b7646..2d5ec8a6 100644
--- a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
@@ -1,12 +1,15 @@
 using FreeSql.DataAnnotations;
 using FreeSql.Internal.Model;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using Xunit;
+using FreeSql.Internal.CommonProvider;
 
 namespace FreeSql.Tests.Sqlite
 {
@@ -147,6 +150,7 @@ namespace FreeSql.Tests.Sqlite
             var dt1 = select.Limit(10).ToDataTable();
             var dt2 = select.Limit(10).ToDataTable("id, 111222");
             var dt3 = select.Limit(10).ToDataTable(a => new { a.Id, a.Type.Name, now = DateTime.Now });
+            var dt4 = select.Limit(10).ToDataTableByPropertyName(new[] { "a.Id", "a.Type.Name", "Title", "clicks" });
         }
         class TestDto
         {
@@ -366,6 +370,9 @@ namespace FreeSql.Tests.Sqlite
             var query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid);
             var sql = query.ToSql().Replace("\r\n", "");
             Assert.Equal("SELECT a.\"Id\", a.\"Clicks\", a.\"TypeGuid\", a__Type.\"Guid\", a__Type.\"ParentId\", a__Type.\"Name\", a.\"Title\", a.\"CreateTime\" FROM \"tb_topic22\" a LEFT JOIN \"TestTypeInfo\" a__Type ON a__Type.\"Guid\" = a.\"TypeGuid\"", sql);
+            (query as Select0Provider)._tables.Where(a => a.Table.Type == typeof(TestTypeInfo))
+                .First()
+                .Type = SelectTableInfoType.InnerJoin; 
             query.ToList();
 
             query = select.LeftJoin(a => a.Type.Guid == a.TypeGuid && a.Type.Name == "xxx");
@@ -682,6 +689,18 @@ namespace FreeSql.Tests.Sqlite
                 .Any()
                 ).Any()
             ).ToList();
+
+            sql2222 = select.Where(a =>
+                select.Where(b => b.Id == a.Id && 
+                    select
+                        .Where(c => c.Id == b.Id)
+                        .Where(d => d.Id == a.Id)
+                        .Where(e => e.Id == b.Id)
+                        .WhereIf(!sql2222.Any(), e => e.Id > 0)
+                        .WhereIf(sql2222.Any(), e => e.Id >= 0)
+                        .Any()
+                ).Any()
+            ).ToList();
         }
         [Fact]
         public void GroupBy()
@@ -693,6 +712,7 @@ namespace FreeSql.Tests.Sqlite
             .Having(a => a.Count() > 0 && a.Avg(a.Key.mod4) > 0 && a.Max(a.Key.mod4) > 0)
             .Having(a => a.Count() < 300 || a.Avg(a.Key.mod4) < 100)
             .OrderBy(a => a.Key.tt2)
+            .OrderByDescending(a => new { a.Key.tt2, a.Key.mod4 })
             .OrderByDescending(a => a.Count())
             .Offset(10)
             .Limit(2)
@@ -804,7 +824,17 @@ namespace FreeSql.Tests.Sqlite
         [Fact]
         public void OrderBy()
         {
-            var sql = select.OrderBy(a => new Random().NextDouble()).ToList();
+            var sql = select.OrderBy(a => new Random().NextDouble()).ToSql();
+
+            sql = select.OrderBy(a => a.Id).OrderBy(a => a.Title).OrderByDescending(a => a.CreateTime).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+ORDER BY a.""Id"", a.""Title"", a.""CreateTime"" DESC", sql);
+
+            sql = select.OrderBy(a => new { a.Id, a.Title }).OrderByDescending(a => a.CreateTime).ToSql();
+            Assert.Equal(@"SELECT a.""Id"", a.""Clicks"", a.""TypeGuid"", a.""Title"", a.""CreateTime"" 
+FROM ""tb_topic22"" a 
+ORDER BY a.""Id"", a.""Title"", a.""CreateTime"" DESC", sql);
         }
         [Fact]
         public void OrderByRandom()
@@ -1222,7 +1252,7 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
             //---- Select ----
 
             var at0 = g.sqlite.Select<TestInclude_OneToManyModel2>()
-                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 {  id = m3.id }))
+                .IncludeMany(a => a.childs.Where(m3 => m3.model2111Idaaa == a.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
                 .Where(a => a.model2id <= model1.id)
                 .ToList();
             var at001 = g.sqlite.Select<TestInclude_OneToManyModel2>()
@@ -1230,19 +1260,23 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                 .Where(a => a.model2id <= model1.id)
                 .ToList(a => new
                 {
-                    a.model2id, a.childs, childs2 = a.childs
+                    a.model2id,
+                    a.childs,
+                    childs2 = a.childs
                 });
 
             var at1 = g.sqlite.Select<TestInclude_OneToManyModel1>()
                 .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
                 .Where(a => a.id <= model1.id)
-                .ToList(); 
+                .ToList();
             var at111 = g.sqlite.Select<TestInclude_OneToManyModel1>()
                  .IncludeMany(a => a.model2.childs.Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
                  .Where(a => a.id <= model1.id)
                  .ToList(a => new
                  {
-                     a.id, a.model2.childs, childs2 = a.model2.childs
+                     a.id,
+                     a.model2.childs,
+                     childs2 = a.model2.childs
                  });
 
             var at2 = g.sqlite.Select<TestInclude_OneToManyModel1>()
@@ -1256,7 +1290,9 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                 .Where(a => a.id <= model1.id)
                 .ToList(a => new
                 {
-                    a.id, a.model2.childs, childs2 = a.model2.childs
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
                 });
 
             var at00 = g.sqlite.Select<TestInclude_OneToManyModel2>()
@@ -1268,7 +1304,9 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                 .Where(a => a.model2id <= model1.id)
                 .ToList(a => new
                 {
-                    a.model2id, a.childs, childs2 = a.childs
+                    a.model2id,
+                    a.childs,
+                    childs2 = a.childs
                 });
 
             var at11 = g.sqlite.Select<TestInclude_OneToManyModel1>()
@@ -1279,9 +1317,11 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                 .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }))
                 .Where(a => a.id <= model1.id)
                 .ToList(a => new
-                 {
-                     a.id, a.model2.childs, childs2 = a.model2.childs
-                 });
+                {
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
+                });
 
             var at22 = g.sqlite.Select<TestInclude_OneToManyModel1>()
                 .IncludeMany(a => a.model2.childs.Take(1).Where(m3 => m3.model2111Idaaa == a.model2.model2id).Select(m3 => new TestInclude_OneToManyModel3 { id = m3.id }),
@@ -1294,7 +1334,9 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                 .Where(a => a.id <= model1.id)
                 .ToList(a => new
                 {
-                    a.id, a.model2.childs, childs2 = a.model2.childs
+                    a.id,
+                    a.model2.childs,
+                    childs2 = a.model2.childs
                 });
         }
 
@@ -1713,7 +1755,9 @@ WHERE (((cast(a.""Id"" as character)) in (SELECT b.""Title""
                .Where(a => a.Id == song1.Id || a.Id == song2.Id || a.Id == song3.Id)
                .ToList(a => new
                {
-                   a.Id, a.Is_deleted, a.Tags
+                   a.Id,
+                   a.Is_deleted,
+                   a.Tags
                });
         }
 
@@ -2470,6 +2514,33 @@ ORDER BY a__Parent.""Name""", sql);
             Assert.Equal(@"SELECT a.""id"", a.""name"", a.""no"", a.""status"" 
 FROM ""ts_dyfilter_enum01"" a 
 WHERE ((not((a.""name"") LIKE '%testname01') OR not((a.""no"") LIKE '%testname01') OR not((a.""id"") LIKE '%testname01') OR a.""status"" = 2))", sql);
+
+            sql = fsql.Select<ts_dyfilter_enum01>().WhereDynamicFilter(JsonConvert.DeserializeObject<DynamicFilterInfo>(@"
+{
+  ""Logic"" : ""Or"",
+  ""Filters"" :
+  [
+    {
+      ""Field"" : ""MyRawSql FreeSql.Tests.Sqlite.DynamicFilterMyCustom,FreeSql.Tests"",
+      ""Operator"" : ""Custom"",
+      ""Value"" : ""(name,no) in (('testname01','testname01'))""
+    },
+    {
+      ""Field"" : ""no"",
+      ""Operator"" : ""NotEndsWith"",
+      ""Value"" : ""testname01""
+    },
+    {
+      ""Field"" : ""MyRawSql FreeSql.Tests.Sqlite.DynamicFilterMyCustom,FreeSql.Tests"",
+      ""Operator"" : ""Custom"",
+      ""Value"" : ""(id,status) in (('testname01','finished'))""
+    },
+  ]
+}
+")).ToSql();
+            Assert.Equal(@"SELECT a.""id"", a.""name"", a.""no"", a.""status"" 
+FROM ""ts_dyfilter_enum01"" a 
+WHERE (((name,no) in (('testname01','testname01')) OR not((a.""no"") LIKE '%testname01') OR (id,status) in (('testname01','finished'))))", sql);
         }
 
         class ts_dyfilter_enum01
@@ -2481,4 +2552,37 @@ WHERE ((not((a.""name"") LIKE '%testname01') OR not((a.""no"") LIKE '%testname01
         }
         public enum ts_dyfilter_enum01_status { staring, stoped, finished }
     }
+
+    public class DynamicFilterMyCustom
+    {
+        [DynamicFilterCustom]
+        public static string MyRawSql(string value) => value;
+
+        public static string TupleIn(string value)
+        {
+            var sb = new StringBuilder();
+            var array = JArray.Parse(value);
+            var row = 0;
+            foreach(JObject item in array)
+            {
+                if (row++ == 0)
+                {
+                    sb.Append("(");
+                    var propNames = item.Properties().Select(a => a.Name);
+                    sb.Append(string.Join(", ", propNames));
+                    sb.Append(") IN (");
+                }
+                if (row == array.Count - 1)
+                {
+                    sb.Append(")");
+                }
+                if (row > 1) sb.Append(", ");
+                sb.Append("(");
+                var propValues = item.Values().Select(a => a?.ToString().Replace("'", "''")); //注入处理
+                sb.Append(string.Join(", ", propValues));
+                sb.Append(")");
+            }
+            return sb.ToString();
+        }
+    }
 }
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs
index 63226af1..c5fc53c0 100644
--- a/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs
+++ b/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs
@@ -24,7 +24,7 @@ namespace FreeSql.Tests
     {
         public static T TryTo<T>(this string that)
         {
-            return (T)Internal.Utils.GetDataReaderValue(typeof(T), that);
+            return (T)FreeSql.Internal.Utils.GetDataReaderValue(typeof(T), that);
         }
 
         public static string FormatDateTime()
@@ -311,7 +311,7 @@ namespace FreeSql.Tests
             public TaskBuild Parent { get; set; }
         }
 
-        
+
 
         void parseExp(object sender, Aop.ParseExpressionEventArgs e)
         {
@@ -323,7 +323,7 @@ namespace FreeSql.Tests
                     if (callExp.Method.Name == "TryTo")
                     {
                         e.Result = Expression.Lambda(
-                            typeof(Func<>).MakeGenericType(callExp.Method.GetGenericArguments().FirstOrDefault()), 
+                            typeof(Func<>).MakeGenericType(callExp.Method.GetGenericArguments().FirstOrDefault()),
                             e.Expression).Compile().DynamicInvoke()?.ToString();
                         return;
                     }
@@ -464,10 +464,11 @@ namespace FreeSql.Tests
             emoji = g.sqlserver.Select<TestGuidId>().Where(a => a.Id == testemoji.Id).First();
             Assert.Equal("💐🌸💮🌹🌺🌻🌼🌷🌱🌿🍀", emoji.xxx);
 
-            var _model = new TestUpdateModel { 
-                F_EmpId = "xx11", 
-                F_RoleType = TestUpdateModelEnum.x2, 
-                F_UseType = TestUpdateModelEnum.x3 
+            var _model = new TestUpdateModel
+            {
+                F_EmpId = "xx11",
+                F_RoleType = TestUpdateModelEnum.x2,
+                F_UseType = TestUpdateModelEnum.x3
             };
             var testsql2008 = g.sqlserver.Update<TestUpdateModel>()
                 .Where(a => a.F_EmpId == _model.F_EmpId)
@@ -578,7 +579,7 @@ namespace FreeSql.Tests
 
             var gkjdjd = g.sqlite.Select<AuthorTest>().Where(a => a.Post.AsSelect().Count() > 0).ToList();
 
-            var testrunsql1 =  g.mysql.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();
+            var testrunsql1 = g.mysql.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();
             var testrunsql2 = g.pgsql.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();
             var testrunsql3 = g.sqlserver.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();
             var testrunsql4 = g.oracle.Select<TaskBuild>().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo<int>()).ToSql();
@@ -600,18 +601,18 @@ namespace FreeSql.Tests
 
             IFreeSql fsql = new FreeSql.FreeSqlBuilder()
               .UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=7")
-              .UseNameConvert(Internal.NameConvertType.PascalCaseToUnderscoreWithLower)
+              .UseNameConvert(FreeSql.Internal.NameConvertType.PascalCaseToUnderscoreWithLower)
               .UseNoneCommandParameter(true)
               .UseAutoSyncStructure(true) //自动同步实体结构到数据库
               .UseMonitorCommand(a => Trace.WriteLine(a.CommandText))
               .Build();
 
             var data = fsql.Select<Post>().ToList(r => new
-                {
-                    Id = r.Id,
-                    Name = r.AuthorId.ToString(),
-                    AuthorName = r.Author.Name,
-                });
+            {
+                Id = r.Id,
+                Name = r.AuthorId.ToString(),
+                AuthorName = r.Author.Name,
+            });
 
             //g.mysql.Aop.AuditValue += (s, e) =>
             //{
@@ -636,8 +637,8 @@ namespace FreeSql.Tests
                 .Include(a => a.MedicalRecord)
                 .ToSql();
 
-            var dkdkd = g.mysql.Select<TaskBuild>().AsTable((t,old) => "TaskBuild22")
-                .ToList< TestDto>(a => new TestDto()
+            var dkdkd = g.mysql.Select<TaskBuild>().AsTable((t, old) => "TaskBuild22")
+                .ToList<TestDto>(a => new TestDto()
                 {
                     Id = a.Id,
                     IsLeaf = g.mysql.Select<TaskBuild>().AsTable((t, old) => "TaskBuild22").Any(b => b.TemplatesId == a.Id)
@@ -645,13 +646,13 @@ namespace FreeSql.Tests
 
 
             var xxxkdkd = g.oracle.Select<Templates, TaskBuild>()
-                .InnerJoin((a,b) => true)
-                .Where((a,b) => (DateTime.Now - a.EditTime).TotalMinutes > 100)
-                .OrderBy((a,b) => g.oracle.Select<Templates>().Where(c => b.Id == c.Id2).Count())
+                .InnerJoin((a, b) => true)
+                .Where((a, b) => (DateTime.Now - a.EditTime).TotalMinutes > 100)
+                .OrderBy((a, b) => g.oracle.Select<Templates>().Where(c => b.Id == c.Id2).Count())
                 .ToSql();
-            
 
-            g.oracle.Aop.SyncStructureAfter += (s, e) => 
+
+            g.oracle.Aop.SyncStructureAfter += (s, e) =>
                 Trace.WriteLine(e.Sql);
 
             g.oracle.CodeFirst.SyncStructure<Class1>();
@@ -729,7 +730,7 @@ namespace FreeSql.Tests
                  .ToSql(a => new NewsArticleDto
                  {
                      ArticleTitle = a.Key,
-                      ChannelId = (int)a.Sum(a.Value.Item1.OptionsEntity04)
+                     ChannelId = (int)a.Sum(a.Value.Item1.OptionsEntity04)
                  });
 
             var testgrpsql2 = g.sqlite.Select<TaskBuild>()
@@ -1004,7 +1005,7 @@ namespace FreeSql.Tests
                     cou = b.Count(),
                     sum = b.Sum(b.Key.yyyy),
                     sum2 = b.Sum(b.Value.TypeGuid)
-                }); 
+                });
             var aggtolist22 = select
                  .GroupBy(a => new { a.Title, yyyy = string.Concat(a.CreateTime.Year, '-', a.CreateTime.Month) })
                  .ToDictionaryAsync(b => new
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest4.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest4.cs
index 60ce441b..daecf4ec 100644
--- a/FreeSql.Tests/FreeSql.Tests/UnitTest4.cs
+++ b/FreeSql.Tests/FreeSql.Tests/UnitTest4.cs
@@ -18,7 +18,7 @@ namespace FreeSql.Tests
         public void WithLambdaParameter01()
         {
             using (var fsql = new FreeSql.FreeSqlBuilder()
-                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=6")
+                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=6;TrustServerCertificate=true")
                 .UseAutoSyncStructure(true)
                 .UseGenerateCommandParameterWithLambda(true)
                 .UseMonitorCommand(
@@ -339,7 +339,7 @@ GROUP BY a.""code"", a.""seqid"", a.""name""", sql);
         public void SelectLambdaParameter()
         {
             using (var fsql = new FreeSql.FreeSqlBuilder()
-                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;min pool size=1;Max Pool Size=51")
+                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;min pool size=1;Max Pool Size=51;TrustServerCertificate=true")
                 .UseAutoSyncStructure(true)
                 .UseGenerateCommandParameterWithLambda(true)
                 .UseMonitorCommand(
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest5.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest5.cs
index 90f19686..a1db0c8d 100644
--- a/FreeSql.Tests/FreeSql.Tests/UnitTest5.cs
+++ b/FreeSql.Tests/FreeSql.Tests/UnitTest5.cs
@@ -16,6 +16,74 @@ namespace FreeSql.Tests
 {
     public class UnitTest5
     {
+        // DTO
+        public class TestDto
+        {
+            public decimal ratio { get; set; }
+            public bool is_lock { get; set; }
+        }
+        [Fact]
+        public void TestDoubleWhereBug()
+        {
+            var fsql = g.mysql;
+            // 测试例子
+            var test = new TestDto();
+            test.ratio = 2.1M;
+            var sql = fsql.Update<TestDto>().Set(m => new TestDto
+            {
+                is_lock = test.ratio < 1  //这里生成的SQL语句有问题 ratio = 0.9 或 1.9 或 2.1 等等都是生成的是1
+            }).Where(m => test.ratio < 1).ToSql();
+            Assert.Equal(@"UPDATE TestDto SET is_lock = 2.1 < 1
+WHERE (2.1 < 1)", sql);
+        }
+
+        [Fact]
+        public void TestLambdaParameterWhereIn()
+        {
+            using (var fsql = new FreeSql.FreeSqlBuilder()
+                .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\TestLambdaParameterWhereIn.db")
+                .UseAutoSyncStructure(true)
+                .UseGenerateCommandParameterWithLambda(true)
+                .UseLazyLoading(true)
+                .UseMonitorCommand(
+                    cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
+                    //, (cmd, traceLog) => Console.WriteLine(traceLog)
+                    )
+                .Build())
+            {
+
+                string dwId = "123456";
+                string yhId = "654321";
+
+                var sql = fsql.Select<wygl_wygs_gzry_wyglqyModelTest1>()
+                      .Where(a => a.dw_id == dwId &&
+                         fsql.Select<wygl_wygs_gzry_wyglqyModel>()
+                               .Where(b => b.yh_id == yhId).ToList(b => b.wyqy_id).Contains(a.wyqy_id)
+                      );
+
+                var sql1 = sql.ToSql();
+                Assert.Equal(@"SELECT a.""dw_id"", a.""wyqy_id"" 
+FROM ""wygl_wygs_gzry_wyglqyModelTest1"" a 
+WHERE (a.""dw_id"" = @exp_0 AND ((a.""wyqy_id"") in (SELECT b.""wyqy_id"" 
+    FROM ""wygl_wygs_gzry_wyglqyModel"" b 
+    WHERE (b.""yh_id"" = @exp_1))))", sql1);
+                Assert.Equal(2, (sql as Select0Provider)._params.Count);
+                Assert.Equal("123456", (sql as Select0Provider)._params[0].Value);
+                Assert.Equal("654321", (sql as Select0Provider)._params[1].Value);
+            }
+        }
+        class wygl_wygs_gzry_wyglqyModelTest1
+        {
+            public string dw_id { get; set; }
+            public string wyqy_id { get; set; }
+        }
+        class wygl_wygs_gzry_wyglqyModel
+        {
+            public string yh_id { get; set; }
+            public string wyqy_id { get; set; }
+        }
+
+
 
         [Fact]
         public void TestJsonb01()
@@ -34,6 +102,29 @@ namespace FreeSql.Tests
             var items = fsql.Select<TestJsonb01Cls1>().ToList();
         }
 
+        [Fact]
+        public void TestClickHouse()
+        {
+            var fsql = g.mysql;
+            fsql.Delete<TestJsonb01Cls1>().Where("1=1").ExecuteAffrows();
+
+            var item = new TestJsonb01Cls1
+            {
+                jsonb01 = new List<int> { 1, 5, 10, 20 },
+                jsonb02 = new List<long> { 11, 51, 101, 201 },
+                jsonb03 = new List<string> { "12", "52", "102", "202" },
+            };
+            fsql.Insert(item).ExecuteAffrows();
+
+        }
+        [FreeSql.DataAnnotations.Table(Name = "ClickHouseTest")]
+        public class ClickHouse
+        {
+            public long Id { get; set; }
+
+            public string Name { get; set; }
+        }
+
         public class TestJsonb01Cls1
         {
             public Guid id { get; set; }
diff --git a/FreeSql.Tests/FreeSql.Tests/g.cs b/FreeSql.Tests/FreeSql.Tests/g.cs
index 32959df7..b7d4ead9 100644
--- a/FreeSql.Tests/FreeSql.Tests/g.cs
+++ b/FreeSql.Tests/FreeSql.Tests/g.cs
@@ -7,6 +7,19 @@ using System.Threading;
 
 public class g
 {
+    static Lazy<IFreeSql> clickHouseLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
+    .UseConnectionString(FreeSql.DataType.ClickHouse, "Compress=False;BufferSize=32768;SocketTimeout=10000;CheckCompressedHash=False;Encrypt=False;Compressor=lz4;Host=192.168.0.121;Port=8125;Database=PersonnelLocation;Username=root;Password=+riQ8V9D")
+    //.UseConnectionFactory(FreeSql.DataType.MySql, () => new MySql.Data.MySqlClient.MySqlConnection("Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;"))
+    //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=192.168.164.10;Port=33061;User ID=root;Password=root;Initial Catalog=cccddd_mysqlconnector;Charset=utf8;SslMode=none;Max pool size=10")
+    //.UseAutoSyncStructure(true)
+    //.UseGenerateCommandParameterWithLambda(true)
+    .UseMonitorCommand(
+        cmd => Debug.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
+                                                                                                         //, (cmd, traceLog) => Console.WriteLine(traceLog)
+        )
+    .UseLazyLoading(true)
+    .Build());
+    public static IFreeSql clickHouse => clickHouseLazy.Value;
 
     static Lazy<IFreeSql> mysqlLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
         .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=5;Allow User Variables=True")
@@ -41,7 +54,7 @@ public class g
     public static IFreeSql pgsql => pgsqlLazy.Value;
 
     static Lazy<IFreeSql> sqlserverLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
-        .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=issues684;Pooling=true;Max Pool Size=3")
+        .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=issues684;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
         .UseAutoSyncStructure(true)
         .UseMonitorCommand(
             cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
@@ -69,6 +82,7 @@ public class g
 
     static Lazy<IFreeSql> sqliteLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
         .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document.db;Attachs=xxxtb.db;")
+        //.UseConnectionFactory(FreeSql.DataType.Sqlite, () => new Microsoft.Data.Sqlite.SqliteConnection(@"Data Source=documentCore.db"))
         //.UseConnectionFactory(FreeSql.DataType.Sqlite, () =>
         //{
         //    var conn = new System.Data.SQLite.SQLiteConnection(@"Data Source=|DataDirectory|\document.db;Pooling=true;");
diff --git a/FreeSql.sln b/FreeSql.sln
index 6849c8a8..2fac2870 100644
--- a/FreeSql.sln
+++ b/FreeSql.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29324.140
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql", "FreeSql\FreeSql.csproj", "{AF9C50EC-6EB6-494B-9B3B-7EDBA6FD0EBB}"
 EndProject
@@ -101,6 +101,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.zh-CN.md = README.zh-CN.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.ClickHouse", "Providers\FreeSql.Provider.ClickHouse\FreeSql.Provider.ClickHouse.csproj", "{86C56235-5D37-4422-807B-B31681C7D01C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.GBase", "Providers\FreeSql.Provider.GBase\FreeSql.Provider.GBase.csproj", "{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.GBase", "FreeSql.Tests\FreeSql.Tests.Provider.GBase\FreeSql.Tests.Provider.GBase.csproj", "{B887C0DA-01BE-4537-ADC1-92545AC85684}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.Sqlite.Data", "FreeSql.Tests\FreeSql.Tests.Provider.Sqlite.Data\FreeSql.Tests.Provider.Sqlite.Data.csproj", "{C863551A-4791-4BE2-8741-ABAD7B650C95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.SqliteCore", "Providers\FreeSql.Provider.SqliteCore\FreeSql.Provider.SqliteCore.csproj", "{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -579,6 +589,66 @@ Global
 		{0DBAA21C-39B2-4AAD-A43D-88E67ED239D1}.Release|x64.Build.0 = Release|Any CPU
 		{0DBAA21C-39B2-4AAD-A43D-88E67ED239D1}.Release|x86.ActiveCfg = Release|Any CPU
 		{0DBAA21C-39B2-4AAD-A43D-88E67ED239D1}.Release|x86.Build.0 = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|x64.Build.0 = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Debug|x86.Build.0 = Debug|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|x64.ActiveCfg = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|x64.Build.0 = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|x86.ActiveCfg = Release|Any CPU
+		{86C56235-5D37-4422-807B-B31681C7D01C}.Release|x86.Build.0 = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Debug|x86.Build.0 = Debug|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|x64.Build.0 = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5}.Release|x86.Build.0 = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|x64.Build.0 = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Debug|x86.Build.0 = Debug|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|x64.ActiveCfg = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|x64.Build.0 = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|x86.ActiveCfg = Release|Any CPU
+		{B887C0DA-01BE-4537-ADC1-92545AC85684}.Release|x86.Build.0 = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|x64.Build.0 = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Debug|x86.Build.0 = Debug|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|x64.ActiveCfg = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|x64.Build.0 = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|x86.ActiveCfg = Release|Any CPU
+		{C863551A-4791-4BE2-8741-ABAD7B650C95}.Release|x86.Build.0 = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Debug|x86.Build.0 = Debug|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|x64.Build.0 = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -612,6 +682,9 @@ Global
 		{CDD6A896-F6DF-44CB-B430-06B383916EB0} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
 		{101B11D2-7780-4E14-9B72-77F5D69B3DF9} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
 		{0DBAA21C-39B2-4AAD-A43D-88E67ED239D1} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
+		{86C56235-5D37-4422-807B-B31681C7D01C} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
+		{BDE8EDC6-2646-45E0-A921-39CD1538A8C5} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
+		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
diff --git a/FreeSql/DataType.cs b/FreeSql/DataType.cs
index fb574578..a8b3ef86 100644
--- a/FreeSql/DataType.cs
+++ b/FreeSql/DataType.cs
@@ -60,6 +60,13 @@ namespace FreeSql
         /// 自定义适配器，访问任何数据库<para></para>
         /// 注意：该类型不提供 DbFirst/CodeFirst 功能
         /// </summary>
-        Custom
+        Custom,
+
+        ClickHouse,
+
+        /// <summary>
+        /// 天津南大通用数据技术股份有限公司成立于2004年,是国产数据库、大数据领域的知名企业，基于 Odbc 的实现
+        /// </summary>
+        GBase
     }
 }
diff --git a/FreeSql/DatabaseModel/DBColumnInfo.cs b/FreeSql/DatabaseModel/DBColumnInfo.cs
index 1c5b9949..ffb297c6 100644
--- a/FreeSql/DatabaseModel/DBColumnInfo.cs
+++ b/FreeSql/DatabaseModel/DBColumnInfo.cs
@@ -45,9 +45,18 @@ namespace FreeSql.DatabaseModel
         /// </summary>
         public bool IsNullable { get; set; }
         /// <summary>
+        /// 备注，早期编码时少按了一个字母，请使用 Comment
+        /// </summary>
+        [Obsolete("早期编码时少按了一个字母，请使用 Comment")]
+        public string Coment
+        {
+            get => Comment;
+            set => Comment = value;
+        }
+        /// <summary>
         /// 备注
         /// </summary>
-        public string Coment { get; set; }
+        public string Comment { get; set; }
         /// <summary>
         /// 数据库默认值
         /// </summary>
diff --git a/FreeSql/Extensions/AdoNetExtensions.cs b/FreeSql/Extensions/AdoNetExtensions.cs
index 3e27483b..73b0d015 100644
--- a/FreeSql/Extensions/AdoNetExtensions.cs
+++ b/FreeSql/Extensions/AdoNetExtensions.cs
@@ -59,6 +59,10 @@ namespace FreeSql
                     providerType = Type.GetType("FreeSql.Firebird.FirebirdProvider`1,FreeSql.Provider.Firebird")?.MakeGenericType(connType);
                     if (providerType == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.Firebird.dll，可前往 nuget 下载");
                     break;
+                case "ClickHouseConnection":
+                    providerType = Type.GetType("FreeSql.ClickHouse.ClickHouseProvider`1,FreeSql.Provider.ClickHouse")?.MakeGenericType(connType);
+                    if (providerType == null) throw new Exception("缺少 FreeSql 数据库实现包：FreeSql.Provider.ClickHouse.dll，可前往 nuget 下载");
+                    break;
                 default:
                     throw new Exception("未实现");
             }
diff --git a/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
index d456c715..45882a22 100644
--- a/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
+++ b/FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
@@ -140,6 +140,17 @@ namespace FreeSql
             return 0;
         }
 
+        /// <summary>
+        /// 注意：使用者自己承担【注入风险】
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <returns></returns>
+        static bool InternalRawSql([RawValue] string sql)
+        {
+            expContext.Value.Result = sql;
+            return false;
+        }
+
         #region 大小判断
         /// <summary>
         /// 大于 &gt;
@@ -460,6 +471,15 @@ namespace FreeSql
             expContext.Result = $"list({expContext.ParsedContent["column"]},{expContext.ParsedContent["delimiter"]})";
             return null;
         }
+        public static string StringJoinGBaseWmConcatText(object column, object delimiter)
+        {
+            if (expContext.ParsedContent["delimiter"] == "','")
+                expContext.Result = $"wm_concat_text({expContext.ParsedContent["column"]})";
+            else
+                throw new NotImplementedException("GBase 暂时不支持逗号以外的分割符");
+            //expContext.Result = $"replace(wm_concat_text({expContext.ParsedContent["column"]}), ',', {expContext.ParsedContent["delimiter"]})";
+            return null;
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
index b96ea0c2..df2ea79d 100644
--- a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
+++ b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
@@ -1,6 +1,7 @@
 using FreeSql;
 using FreeSql.DataAnnotations;
 using FreeSql.Internal.CommonProvider;
+using FreeSql.Internal.Model;
 using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections;
@@ -58,7 +59,7 @@ public static partial class FreeSqlGlobalExtensions
     /// <param name="type"></param>
     /// <param name="isNameSpace"></param>
     /// <returns></returns>
-    internal static string DisplayCsharp(this Type type, bool isNameSpace = true)
+    public static string DisplayCsharp(this Type type, bool isNameSpace = true)
     {
         if (type == null) return null;
         if (type == typeof(void)) return "void";
@@ -418,9 +419,25 @@ public static partial class FreeSqlGlobalExtensions
         if (select._orm.CodeFirst.IsSyncStructureToLower) cteName = cteName.ToLower();
         if (select._orm.CodeFirst.IsSyncStructureToUpper) cteName = cteName.ToUpper();
 
-        switch (select._orm.Ado.DataType) //MySql5.6
+        switch (select._orm.Ado.DataType)
         {
-            case DataType.MySql:
+            case DataType.GBase:
+                //select t.parentid, t.subid, level
+                //from a_test t
+                //start with subid = '7'
+                //connect by prior subid =  parentid;
+                var gbsb = new StringBuilder();
+                var gbsbWhere = select._where.ToString();
+                select._where.Clear();
+                if (gbsbWhere.StartsWith(" AND ")) gbsbWhere = gbsbWhere.Remove(0, 5);
+                gbsb.Append(select._tosqlAppendContent).Append(" \r\nstart with ").Append(gbsbWhere).Append(" \r\nconnect by prior ");
+                if (up) gbsb.Append("a.").Append(select._commonUtils.QuoteSqlName(tbref.Columns[0].Attribute.Name)).Append(" = ").Append("a.").Append(select._commonUtils.QuoteSqlName(tbref.RefColumns[0].Attribute.Name));
+                else gbsb.Append("a.").Append(select._commonUtils.QuoteSqlName(tbref.Columns[0].Attribute.Name)).Append(" = ").Append("a.").Append(select._commonUtils.QuoteSqlName(tbref.RefColumns[0].Attribute.Name));
+                var gbswstr = gbsb.ToString();
+                gbsb.Clear();
+                select.AsAlias((_, old) => $"{old} {gbswstr}");
+                return select;
+            case DataType.MySql: //MySql5.6
             case DataType.OdbcMySql:
                 var mysqlConnectionString = select._orm.Ado?.ConnectionString ?? select._connection?.ConnectionString ?? "";
                 if (_dicMySqlVersion.TryGetValue(mysqlConnectionString, out var mysqlVersion) == false)
@@ -495,6 +512,7 @@ JOIN {select._commonUtils.QuoteSqlName(tb.DbName)} a ON cte_tbc.cte_id = a.{sele
                 case DataType.SqlServer:
                 case DataType.OdbcSqlServer:
                 case DataType.Firebird:
+                case DataType.ClickHouse:
                     sql1ctePath = select._commonExpression.ExpressionWhereLambda(select._tables, Expression.Call(typeof(Convert).GetMethod("ToString", new Type[] { typeof(string) }), pathSelector?.Body), null, null, null);
                     break;
                 default:
@@ -503,11 +521,11 @@ JOIN {select._commonUtils.QuoteSqlName(tb.DbName)} a ON cte_tbc.cte_id = a.{sele
             }
             sql1ctePath = $"{sql1ctePath} as cte_path, ";
         }
-        var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2().Field}").Trim();
+        var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2(false).Field}").Trim();
 
         select._where.Clear();
         select.As("wct2");
-        var sql2Field = select.GetAllFieldExpressionTreeLevel2().Field;
+        var sql2Field = select.GetAllFieldExpressionTreeLevel2(false).Field;
         var sql2InnerJoinOn = up == false ?
             string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(a.Attribute.Name)}")) :
             string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(a.Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)}"));
@@ -579,6 +597,7 @@ JOIN {select._commonUtils.QuoteSqlName(tb.DbName)} a ON cte_tbc.cte_id = a.{sele
             case DataType.OdbcOracle:
             case DataType.Dameng: //递归 WITH 子句必须具有列别名列表
             case DataType.OdbcDameng:
+            case DataType.GBase:
                 nsselsb.Append($"(cte_level, {(pathSelector == null ? "" : "cte_path, ")}{sql2Field.Replace("wct2.", "")})");
                 break;
         }
@@ -609,6 +628,7 @@ SELECT ");
         {
             case DataType.MySql:
             case DataType.OdbcMySql:
+            case DataType.ClickHouse:
                 return that.OrderBy("rand()");
             case DataType.SqlServer:
             case DataType.OdbcSqlServer:
@@ -634,4 +654,371 @@ SELECT ");
         throw new NotSupportedException($"{s0p._orm.Ado.DataType} 不支持 OrderByRandom 随机排序");
     }
     #endregion
+
+    #region IFreeSql Insert/Update/InsertOrUpdate/Delete Dictionary<string, object>
+    /// <summary>
+    /// 插入数据字典 Dictionary&lt;string, object&gt;
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static InsertDictImpl InsertDict(this IFreeSql freesql, Dictionary<string, object> source)
+    {
+        var insertDict = new InsertDictImpl(freesql);
+        insertDict._insertProvider.AppendData(source);
+        return insertDict;
+    }
+    /// <summary>
+    /// 插入数据字典，传入 Dictionary&lt;string, object&gt; 集合
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static InsertDictImpl InsertDict(this IFreeSql freesql, IEnumerable<Dictionary<string, object>> source)
+    {
+        var insertDict = new InsertDictImpl(freesql);
+        insertDict._insertProvider.AppendData(source);
+        return insertDict;
+    }
+    /// <summary>
+    /// 更新数据字典 Dictionary&lt;string, object&gt;
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static UpdateDictImpl UpdateDict(this IFreeSql freesql, Dictionary<string, object> source)
+    {
+        var updateDict = new UpdateDictImpl(freesql);
+        updateDict._updateProvider.SetSource(source);
+        return updateDict;
+    }
+    /// <summary>
+    /// 更新数据字典，传入 Dictionary&lt;string, object&gt; 集合
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static UpdateDictImpl UpdateDict(this IFreeSql freesql, IEnumerable<Dictionary<string, object>> source)
+    {
+        var updateDict = new UpdateDictImpl(freesql);
+        updateDict._updateProvider.SetSource(source);
+        return updateDict;
+    }
+    /// <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>
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static InsertOrUpdateDictImpl InsertOrUpdateDict(this IFreeSql freesql, Dictionary<string, object> source)
+    {
+        var insertOrUpdateDict = new InsertOrUpdateDictImpl(freesql);
+        insertOrUpdateDict._insertOrUpdateProvider.SetSource(source);
+        return insertOrUpdateDict;
+    }
+    public static InsertOrUpdateDictImpl InsertOrUpdateDict(this IFreeSql freesql, IEnumerable<Dictionary<string, object>> source)
+    {
+        var insertOrUpdateDict = new InsertOrUpdateDictImpl(freesql);
+        insertOrUpdateDict._insertOrUpdateProvider.SetSource(source);
+        return insertOrUpdateDict;
+    }
+    /// <summary>
+    /// 删除数据字典 Dictionary&lt;string, object&gt;
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static DeleteDictImpl DeleteDict(this IFreeSql freesql, Dictionary<string, object> source)
+    {
+        var deleteDict = new DeleteDictImpl(freesql);
+        UpdateProvider<Dictionary<string, object>>.GetDictionaryTableInfo(source, deleteDict._deleteProvider._orm, ref deleteDict._deleteProvider._table);
+        var primarys = UpdateDictImpl.GetPrimarys(deleteDict._deleteProvider._table, source.Keys.ToArray());
+        deleteDict._deleteProvider.Where(deleteDict._deleteProvider._commonUtils.WhereItems(primarys, "", new[] { source }));
+        return deleteDict;
+    }
+    /// <summary>
+    /// 删除数据字典，传入 Dictionary&lt;string, object&gt; 集合
+    /// </summary>
+    /// <param name="source"></param>
+    /// <returns></returns>
+    public static DeleteDictImpl DeleteDict(this IFreeSql freesql, IEnumerable<Dictionary<string, object>> source)
+    {
+        DeleteDictImpl deleteDict = null;
+        if (source.Select(a => string.Join(",", a.Keys)).Distinct().Count() == 1)
+        {
+            deleteDict = new DeleteDictImpl(freesql);
+            var sourceFirst = source.FirstOrDefault();
+            UpdateProvider<Dictionary<string, object>>.GetDictionaryTableInfo(sourceFirst, deleteDict._deleteProvider._orm, ref deleteDict._deleteProvider._table);
+            var primarys = UpdateDictImpl.GetPrimarys(deleteDict._deleteProvider._table, sourceFirst.Keys.ToArray());
+            deleteDict._deleteProvider.Where(deleteDict._deleteProvider._commonUtils.WhereItems(primarys, "", source));
+            return deleteDict;
+        }
+        foreach (var item in source)
+        {
+            var tmpDelteDict = DeleteDict(freesql, item);
+            if (deleteDict == null) deleteDict = tmpDelteDict;
+            else deleteDict._deleteProvider._where.Append(" OR ").Append(tmpDelteDict._deleteProvider._where);
+        }
+        return deleteDict ?? new DeleteDictImpl(freesql);
+    }
+
+    #region InsertDictImpl
+    public class InsertDictImpl
+    {
+        internal readonly InsertProvider<Dictionary<string, object>> _insertProvider;
+        internal InsertDictImpl(IFreeSql orm)
+        {
+            _insertProvider = (orm as BaseDbProvider ?? throw new Exception("IFreeSql 无法转换成 BaseDbProvider"))
+                .CreateInsertProvider<Dictionary<string, object>>() as InsertProvider<Dictionary<string, object>>;
+        }
+
+        public InsertDictImpl AsTable(string tableName)
+        {
+            _insertProvider.AsTable(tableName);
+            return this;
+        }
+
+        public InsertDictImpl BatchOptions(int valuesLimit, int parameterLimit, bool autoTransaction = true)
+        {
+            _insertProvider.BatchOptions(valuesLimit, parameterLimit, autoTransaction);
+            return this;
+        }
+        public InsertDictImpl BatchProgress(Action<BatchProgressStatus<Dictionary<string, object>>> callback)
+        {
+            _insertProvider.BatchProgress(callback);
+            return this;
+        }
+
+        public InsertDictImpl CommandTimeout(int timeout)
+        {
+            _insertProvider.CommandTimeout(timeout);
+            return this;
+        }
+
+        public int ExecuteAffrows() => _insertProvider.ExecuteAffrows();
+        public long ExecuteIdentity() => _insertProvider.ExecuteIdentity();
+        public List<Dictionary<string, object>> ExecuteInserted() => _insertProvider.ExecuteInserted();
+
+#if net40
+#else
+        public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => _insertProvider.ExecuteAffrowsAsync(cancellationToken);
+        public Task<long> ExecuteIdentityAsync(CancellationToken cancellationToken = default) => _insertProvider.ExecuteIdentityAsync(cancellationToken);
+        public Task<List<Dictionary<string, object>>> ExecuteInsertedAsync(CancellationToken cancellationToken = default) => _insertProvider.ExecuteInsertedAsync(cancellationToken);
+#endif
+
+        public InsertDictImpl NoneParameter(bool isNotCommandParameter = true)
+        {
+            _insertProvider.NoneParameter(isNotCommandParameter);
+            return this;
+        }
+
+        public DataTable ToDataTable() => _insertProvider.ToDataTable();
+        public string ToSql() => _insertProvider.ToSql();
+
+        public InsertDictImpl WithConnection(DbConnection connection)
+        {
+            _insertProvider.WithConnection(connection);
+            return this;
+        }
+        public InsertDictImpl WithTransaction(DbTransaction transaction)
+        {
+            _insertProvider.WithTransaction(transaction);
+            return this;
+        }
+    }
+    #endregion
+
+    #region UpdateDictImpl
+    public class UpdateDictImpl
+    {
+        internal readonly UpdateProvider<Dictionary<string, object>> _updateProvider;
+        internal UpdateDictImpl(IFreeSql orm)
+        {
+            _updateProvider = (orm as BaseDbProvider ?? throw new Exception("IFreeSql 无法转换成 BaseDbProvider"))
+                .CreateUpdateProvider<Dictionary<string, object>>(null) as UpdateProvider<Dictionary<string, object>>;
+        }
+
+        public UpdateDictImpl WherePrimary(params string[] primarys)
+        {
+            _updateProvider._tempPrimarys = GetPrimarys(_updateProvider._table, primarys);
+            return this;
+        }
+        public static ColumnInfo[] GetPrimarys(TableInfo table, params string[] primarys)
+        {
+            if (primarys?.Any() != true) throw new ArgumentException(nameof(primarys));
+            var pks = new List<ColumnInfo>();
+            foreach (var primary in primarys)
+            {
+                if (table.ColumnsByCs.TryGetValue(string.Concat(primary), out var col)) pks.Add(col);
+                else throw new Exception($"GetPrimarys 传递的参数 \"{primary}\" 不正确，它不属于字典数据的键名");
+            }
+            return pks.ToArray();
+        }
+        public static void SetTablePrimary(TableInfo table, params string[] primarys)
+        {
+            foreach (var primary in primarys)
+            {
+                if (table.ColumnsByCs.TryGetValue(string.Concat(primary), out var col)) col.Attribute.IsPrimary = true;
+                else throw new Exception($"GetPrimarys 传递的参数 \"{primary}\" 不正确，它不属于字典数据的键名");
+            }
+            table.Primarys = table.Columns.Where(a => a.Value.Attribute.IsPrimary).Select(a => a.Value).ToArray();
+        }
+
+        public UpdateDictImpl AsTable(string tableName)
+        {
+            _updateProvider.AsTable(tableName);
+            return this;
+        }
+
+        public UpdateDictImpl BatchOptions(int rowsLimit, int parameterLimit, bool autoTransaction = true)
+        {
+            _updateProvider.BatchOptions(rowsLimit, parameterLimit, autoTransaction);
+            return this;
+        }
+        public UpdateDictImpl BatchProgress(Action<BatchProgressStatus<Dictionary<string, object>>> callback)
+        {
+            _updateProvider.BatchProgress(callback);
+            return this;
+        }
+
+        public UpdateDictImpl CommandTimeout(int timeout)
+        {
+            _updateProvider.CommandTimeout(timeout);
+            return this;
+        }
+
+        public int ExecuteAffrows() => _updateProvider.ExecuteAffrows();
+        public List<Dictionary<string, object>> ExecuteUpdated() => _updateProvider.ExecuteUpdated();
+
+#if net40
+#else
+        public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => _updateProvider.ExecuteAffrowsAsync(cancellationToken);
+        public Task<List<Dictionary<string, object>>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default) => _updateProvider.ExecuteUpdatedAsync(cancellationToken);
+#endif
+
+        public UpdateDictImpl NoneParameter(bool isNotCommandParameter = true)
+        {
+            _updateProvider.NoneParameter(isNotCommandParameter);
+            return this;
+        }
+
+        public string ToSql() => _updateProvider.ToSql();
+
+        public UpdateDictImpl WithConnection(DbConnection connection)
+        {
+            _updateProvider.WithConnection(connection);
+            return this;
+        }
+        public UpdateDictImpl WithTransaction(DbTransaction transaction)
+        {
+            _updateProvider.WithTransaction(transaction);
+            return this;
+        }
+    }
+    #endregion
+
+    #region InsertOrUpdateDictImpl
+    public class InsertOrUpdateDictImpl
+    {
+        internal readonly InsertOrUpdateProvider<Dictionary<string, object>> _insertOrUpdateProvider;
+        internal InsertOrUpdateDictImpl(IFreeSql orm)
+        {
+            _insertOrUpdateProvider = (orm as BaseDbProvider ?? throw new Exception("IFreeSql 无法转换成 BaseDbProvider"))
+                .CreateInsertOrUpdateProvider<Dictionary<string, object>>() as InsertOrUpdateProvider<Dictionary<string, object>>;
+        }
+
+        public InsertOrUpdateDictImpl WherePrimary(params string[] primarys)
+        {
+            UpdateDictImpl.SetTablePrimary(_insertOrUpdateProvider._table, primarys);
+            return this;
+        }
+
+        public InsertOrUpdateDictImpl AsTable(string tableName)
+        {
+            _insertOrUpdateProvider.AsTable(tableName);
+            return this;
+        }
+
+        public InsertOrUpdateDictImpl CommandTimeout(int timeout)
+        {
+            _insertOrUpdateProvider.CommandTimeout(timeout);
+            return this;
+        }
+
+        public int ExecuteAffrows() => _insertOrUpdateProvider.ExecuteAffrows();
+#if net40
+#else
+        public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => _insertOrUpdateProvider.ExecuteAffrowsAsync(cancellationToken);
+#endif
+        public InsertOrUpdateDictImpl IfExistsDoNothing()
+        {
+            _insertOrUpdateProvider.IfExistsDoNothing();
+            return this;
+        }
+
+        public string ToSql() => _insertOrUpdateProvider.ToSql();
+
+        public InsertOrUpdateDictImpl WithConnection(DbConnection connection)
+        {
+            _insertOrUpdateProvider.WithConnection(connection);
+            return this;
+        }
+        public InsertOrUpdateDictImpl WithTransaction(DbTransaction transaction)
+        {
+            _insertOrUpdateProvider.WithTransaction(transaction);
+            return this;
+        }
+    }
+    #endregion
+
+    #region DeleteDictImpl
+    public class DeleteDictImpl
+    {
+        internal readonly DeleteProvider<Dictionary<string, object>> _deleteProvider;
+        internal DeleteDictImpl(IFreeSql orm)
+        {
+            _deleteProvider = (orm as BaseDbProvider ?? throw new Exception("IFreeSql 无法转换成 BaseDbProvider"))
+                .CreateDeleteProvider<Dictionary<string, object>>(null) as DeleteProvider<Dictionary<string, object>>;
+        }
+
+        public DeleteDictImpl AsTable(string tableName)
+        {
+            _deleteProvider.AsTable(tableName);
+            return this;
+        }
+
+        public DeleteDictImpl CommandTimeout(int timeout)
+        {
+            _deleteProvider.CommandTimeout(timeout);
+            return this;
+        }
+
+        public int ExecuteAffrows() => _deleteProvider.ExecuteAffrows();
+        public List<Dictionary<string, object>> ExecuteDeleted() => _deleteProvider.ExecuteDeleted();
+
+#if net40
+#else
+        public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => _deleteProvider.ExecuteAffrowsAsync(cancellationToken);
+        public Task<List<Dictionary<string, object>>> ExecuteDeletedAsync(CancellationToken cancellationToken = default) => _deleteProvider.ExecuteDeletedAsync(cancellationToken);
+#endif
+
+        public string ToSql() => _deleteProvider.ToSql();
+
+        public DeleteDictImpl WithConnection(DbConnection connection)
+        {
+            _deleteProvider.WithConnection(connection);
+            return this;
+        }
+        public DeleteDictImpl WithTransaction(DbTransaction transaction)
+        {
+            _deleteProvider.WithTransaction(transaction);
+            return this;
+        }
+    }
+    #endregion
+
+    #endregion
 }
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
index 40d58264..72f2ceac 100644
--- a/FreeSql/FreeSql.csproj
+++ b/FreeSql/FreeSql.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<TargetFrameworks>netstandard2.1;netstandard2.0;net451;net45;net40</TargetFrameworks>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
-		<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>
+		<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 南大通用, 翰高, And Access</Description>
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
@@ -34,5 +34,8 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
 		<DefineConstants>net40</DefineConstants>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+		<DefineConstants>net45</DefineConstants>
+	</PropertyGroup>
 	
 </Project>
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 9c849a52..55a8f429 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -515,6 +515,11 @@
             </summary>
         </member>
         <member name="P:FreeSql.DatabaseModel.DbColumnInfo.Coment">
+            <summary>
+            备注，早期编码时少按了一个字母，请使用 Comment
+            </summary>
+        </member>
+        <member name="P:FreeSql.DatabaseModel.DbColumnInfo.Comment">
             <summary>
             备注
             </summary>
@@ -656,6 +661,11 @@
             注意：该类型不提供 DbFirst/CodeFirst 功能
             </summary>
         </member>
+        <member name="F:FreeSql.DataType.GBase">
+            <summary>
+            天津南大通用数据技术股份有限公司成立于2004年,是国产数据库、大数据领域的知名企业，基于 Odbc 的实现
+            </summary>
+        </member>
         <member name="M:FreeSql.AdoNetExtensions.GetIFreeSql(System.Data.IDbConnection)">
             <summary>
             获取 IDbConnection 对应的 IFreeSql 实例
@@ -1202,6 +1212,13 @@
             <param name="column"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.SqlExt.InternalRawSql(System.String)">
+            <summary>
+            注意：使用者自己承担【注入风险】
+            </summary>
+            <param name="sql"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.SqlExt.GreaterThan``1(``0,``0)">
             <summary>
             大于 &gt;
@@ -1473,6 +1490,13 @@
             <param name="tableRule"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IDelete`1.AsTable(System.String)">
+            <summary>
+            设置表名
+            </summary>
+            <param name="tableName"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IDelete`1.AsType(System.Type)">
             <summary>
             动态Type，在使用 Delete&lt;object&gt; 后使用本方法，指定实体类型
@@ -1612,6 +1636,13 @@
             <param name="tableRule"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IInsert`1.AsTable(System.String)">
+            <summary>
+            设置表名
+            </summary>
+            <param name="tableName"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IInsert`1.AsType(System.Type)">
             <summary>
             动态Type，在使用 Insert&lt;object&gt; 后使用本方法，指定实体类型
@@ -1717,6 +1748,13 @@
             <param name="tableRule"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IInsertOrUpdate`1.AsTable(System.String)">
+            <summary>
+            设置表名
+            </summary>
+            <param name="tableName"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IInsertOrUpdate`1.AsType(System.Type)">
             <summary>
             动态Type，在使用 Update&lt;object&gt; 后使用本方法，指定实体类型
@@ -1792,6 +1830,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.ISelect0`2.ToDataTableByPropertyName(System.String[])">
+            <summary>
+            执行SQL查询，返回 properties 指定的实体类属性，并以 DataTable 接收
+            </summary>
+            <param name="properties">属性名：Name<para></para>导航属性：Parent.Name<para></para>多表：b.Name</param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.ISelect0`2.ToDictionary``1(System.Func{`1,``0})">
             <summary>
             以字典的形式返回查询结果<para></para>
@@ -2922,6 +2967,13 @@
             <param name="tableRule"></param>
             <returns></returns>
         </member>
+        <member name="M:FreeSql.IUpdate`1.AsTable(System.String)">
+            <summary>
+            设置表名
+            </summary>
+            <param name="tableName"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.IUpdate`1.AsType(System.Type)">
             <summary>
             动态Type，在使用 Update&lt;object&gt; 后使用本方法，指定实体类型
@@ -4167,6 +4219,27 @@
             此时 Value 的值格式为逗号分割：value1,value2,value3... 或者数组
             </summary>
         </member>
+        <member name="F:FreeSql.Internal.Model.DynamicFilterOperator.Custom">
+            <summary>
+            自定义解析，此时 Field 为反射信息，Value 为静态方法的参数(string)<para></para>
+            示范：{ Operator: "Custom", Field: "RawSql webapp1.DynamicFilterCustom,webapp1", Value: "(id,name) in ((1,'k'),(2,'m'))" }<para></para>
+            注意：使用者自己承担【注入风险】<para></para>
+            静态方法定义示范：<para></para>
+            namespace webapp1<para></para>
+            {<para></para>
+            public class DynamicFilterCustom<para></para>
+            {<para></para>
+            [DynamicFilterCustom]<para></para>
+            public static string RawSql(string value) => value;<para></para>
+            }<para></para>
+            }<para></para>
+            </summary>
+        </member>
+        <member name="T:FreeSql.Internal.Model.DynamicFilterCustomAttribute">
+            <summary>
+            授权 DynamicFilter 支持 Custom 自定义解析
+            </summary>
+        </member>
         <member name="P:FreeSql.Internal.Model.FetchCallbackArgs`1.IsBreak">
             <summary>
             是否放弃继续读取
@@ -4269,6 +4342,11 @@
             后台定时检查可用性间隔秒数
             </summary>
         </member>
+        <member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.Weight">
+            <summary>
+            权重
+            </summary>
+        </member>
         <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnCreate">
             <summary>
             对象池的对象被创建时
@@ -4582,6 +4660,64 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:FreeSqlGlobalExtensions.InsertDict(IFreeSql,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            插入数据字典 Dictionary&lt;string, object&gt;
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.InsertDict(IFreeSql,System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})">
+            <summary>
+            插入数据字典，传入 Dictionary&lt;string, object&gt; 集合
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.UpdateDict(IFreeSql,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            更新数据字典 Dictionary&lt;string, object&gt;
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.UpdateDict(IFreeSql,System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})">
+            <summary>
+            更新数据字典，传入 Dictionary&lt;string, object&gt; 集合
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.InsertOrUpdateDict(IFreeSql,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <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>
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.DeleteDict(IFreeSql,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            删除数据字典 Dictionary&lt;string, object&gt;
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalExtensions.DeleteDict(IFreeSql,System.Collections.Generic.IEnumerable{System.Collections.Generic.Dictionary{System.String,System.Object}})">
+            <summary>
+            删除数据字典，传入 Dictionary&lt;string, object&gt; 集合
+            </summary>
+            <param name="source"></param>
+            <returns></returns>
+        </member>
         <member name="M:System.Linq.Expressions.LambadaExpressionExtensions.And``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
             <summary>
             使用 and 拼接两个 lambda 表达式
diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs
index 344e2a2c..9ef6fe46 100644
--- a/FreeSql/FreeSqlBuilder.cs
+++ b/FreeSql/FreeSqlBuilder.cs
@@ -14,6 +14,7 @@ namespace FreeSql
         DataType _dataType;
         string _masterConnectionString;
         string[] _slaveConnectionString;
+        int[] _slaveWeights;
         Func<DbConnection> _connectionFactory;
         bool _isAutoSyncStructure = false;
         bool _isSyncStructureToLower = false;
@@ -55,6 +56,12 @@ namespace FreeSql
             _slaveConnectionString = slaveConnectionString;
             return this;
         }
+        public FreeSqlBuilder UseSlaveWeight(params int[] slaveWeights)
+        {
+            if (_slaveConnectionString?.Length != slaveWeights.Length) throw new Exception("SlaveConnectionString 数量与 SlaveWeights 不相同");
+            _slaveWeights = slaveWeights;
+            return this;
+        }
         /// <summary>
         /// 使用自定义数据库连接对象（放弃内置对象连接池技术）
         /// </summary>
@@ -201,6 +208,7 @@ namespace FreeSql
                         break;
                     case DataType.Sqlite:
                         type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.Sqlite")?.MakeGenericType(typeof(TMark));
+                        if (type == null) type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.SqliteCore")?.MakeGenericType(typeof(TMark)); //Microsoft.Data.Sqlite.Core.dll
                         if (type == null) throwNotFind("FreeSql.Provider.Sqlite.dll", "FreeSql.Sqlite.SqliteProvider<>");
                         break;
 
@@ -265,6 +273,16 @@ namespace FreeSql
                         if (type == null) throwNotFind("FreeSql.Provider.Custom.dll", "FreeSql.Custom.CustomProvider<>");
                         break;
 
+                    case DataType.ClickHouse:
+                        type = Type.GetType("FreeSql.ClickHouse.ClickHouseProvider`1,FreeSql.Provider.ClickHouse")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throwNotFind("FreeSql.Provider.ClickHouse.dll", "FreeSql.ClickHouse.ClickHouseProvider<>");
+                        break;
+
+                    case DataType.GBase:
+                        type = Type.GetType("FreeSql.GBase.GBaseProvider`1,FreeSql.Provider.GBase")?.MakeGenericType(typeof(TMark));
+                        if (type == null) throwNotFind("FreeSql.Provider.GBase.dll", "FreeSql.GBase.GBaseProvider<>");
+                        break;
+
                     default: throw new Exception("未指定 UseConnectionString 或者 UseConnectionFactory");
                 }
             }
@@ -447,6 +465,9 @@ namespace FreeSql
 
                 ret.Ado.MasterPool.Policy.IsAutoDisposeWithSystem = _isExitAutoDisposePool;
                 ret.Ado.SlavePools.ForEach(a => a.Policy.IsAutoDisposeWithSystem = _isExitAutoDisposePool);
+                if (_slaveWeights != null)
+                    for (var x = 0; x < _slaveWeights.Length; x++)
+                        ret.Ado.SlavePools[x].Policy.Weight = _slaveWeights[x];
             }
 
             return ret;
diff --git a/FreeSql/Interface/Curd/IDelete.cs b/FreeSql/Interface/Curd/IDelete.cs
index 54ed617a..95d6c19b 100644
--- a/FreeSql/Interface/Curd/IDelete.cs
+++ b/FreeSql/Interface/Curd/IDelete.cs
@@ -95,6 +95,12 @@ namespace FreeSql
         /// <returns></returns>
         IDelete<T1> AsTable(Func<string, string> tableRule);
         /// <summary>
+        /// 设置表名
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        IDelete<T1> AsTable(string tableName);
+        /// <summary>
         /// 动态Type，在使用 Delete&lt;object&gt; 后使用本方法，指定实体类型
         /// </summary>
         /// <param name="entityType"></param>
diff --git a/FreeSql/Interface/Curd/IInsert.cs b/FreeSql/Interface/Curd/IInsert.cs
index 4cbcfd8c..30daa129 100644
--- a/FreeSql/Interface/Curd/IInsert.cs
+++ b/FreeSql/Interface/Curd/IInsert.cs
@@ -119,6 +119,12 @@ namespace FreeSql
         /// <returns></returns>
         IInsert<T1> AsTable(Func<string, string> tableRule);
         /// <summary>
+        /// 设置表名
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        IInsert<T1> AsTable(string tableName);
+        /// <summary>
         /// 动态Type，在使用 Insert&lt;object&gt; 后使用本方法，指定实体类型
         /// </summary>
         /// <param name="entityType"></param>
diff --git a/FreeSql/Interface/Curd/IInsertOrUpdate.cs b/FreeSql/Interface/Curd/IInsertOrUpdate.cs
index f2926980..c2cb1abb 100644
--- a/FreeSql/Interface/Curd/IInsertOrUpdate.cs
+++ b/FreeSql/Interface/Curd/IInsertOrUpdate.cs
@@ -69,6 +69,12 @@ namespace FreeSql
         /// <returns></returns>
         IInsertOrUpdate<T1> AsTable(Func<string, string> tableRule);
         /// <summary>
+        /// 设置表名
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        IInsertOrUpdate<T1> AsTable(string tableName);
+        /// <summary>
         /// 动态Type，在使用 Update&lt;object&gt; 后使用本方法，指定实体类型
         /// </summary>
         /// <param name="entityType"></param>
diff --git a/FreeSql/Interface/Curd/ISelect/ISelect0.cs b/FreeSql/Interface/Curd/ISelect/ISelect0.cs
index d17490da..1a3e6510 100644
--- a/FreeSql/Interface/Curd/ISelect/ISelect0.cs
+++ b/FreeSql/Interface/Curd/ISelect/ISelect0.cs
@@ -18,6 +18,7 @@ namespace FreeSql
 #if net40
 #else
         Task<DataTable> ToDataTableAsync(string field = null, CancellationToken cancellationToken = default);
+        Task<DataTable> ToDataTableByPropertyNameAsync(string[] properties, CancellationToken cancellationToken = default);
         Task<Dictionary<TKey, T1>> ToDictionaryAsync<TKey>(Func<T1, TKey> keySelector, CancellationToken cancellationToken = default);
         Task<Dictionary<TKey, TElement>> ToDictionaryAsync<TKey, TElement>(Func<T1, TKey> keySelector, Func<T1, TElement> elementSelector, CancellationToken cancellationToken = default);
         Task<List<T1>> ToListAsync(bool includeNestedMembers = false, CancellationToken cancellationToken = default);
@@ -72,6 +73,12 @@ namespace FreeSql
         /// </summary>
         /// <returns></returns>
         DataTable ToDataTable(string field = null);
+        /// <summary>
+        /// 执行SQL查询，返回 properties 指定的实体类属性，并以 DataTable 接收
+        /// </summary>
+        /// <param name="properties">属性名：Name<para></para>导航属性：Parent.Name<para></para>多表：b.Name</param>
+        /// <returns></returns>
+        DataTable ToDataTableByPropertyName(string[] properties);
 
         /// <summary>
         /// 以字典的形式返回查询结果<para></para>
diff --git a/FreeSql/Interface/Curd/IUpdate.cs b/FreeSql/Interface/Curd/IUpdate.cs
index 7f46756e..afe48dd8 100644
--- a/FreeSql/Interface/Curd/IUpdate.cs
+++ b/FreeSql/Interface/Curd/IUpdate.cs
@@ -227,6 +227,12 @@ namespace FreeSql
         /// <returns></returns>
         IUpdate<T1> AsTable(Func<string, string> tableRule);
         /// <summary>
+        /// 设置表名
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <returns></returns>
+        IUpdate<T1> AsTable(string tableName);
+        /// <summary>
         /// 动态Type，在使用 Update&lt;object&gt; 后使用本方法，指定实体类型
         /// </summary>
         /// <param name="entityType"></param>
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
index b4c8352f..1e52e23c 100644
--- a/FreeSql/Internal/CommonExpression.cs
+++ b/FreeSql/Internal/CommonExpression.cs
@@ -591,6 +591,8 @@ namespace FreeSql.Internal
                         if (rightExp.Type.NullableTypeOrThis() == typeof(TimeSpan))
                             return ExpressionLambdaToSql(Expression.Call(leftExp, MethodDateTimeSubtractTimeSpan, rightExp), tsc);
                     }
+                    if (oper == "OR")
+                        return $"({GetBoolString(ExpressionLambdaToSql(leftExp, tsc))} {oper} {GetBoolString(ExpressionLambdaToSql(rightExp, tsc))})";
                     return $"({ExpressionLambdaToSql(leftExp, tsc)} {oper} {ExpressionLambdaToSql(rightExp, tsc)})";
                 case "=":
                 case "<>":
@@ -1011,6 +1013,7 @@ namespace FreeSql.Internal
                                                     case DataType.OdbcOracle:
                                                     case DataType.Dameng:
                                                     case DataType.OdbcDameng:
+                                                    case DataType.GBase:
                                                         break;
                                                     default:
                                                         fsqlSelect0._limit = 1; //#462 ORACLE rownum <= 2 会影响索引变慢
@@ -1065,25 +1068,32 @@ namespace FreeSql.Internal
                                             else
                                             {
                                                 var argExp = (arg3Exp as UnaryExpression)?.Operand;
-                                                if (argExp != null && argExp.NodeType == ExpressionType.Lambda)
+                                                if (argExp != null)
                                                 {
-                                                    if (fsqltable1SetAlias == false)
+                                                    if (argExp.NodeType == ExpressionType.Lambda)
                                                     {
-                                                        fsqltable1SetAlias = true;
-                                                        var argExpLambda = argExp as LambdaExpression;
-                                                        var fsqlTypeGenericArgs = fsqlType.GetGenericArguments();
+                                                        if (fsqltable1SetAlias == false)
+                                                        {
+                                                            fsqltable1SetAlias = true;
+                                                            var argExpLambda = argExp as LambdaExpression;
+                                                            var fsqlTypeGenericArgs = fsqlType.GetGenericArguments();
 
-                                                        if (argExpLambda.Parameters.Count == 1 && argExpLambda.Parameters[0].Type.FullName.StartsWith("FreeSql.Internal.Model.HzyTuple`"))
-                                                        {
-                                                            for (var gai = 0; gai < fsqlTypeGenericArgs.Length; gai++)
-                                                                fsqltables[gai].Alias = "ht" + (gai + 1);
-                                                        }
-                                                        else
-                                                        {
-                                                            for (var gai = 0; gai < fsqlTypeGenericArgs.Length && gai < argExpLambda.Parameters.Count; gai++)
-                                                                fsqltables[gai].Alias = argExpLambda.Parameters[gai].Name;
+                                                            if (argExpLambda.Parameters.Count == 1 && argExpLambda.Parameters[0].Type.FullName.StartsWith("FreeSql.Internal.Model.HzyTuple`"))
+                                                            {
+                                                                for (var gai = 0; gai < fsqlTypeGenericArgs.Length; gai++)
+                                                                    fsqltables[gai].Alias = "ht" + (gai + 1);
+                                                            }
+                                                            else
+                                                            {
+                                                                for (var gai = 0; gai < fsqlTypeGenericArgs.Length && gai < argExpLambda.Parameters.Count; gai++)
+                                                                    fsqltables[gai].Alias = argExpLambda.Parameters[gai].Name;
+                                                            }
                                                         }
                                                     }
+                                                    else
+                                                    {
+                                                        argExp = null;
+                                                    }
                                                 }
                                                 args[a] = argExp ?? Expression.Lambda(arg3Exp).Compile().DynamicInvoke();
                                                 //if (args[a] == null) ExpressionLambdaToSql(call3Exp.Arguments[a], fsqltables, null, null, SelectTableInfoType.From, true);
@@ -1305,6 +1315,7 @@ namespace FreeSql.Internal
                                                     {
                                                         case DataType.MySql:
                                                         case DataType.OdbcMySql:
+                                                        case DataType.GBase:
                                                             if (exp3.Method.Name == "ToList")
                                                                 return $"( SELECT * FROM ({sqlFirst.Replace(" \r\n", " \r\n    ")}) ftblmt50 )";
                                                             break;
@@ -1876,10 +1887,14 @@ namespace FreeSql.Internal
             if (_common.CodeFirst.IsGenerateCommandParameterWithLambda && dbParams != null)
             {
                 if (obj == null) return "NULL";
-                var paramName = $"exp_{dbParams.Count}";
-                var parm = _common.AppendParamter(dbParams, paramName, mapColumn,
-                    mapType ?? mapColumn?.Attribute.MapType ?? obj?.GetType(), mapType == null ? obj : Utils.GetDataReaderValue(mapType, obj));
-                return _common.QuoteParamterName(paramName);
+                var type = mapType ?? mapColumn?.Attribute.MapType ?? obj?.GetType();
+                if (_common.CodeFirst.GetDbInfo(type) != null)
+                {
+                    var paramName = $"exp_{dbParams.Count}";
+                    if (_common._orm?.Ado.DataType == DataType.GBase) paramName = "?";
+                    var parm = _common.AppendParamter(dbParams, paramName, mapColumn, type, mapType == null ? obj : Utils.GetDataReaderValue(mapType, obj));
+                    return _common.QuoteParamterName(paramName);
+                }
             }
             return string.Format(CultureInfo.InvariantCulture, "{0}", _ado.AddslashesProcessParam(obj, mapType, mapColumn));
             //return string.Concat(_ado.AddslashesProcessParam(obj, mapType, mapColumn));
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
index 70036198..0c82881c 100644
--- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
+++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
@@ -111,6 +111,7 @@ namespace FreeSql.Internal.CommonProvider
                 {
                     case DataType.Oracle:
                     case DataType.OdbcOracle:
+                    case DataType.GBase:
                         ExecuteNonQuery(null, null, CommandType.Text, " SELECT 1 FROM dual", commandTimeout);
                         return true;
                     case DataType.Firebird:
@@ -581,7 +582,20 @@ namespace FreeSql.Internal.CommonProvider
                     if (availables.Any())
                     {
                         isSlave = true;
-                        pool = availables.Count == 1 ? availables[0] : availables[slaveRandom.Next(availables.Count)];
+                        if (availables.Count == 1) pool = availables[0];
+                        else
+                        {
+                            var rnd = slaveRandom.Next(availables.Sum(a => a.Policy.Weight));
+                            for(var a = 0; a < availables.Count; a++)
+                            {
+                                rnd -= availables[a].Policy.Weight;
+                                if (rnd < 0)
+                                {
+                                    pool = availables[a];
+                                    break;
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -851,6 +865,7 @@ namespace FreeSql.Internal.CommonProvider
 
             if (cmdParms != null)
             {
+                var dbpool = MasterPool as FreeSql.Internal.CommonProvider.DbConnectionPool;
                 foreach (var parm in cmdParms)
                 {
                     if (parm == null) continue;
@@ -871,7 +886,32 @@ namespace FreeSql.Internal.CommonProvider
                             });
                         }
                     }
-                    if (isnew == false) cmd.Parameters.Add(parm);
+                    if (isnew == false)
+                    {
+                        if (dbpool == null) cmd.Parameters.Add(parm);
+                        else
+                        {
+                            var newparm = cmd.CreateParameter(); // UseConnectionFactory 转换 DbParameter
+                            if (newparm.GetType() == parm.GetType()) cmd.Parameters.Add(parm);
+                            else
+                            {
+                                newparm.DbType = parm.DbType;
+                                newparm.Direction = parm.Direction;
+                                newparm.ParameterName = parm.ParameterName;
+#if net40 || net45
+#else
+                                newparm.Precision = parm.Precision;
+                                newparm.Scale = parm.Scale;
+#endif
+                                newparm.Size = parm.Size;
+                                newparm.SourceColumn = parm.SourceColumn;
+                                newparm.SourceColumnNullMapping = parm.SourceColumnNullMapping;
+                                newparm.SourceVersion = parm.SourceVersion;
+                                newparm.Value = parm.Value;
+                                cmd.Parameters.Add(newparm);
+                            }
+                        }
+                    }
                 }
             }
 
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
index 941e6ae9..52f88e68 100644
--- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
+++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
@@ -25,6 +25,7 @@ namespace FreeSql.Internal.CommonProvider
                 {
                     case DataType.Oracle:
                     case DataType.OdbcOracle:
+                    case DataType.GBase:
                         await ExecuteNonQueryAsync(null, null, CommandType.Text, " SELECT 1 FROM dual", commandTimeout, null, cancellationToken);
                         return true;
                     case DataType.Firebird:
@@ -78,7 +79,7 @@ namespace FreeSql.Internal.CommonProvider
             }, cmdType, cmdText, cmdTimeout, cmdParms, cancellationToken);
             return ret;
         }
-        #region QueryAsync multi
+#region QueryAsync multi
         public Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>(string cmdText, object parms = null, CancellationToken cancellationToken = default) => QueryAsync<T1, T2>(null, null, CommandType.Text, cmdText, 0, GetDbParamtersByObject(cmdText, parms), cancellationToken);
         public Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>(DbTransaction transaction, string cmdText, object parms = null, CancellationToken cancellationToken = default) => QueryAsync<T1, T2>(null, transaction, CommandType.Text, cmdText, 0, GetDbParamtersByObject(cmdText, parms), cancellationToken);
         public Task<NativeTuple<List<T1>, List<T2>>> QueryAsync<T1, T2>(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null, CancellationToken cancellationToken = default) => QueryAsync<T1, T2>(connection, transaction, CommandType.Text, cmdText, 0, GetDbParamtersByObject(cmdText, parms), cancellationToken);
@@ -468,7 +469,7 @@ namespace FreeSql.Internal.CommonProvider
             }, null, cmdType, cmdText, cmdTimeout, cmdParms, cancellationToken);
             return NativeTuple.Create(ret1, ret2, ret3, ret4, ret5);
         }
-        #endregion
+#endregion
 
         public Task ExecuteReaderAsync(Func<FetchCallbackArgs<DbDataReader>, Task> fetchHandler, string cmdText, object parms = null, CancellationToken cancellationToken = default) => ExecuteReaderAsync(null, null, fetchHandler, CommandType.Text, cmdText, 0, GetDbParamtersByObject(cmdText, parms), cancellationToken);
         public Task ExecuteReaderAsync(DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, Task> fetchHandler, string cmdText, object parms = null, CancellationToken cancellationToken = default) => ExecuteReaderAsync(null, transaction, fetchHandler, CommandType.Text, cmdText, 0, GetDbParamtersByObject(cmdText, parms), cancellationToken);
@@ -476,7 +477,7 @@ namespace FreeSql.Internal.CommonProvider
         public Task ExecuteReaderAsync(Func<FetchCallbackArgs<DbDataReader>, Task> fetchHandler, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteReaderAsync(null, null, fetchHandler, cmdType, cmdText, 0, cmdParms, cancellationToken);
         public Task ExecuteReaderAsync(DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, Task> fetchHandler, CommandType cmdType, string cmdText, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteReaderAsync(null, transaction, fetchHandler, cmdType, cmdText, 0, cmdParms, cancellationToken);
         public Task ExecuteReaderAsync(DbConnection connection, DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, Task> fetchHandler, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default) => ExecuteReaderMultipleAsync(1, connection, transaction, (fetch, result) => fetchHandler(fetch), null, cmdType, cmdText, cmdTimeout, cmdParms, cancellationToken);
-        public async Task ExecuteReaderMultipleAsync(int multipleResult, DbConnection connection, DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, int, Task> fetchHandler, Action<DbDataReader, int> schemaHandler, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default)
+        async public Task ExecuteReaderMultipleAsync(int multipleResult, DbConnection connection, DbTransaction transaction, Func<FetchCallbackArgs<DbDataReader>, int, Task> fetchHandler, Action<DbDataReader, int> schemaHandler, CommandType cmdType, string cmdText, int cmdTimeout, DbParameter[] cmdParms, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(cmdText)) return;
             var dt = DateTime.Now;
@@ -756,6 +757,7 @@ namespace FreeSql.Internal.CommonProvider
 
             if (cmdParms != null)
             {
+                var dbpool = MasterPool as FreeSql.Internal.CommonProvider.DbConnectionPool;
                 foreach (var parm in cmdParms)
                 {
                     if (parm == null) continue;
@@ -776,7 +778,32 @@ namespace FreeSql.Internal.CommonProvider
                             });
                         }
                     }
-                    if (isnew == false) cmd.Parameters.Add(parm);
+                    if (isnew == false)
+                    {
+                        if (dbpool == null) cmd.Parameters.Add(parm);
+                        else
+                        {
+                            var newparm = cmd.CreateParameter(); // UseConnectionFactory 转换 DbParameter
+                            if (newparm.GetType() == parm.GetType()) cmd.Parameters.Add(parm);
+                            else
+                            {
+                                newparm.DbType = parm.DbType;
+                                newparm.Direction = parm.Direction;
+                                newparm.ParameterName = parm.ParameterName;
+#if net40 || net45
+#else
+                                newparm.Precision = parm.Precision;
+                                newparm.Scale = parm.Scale;
+#endif
+                                newparm.Size = parm.Size;
+                                newparm.SourceColumn = parm.SourceColumn;
+                                newparm.SourceColumnNullMapping = parm.SourceColumnNullMapping;
+                                newparm.SourceVersion = parm.SourceVersion;
+                                newparm.Value = parm.Value;
+                                cmd.Parameters.Add(newparm);
+                            }
+                        }
+                    }
                 }
             }
 
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/DbConnectionPool.cs b/FreeSql/Internal/CommonProvider/AdoProvider/DbConnectionPool.cs
index 03cc643d..f445b499 100644
--- a/FreeSql/Internal/CommonProvider/AdoProvider/DbConnectionPool.cs
+++ b/FreeSql/Internal/CommonProvider/AdoProvider/DbConnectionPool.cs
@@ -110,6 +110,7 @@ namespace FreeSql.Internal.CommonProvider
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         public DbConnection OnCreate()
         {
diff --git a/FreeSql/Internal/CommonProvider/BaseDbProvider.cs b/FreeSql/Internal/CommonProvider/BaseDbProvider.cs
index 54c76fa5..44f3c75e 100644
--- a/FreeSql/Internal/CommonProvider/BaseDbProvider.cs
+++ b/FreeSql/Internal/CommonProvider/BaseDbProvider.cs
@@ -15,7 +15,11 @@ namespace FreeSql.Internal.CommonProvider
 
         public ISelect<T1> Select<T1>() where T1 : class => CreateSelectProvider<T1>(null);
         public ISelect<T1> Select<T1>(object dywhere) where T1 : class => CreateSelectProvider<T1>(dywhere);
-        public IInsert<T1> Insert<T1>() where T1 : class => CreateInsertProvider<T1>();
+        public IInsert<T1> Insert<T1>() where T1 : class
+        {
+            if (typeof(T1) == typeof(Dictionary<string, object>)) throw new Exception("请使用 fsql.InsertDict(dict) 方法插入字典数据");
+            return CreateInsertProvider<T1>();
+        }
         public IInsert<T1> Insert<T1>(T1 source) where T1 : class => this.Insert<T1>().AppendData(source);
         public IInsert<T1> Insert<T1>(T1[] source) where T1 : class => this.Insert<T1>().AppendData(source);
         public IInsert<T1> Insert<T1>(List<T1> source) where T1 : class => this.Insert<T1>().AppendData(source);
diff --git a/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs b/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs
index 30cec779..b0fe1e4b 100644
--- a/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs
+++ b/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs
@@ -94,7 +94,7 @@ namespace FreeSql.Internal.CommonProvider
         protected void SyncStructure(params TypeAndName[] objects)
         {
             if (objects == null) return;
-            var syncObjects = objects.Where(a => a.entityType != typeof(object) && _dicSycedGetOrAdd(a.entityType).ContainsKey(GetTableNameLowerOrUpper(a.tableName)) == false && GetTableByEntity(a.entityType)?.DisableSyncStructure == false)
+            var syncObjects = objects.Where(a => a.entityType != null && a.entityType != typeof(object) && _dicSycedGetOrAdd(a.entityType).ContainsKey(GetTableNameLowerOrUpper(a.tableName)) == false && GetTableByEntity(a.entityType)?.DisableSyncStructure == false)
                 .Select(a => new TypeAndName(a.entityType, GetTableNameLowerOrUpper(a.tableName))).ToArray();
             if (syncObjects.Any() == false) return;
             var before = new Aop.SyncStructureBeforeEventArgs(syncObjects.Select(a => a.entityType).ToArray());
diff --git a/FreeSql/Internal/CommonProvider/DeleteProvider.cs b/FreeSql/Internal/CommonProvider/DeleteProvider.cs
index 95d92df9..1e84d341 100644
--- a/FreeSql/Internal/CommonProvider/DeleteProvider.cs
+++ b/FreeSql/Internal/CommonProvider/DeleteProvider.cs
@@ -147,6 +147,11 @@ namespace FreeSql.Internal.CommonProvider
             _tableRule = tableRule;
             return this;
         }
+        public IDelete<T1> AsTable(string tableName)
+        {
+            _tableRule = (oldname) => tableName;
+            return this;
+        }
         public IDelete<T1> AsType(Type entityType)
         {
             if (entityType == typeof(object)) throw new Exception("IDelete.AsType 参数不支持指定为 object");
@@ -157,7 +162,7 @@ namespace FreeSql.Internal.CommonProvider
             return this;
         }
 
-        public string ToSql()
+        public virtual string ToSql()
         {
             if (_whereTimes <= 0) return null;
             var sb = new StringBuilder().Append("DELETE FROM ").Append(_commonUtils.QuoteSqlName(TableRuleInvoke())).Append(" WHERE ").Append(_where);
diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
index 86f228ce..0c67b569 100644
--- a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
+++ b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -29,7 +29,7 @@ namespace FreeSql.Internal.CommonProvider
         public DbTransaction _transaction;
         public DbConnection _connection;
         public int _commandTimeout = 0;
-        public ColumnInfo IdentityColumn { get; }
+        public ColumnInfo IdentityColumn { get; private set; }
 
         public InsertOrUpdateProvider(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
         {
@@ -37,12 +37,10 @@ namespace FreeSql.Internal.CommonProvider
             _commonUtils = commonUtils;
             _commonExpression = commonExpression;
             _table = _commonUtils.GetTableByEntity(typeof(T1));
-            if (_table == null)
-            {
+            if (_table == null && typeof(T1) != typeof(Dictionary<string, object>))
                 throw new Exception($"InsertOrUpdate<>的泛型参数 不支持 {typeof(T1)},请传递您的实体类");
-            }
             if (_orm.CodeFirst.IsAutoSyncStructure && typeof(T1) != typeof(object)) _orm.CodeFirst.SyncStructure<T1>();
-            IdentityColumn = _table.Primarys.Where(a => a.Attribute.IsIdentity).FirstOrDefault();
+            IdentityColumn = _table?.Primarys.Where(a => a.Attribute.IsIdentity).FirstOrDefault();
         }
 
         protected void ClearData()
@@ -88,14 +86,14 @@ namespace FreeSql.Internal.CommonProvider
         }
         public static void AuditDataValue(object sender, T1 data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
-            if (data == null) return;
+            if (data == null || table == null) return;
             if (typeof(T1) == typeof(object) && new[] { table.Type, table.TypeLazy }.Contains(data.GetType()) == false)
                 throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
             if (orm.Aop.AuditValueHandler == null) return;
             foreach (var col in table.Columns.Values)
             {
                 object val = col.GetValue(data);
-                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.InsertOrUpdate, col, table.Properties[col.CsName], val);
+                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.InsertOrUpdate, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
                 orm.Aop.AuditValueHandler(sender, auditArgs);
                 if (auditArgs.ValueIsChanged)
                 {
@@ -112,6 +110,7 @@ namespace FreeSql.Internal.CommonProvider
         public IInsertOrUpdate<T1> SetSource(IEnumerable<T1> source)
         {
             if (source == null || source.Any() == false) return this;
+            UpdateProvider<T1>.GetDictionaryTableInfo(source.FirstOrDefault(), _orm, ref _table);
             AuditDataValue(this, source, _orm, _table, _auditValueChangedDict);
             _source.AddRange(source.Where(a => a != null));
             return this;
@@ -139,6 +138,11 @@ namespace FreeSql.Internal.CommonProvider
             _tableRule = tableRule;
             return this;
         }
+        public IInsertOrUpdate<T1> AsTable(string tableName)
+        {
+            _tableRule = (oldname) => tableName;
+            return this;
+        }
         public IInsertOrUpdate<T1> AsType(Type entityType)
         {
             if (entityType == typeof(object)) throw new Exception("IInsertOrUpdate.AsType 参数不支持指定为 object");
@@ -146,6 +150,7 @@ namespace FreeSql.Internal.CommonProvider
             var newtb = _commonUtils.GetTableByEntity(entityType);
             _table = newtb ?? throw new Exception("IInsertOrUpdate.AsType 参数错误，请传入正确的实体类型");
             if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(entityType);
+            IdentityColumn = _table.Primarys.Where(a => a.Attribute.IsIdentity).FirstOrDefault();
             return this;
         }
 
@@ -182,6 +187,7 @@ namespace FreeSql.Internal.CommonProvider
                     case DataType.Oracle:
                     case DataType.OdbcDameng:
                     case DataType.Dameng:
+                    case DataType.GBase:
                         sb.Append(" FROM dual");
                         break;
                     case DataType.Firebird:
diff --git a/FreeSql/Internal/CommonProvider/InsertProvider.cs b/FreeSql/Internal/CommonProvider/InsertProvider.cs
index 5a2b62cb..36450189 100644
--- a/FreeSql/Internal/CommonProvider/InsertProvider.cs
+++ b/FreeSql/Internal/CommonProvider/InsertProvider.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
+using System.Collections;
 
 namespace FreeSql.Internal.CommonProvider
 {
@@ -115,6 +116,7 @@ namespace FreeSql.Internal.CommonProvider
         {
             if (source != null)
             {
+                UpdateProvider<T1>.GetDictionaryTableInfo(source, _orm, ref _table);
                 AuditDataValue(this, source, _orm, _table, _auditValueChangedDict);
                 _source.Add(source);
             }
@@ -124,6 +126,7 @@ namespace FreeSql.Internal.CommonProvider
         {
             if (source != null)
             {
+                UpdateProvider<T1>.GetDictionaryTableInfo(source.FirstOrDefault(), _orm, ref _table);
                 AuditDataValue(this, source, _orm, _table, _auditValueChangedDict);
                 _source.AddRange(source);
             }
@@ -134,6 +137,7 @@ namespace FreeSql.Internal.CommonProvider
             if (source != null)
             {
                 source = source.Where(a => a != null).ToList();
+                UpdateProvider<T1>.GetDictionaryTableInfo(source.FirstOrDefault(), _orm, ref _table);
                 AuditDataValue(this, source, _orm, _table, _auditValueChangedDict);
                 _source.AddRange(source);
 
@@ -148,7 +152,7 @@ namespace FreeSql.Internal.CommonProvider
         }
         public static void AuditDataValue(object sender, T1 data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
-            if (data == null) return;
+            if (data == null || table == null) return;
             if (typeof(T1) == typeof(object) && new[] { table.Type, table.TypeLazy }.Contains(data.GetType()) == false)
                 throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
             foreach (var col in table.Columns.Values)
@@ -156,7 +160,7 @@ namespace FreeSql.Internal.CommonProvider
                 object val = col.GetValue(data);
                 if (orm.Aop.AuditValueHandler != null)
                 {
-                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Insert, col, table.Properties[col.CsName], val);
+                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Insert, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
                     orm.Aop.AuditValueHandler(sender, auditArgs);
                     if (auditArgs.ValueIsChanged)
                     {
@@ -210,7 +214,7 @@ namespace FreeSql.Internal.CommonProvider
                 ret[a] = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
             return ret;
         }
-        protected int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
+        protected virtual int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = 0;
@@ -505,13 +509,14 @@ namespace FreeSql.Internal.CommonProvider
 
         protected string TableRuleInvoke()
         {
-            if (_tableRule == null) return _table.DbName;
-            var newname = _tableRule(_table.DbName);
-            if (newname == _table.DbName) return _table.DbName;
-            if (string.IsNullOrEmpty(newname)) return _table.DbName;
+            var tbname = _table?.DbName ?? "";
+            if (_tableRule == null) return tbname;
+            var newname = _tableRule(tbname);
+            if (newname == tbname) return tbname;
+            if (string.IsNullOrEmpty(newname)) return tbname;
             if (_orm.CodeFirst.IsSyncStructureToLower) newname = newname.ToLower();
             if (_orm.CodeFirst.IsSyncStructureToUpper) newname = newname.ToUpper();
-            if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(_table.Type, newname);
+            if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(_table?.Type, newname);
             return newname;
         }
         public IInsert<T1> AsTable(Func<string, string> tableRule)
@@ -519,6 +524,11 @@ namespace FreeSql.Internal.CommonProvider
             _tableRule = tableRule;
             return this;
         }
+        public IInsert<T1> AsTable(string tableName)
+        {
+            _tableRule = (oldname) => tableName;
+            return this;
+        }
         public IInsert<T1> AsType(Type entityType)
         {
             if (entityType == typeof(object)) throw new Exception("IInsert.AsType 参数不支持指定为 object");
diff --git a/FreeSql/Internal/CommonProvider/InsertProviderAsync.cs b/FreeSql/Internal/CommonProvider/InsertProviderAsync.cs
index 828dba7d..1dfefd6b 100644
--- a/FreeSql/Internal/CommonProvider/InsertProviderAsync.cs
+++ b/FreeSql/Internal/CommonProvider/InsertProviderAsync.cs
@@ -17,7 +17,7 @@ namespace FreeSql.Internal.CommonProvider
     {
 #if net40
 #else
-        async protected Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        async protected virtual Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = 0;
@@ -96,7 +96,7 @@ namespace FreeSql.Internal.CommonProvider
             return ret;
         }
 
-        async protected Task<long> SplitExecuteIdentityAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        async protected virtual Task<long> SplitExecuteIdentityAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             long ret = 0;
@@ -177,7 +177,7 @@ namespace FreeSql.Internal.CommonProvider
             return ret;
         }
 
-        async protected Task<List<T1>> SplitExecuteInsertedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        async protected virtual Task<List<T1>> SplitExecuteInsertedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = new List<T1>();
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index 1c4785a2..58326a91 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -352,6 +352,7 @@ namespace FreeSql.Internal.CommonProvider
                 case DataType.Oracle:
                 case DataType.OdbcOracle:
                 case DataType.Firebird:
+                case DataType.GBase:
                     break;
                 default:
                     _select = "SELECT ";
@@ -407,6 +408,7 @@ namespace FreeSql.Internal.CommonProvider
                 case DataType.Oracle:
                 case DataType.OdbcOracle:
                 case DataType.Firebird:
+                case DataType.GBase:
                     break;
                 default:
                     var beforeSql = this._select;
@@ -440,6 +442,7 @@ namespace FreeSql.Internal.CommonProvider
                 case DataType.Oracle:
                 case DataType.OdbcOracle:
                 case DataType.Firebird:
+                case DataType.GBase:
                     break;
                 default:
                     var beforeSql = this._select;
@@ -544,17 +547,35 @@ namespace FreeSql.Internal.CommonProvider
             {
                 if (string.IsNullOrEmpty(fi.Field) == false)
                 {
-                    Expression exp = ConvertStringPropertyToExpression(fi.Field);
+                    Expression exp = null;
                     switch (fi.Operator)
                     {
+                        case DynamicFilterOperator.Custom:
+                            var fiValueCustomArray = fi.Field?.ToString().Split(new[] { ' ' }, 2);
+                            if (fiValueCustomArray.Length != 2) throw new ArgumentException("Custom 要求 Field 应该空格分割，并且长度为 2，格式：{静态方法名}{空格}{反射信息}");
+                            if (string.IsNullOrWhiteSpace(fiValueCustomArray[0])) throw new ArgumentException("Custom {静态方法名}不能为空，格式：{静态方法名}{空格}{反射信息}");
+                            if (string.IsNullOrWhiteSpace(fiValueCustomArray[1])) throw new ArgumentException("Custom {反射信息}不能为空，格式：{静态方法名}{空格}{反射信息}");
+                            var fiValue1Type = Type.GetType(fiValueCustomArray[1]);
+                            if (fiValue1Type == null) throw new ArgumentException($"Custom 找不到对应的{{反射信息}}：{fiValueCustomArray[1]}");
+                            var fiValue0Method = fiValue1Type.GetMethod(fiValueCustomArray[0], new Type[] { typeof(string) });
+                            if (fiValue0Method == null) throw new ArgumentException($"Custom 找不到对应的{{静态方法名}}：{fiValueCustomArray[0]}");
+                            if (MethodIsDynamicFilterCustomAttribute(fiValue0Method) == false) throw new ArgumentException($"Custom 对应的{{静态方法名}}：{fiValueCustomArray[0]} 未设置 [DynamicFilterCustomAttribute] 特性");
+                            var fiValue0MethodReturn = fiValue0Method?.Invoke(null, new object[] { fi.Value?.ToString() })?.ToString();
+                            exp = Expression.Call(typeof(SqlExt).GetMethod("InternalRawSql", BindingFlags.NonPublic | BindingFlags.Static), Expression.Constant(fiValue0MethodReturn, typeof(string)));
+                            break;
+
                         case DynamicFilterOperator.Contains:
                         case DynamicFilterOperator.StartsWith:
                         case DynamicFilterOperator.EndsWith:
                         case DynamicFilterOperator.NotContains:
                         case DynamicFilterOperator.NotStartsWith:
                         case DynamicFilterOperator.NotEndsWith:
+                            exp = ConvertStringPropertyToExpression(fi.Field);
                             if (exp.Type != typeof(string)) exp = Expression.TypeAs(exp, typeof(string));
                             break;
+                        default:
+                            exp = ConvertStringPropertyToExpression(fi.Field);
+                            break;
                     }
                     switch (fi.Operator)
                     {
@@ -579,7 +600,7 @@ namespace FreeSql.Internal.CommonProvider
                             if (fiValueRangeArray.Length != 2) throw new ArgumentException($"Range 要求 Value 应该逗号分割，并且长度为 2");
                             exp = Expression.AndAlso(
                                 Expression.GreaterThanOrEqual(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueRangeArray[0]), exp.Type)),
-                                Expression.LessThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueRangeArray[1]), exp.Type))); 
+                                Expression.LessThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueRangeArray[1]), exp.Type)));
                             break;
                         case DynamicFilterOperator.DateRange:
                             var fiValueDateRangeArray = getFiListValue();
@@ -676,6 +697,21 @@ namespace FreeSql.Internal.CommonProvider
                     string.IsNullOrEmpty(testFilter.Value?.ToString());
             }
         }
+        static ConcurrentDictionary<MethodInfo, bool> _dicMethodIsDynamicFilterCustomAttribute = new ConcurrentDictionary<MethodInfo, bool>();
+        static bool MethodIsDynamicFilterCustomAttribute(MethodInfo method) => _dicMethodIsDynamicFilterCustomAttribute.GetOrAdd(method, m =>
+        {
+            object[] attrs = null;
+            try
+            {
+                attrs = m.GetCustomAttributes(false).ToArray(); //.net core 反射存在版本冲突问题，导致该方法异常
+            }
+            catch { }
+
+            var dyattr = attrs?.Where(a => {
+                return ((a as Attribute)?.TypeId as Type)?.Name == "DynamicFilterCustomAttribute";
+            }).FirstOrDefault();
+            return dyattr != null;
+        });
 
         public TSelect DisableGlobalFilter(params string[] name)
         {
@@ -722,6 +758,7 @@ namespace FreeSql.Internal.CommonProvider
                     break;
                 case DataType.Sqlite:
                     break;
+                case DataType.GBase:
                 case DataType.ShenTong: //神通测试中发现，不支持 nowait
                     _tosqlAppendContent = $"{_tosqlAppendContent} for update";
                     break;
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
index f70f7fba..d3612d7d 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0ProviderReader.cs
@@ -19,6 +19,25 @@ namespace FreeSql.Internal.CommonProvider
 {
     partial class Select0Provider<TSelect, T1>
     {
+        public DataTable ToDataTableByPropertyName(string[] properties)
+        {
+            if (properties?.Any() != true) throw new ArgumentException($"properties 参数不能为空");
+            var sbfield = new StringBuilder();
+            for (var propIdx = 0; propIdx < properties.Length; propIdx++)
+            {
+                var property = properties[propIdx];
+                var exp = ConvertStringPropertyToExpression(property);
+                if (exp == null) throw new Exception($"{property} 属性名无法找到");
+                var field = _commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, exp, true, null);
+                if (propIdx > 0) sbfield.Append(", ");
+                sbfield.Append(field);
+                //if (field != property)
+                sbfield.Append(_commonUtils.FieldAsAlias(_commonUtils.QuoteSqlName("test").Replace("test", property)));
+            }
+            var sbfieldStr = sbfield.ToString();
+            sbfield.Clear();
+            return ToDataTable(sbfieldStr);
+        }
         public DataTable ToDataTable(string field = null)
         {
             DataTable ret = null;
@@ -514,7 +533,7 @@ namespace FreeSql.Internal.CommonProvider
             });
         }
         static EventHandler<Aop.AuditDataReaderEventArgs> _OldAuditDataReaderHandler;
-        public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
+        public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2(bool isRereadSql = true)
         {
             if (_selectExpression != null) //ToSql
             {
@@ -530,7 +549,7 @@ namespace FreeSql.Internal.CommonProvider
                 _OldAuditDataReaderHandler = _orm.Aop.AuditDataReaderHandler; //清除单表 ExppressionTree
                 _dicGetAllFieldExpressionTree.TryRemove($"{_orm.Ado.DataType}-{_tables[0].Table.DbName}-{_tables[0].Table.Type.FullName}-{_tables[0].Alias}-{_tables[0].Type}", out var oldet);
             }
-            return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.Type.FullName}-{a.Alias}-{a.Type}")), s =>
+            return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.Type.FullName}-{a.Alias}-{a.Type}-{(isRereadSql ? 1 : 0)}")), s =>
             {
                 var tb1 = _tables.First().Table;
                 var type = tb1.TypeLazy ?? tb1.Type;
@@ -564,7 +583,8 @@ namespace FreeSql.Internal.CommonProvider
                     { //普通字段
                         if (index > 0) field.Append(", ");
                         var quoteName = _commonUtils.QuoteSqlName(col.Attribute.Name);
-                        field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+                        if (isRereadSql) field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+                        else field.Append($"{tb.Alias}.{quoteName}");
                         ++index;
                         if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));
                         else dicfield.Add(quoteName, true);
@@ -587,7 +607,8 @@ namespace FreeSql.Internal.CommonProvider
                         {
                             if (index > 0) field.Append(", ");
                             var quoteName = _commonUtils.QuoteSqlName(col2.Attribute.Name);
-                            field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+                            if (isRereadSql) field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+                            else field.Append($"{tb2.Alias}.{quoteName}");
                             ++index;
                             ++otherindex;
                             if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));
@@ -760,8 +781,32 @@ namespace FreeSql.Internal.CommonProvider
             _commonExpression.ExpressionJoinLambda(_tables, joinType, exp, null, _whereGlobalFilter);
             return this as TSelect;
         }
-        protected TSelect InternalOrderBy(Expression column) => this.OrderBy(_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, column, true, null));
-        protected TSelect InternalOrderByDescending(Expression column) => this.OrderBy($"{_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, column, true, null)} DESC");
+        protected TSelect InternalOrderBy(Expression column)
+        {
+            if (column.NodeType == ExpressionType.Lambda) column = (column as LambdaExpression)?.Body;
+            switch (column?.NodeType)
+            {
+                case ExpressionType.New:
+                    var newExp = column as NewExpression;
+                    if (newExp == null) break;
+                    for (var a = 0; a < newExp.Members.Count; a++) this.OrderBy(_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, newExp.Arguments[a], true, null));
+                    return this as TSelect;
+            }
+            return this.OrderBy(_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, column, true, null));
+        }
+        protected TSelect InternalOrderByDescending(Expression column)
+        {
+            if (column.NodeType == ExpressionType.Lambda) column = (column as LambdaExpression)?.Body;
+            switch (column?.NodeType)
+            {
+                case ExpressionType.New:
+                    var newExp = column as NewExpression;
+                    if (newExp == null) break;
+                    for (var a = 0; a < newExp.Members.Count; a++) this.OrderBy($"{_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, newExp.Arguments[a], true, null)} DESC");
+                    return this as TSelect;
+            }
+            return this.OrderBy($"{_commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, column, true, null)} DESC");
+        }
 
         public List<TReturn> InternalToList<TReturn>(Expression select) => this.ToListMapReader<TReturn>(this.GetExpressionField(select));
         protected string InternalToSql<TReturn>(Expression select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex)
@@ -876,6 +921,25 @@ namespace FreeSql.Internal.CommonProvider
         #region Async
 #if net40
 #else
+        public Task<DataTable> ToDataTableByPropertyNameAsync(string[] properties, CancellationToken cancellationToken)
+        {
+            if (properties?.Any() != true) throw new ArgumentException($"properties 参数不能为空");
+            var sbfield = new StringBuilder();
+            for (var propIdx = 0; propIdx < properties.Length; propIdx++)
+            {
+                var property = properties[propIdx];
+                var exp = ConvertStringPropertyToExpression(property);
+                if (exp == null) throw new Exception($"{property} 属性名无法找到");
+                var field = _commonExpression.ExpressionSelectColumn_MemberAccess(_tables, null, SelectTableInfoType.From, exp, true, null);
+                if (propIdx > 0) sbfield.Append(", ");
+                sbfield.Append(field);
+                //if (field != property)
+                sbfield.Append(_commonUtils.FieldAsAlias(_commonUtils.QuoteSqlName("test").Replace("test", property)));
+            }
+            var sbfieldStr = sbfield.ToString();
+            sbfield.Clear();
+            return ToDataTableAsync(sbfieldStr, cancellationToken);
+        }
         async public Task<DataTable> ToDataTableAsync(string field, CancellationToken cancellationToken)
         {
             DataTable ret = null;
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
index 68ca4c50..2f0e0703 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
@@ -96,6 +96,15 @@ namespace FreeSql.Internal.CommonProvider
         }
         public void InternalOrderBy(Expression exp, bool isDescending)
         {
+            if (exp.NodeType == ExpressionType.Lambda) exp = (exp as LambdaExpression)?.Body;
+            if (exp?.NodeType == ExpressionType.New)
+            {
+                var newExp = exp as NewExpression;
+                if (newExp != null)
+                    for (var a = 0; a < newExp.Members.Count; a++)
+                        InternalOrderBy(newExp.Arguments[a], isDescending);
+                return;
+            }
             var sql = _comonExp.ExpressionWhereLambda(null, exp, this, null, null);
             var method = _select.GetType().GetMethod("OrderBy", new[] { typeof(string), typeof(object) });
             method.Invoke(_select, new object[] { isDescending ? $"{sql} DESC" : sql, null });
@@ -150,6 +159,7 @@ namespace FreeSql.Internal.CommonProvider
                 case DataType.OdbcOracle:
                 case DataType.Dameng:
                 case DataType.OdbcDameng: //Oracle、Dameng 分组时，嵌套分页
+                case DataType.GBase:
                     isNestedPageSql = true;
                     break;
                 default:
diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
index 2fad2154..ea98dc63 100644
--- a/FreeSql/Internal/CommonProvider/UpdateProvider.cs
+++ b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
@@ -46,7 +46,7 @@ namespace FreeSql.Internal.CommonProvider
             _commonUtils = commonUtils;
             _commonExpression = commonExpression;
             _table = _commonUtils.GetTableByEntity(typeof(T1));
-            _tempPrimarys = _table.Primarys;
+            _tempPrimarys = _table?.Primarys ?? new ColumnInfo[0];
             _noneParameter = _orm.CodeFirst.IsNoneCommandParameter;
             this.Where(_commonUtils.WhereObject(_table, "", dywhere));
             if (_orm.CodeFirst.IsAutoSyncStructure && typeof(T1) != typeof(object)) _orm.CodeFirst.SyncStructure<T1>();
@@ -60,7 +60,7 @@ namespace FreeSql.Internal.CommonProvider
         protected void IgnoreCanUpdate()
         {
             if (_table == null || _table.Type == typeof(object)) return;
-            foreach (var col in _table.Columns.Values)
+            foreach (var col in _table?.Columns.Values)
                 if (col.Attribute.CanUpdate == false && _ignore.ContainsKey(col.Attribute.Name) == false)
                     _ignore.Add(col.Attribute.Name, true);
         }
@@ -138,7 +138,7 @@ namespace FreeSql.Internal.CommonProvider
         }
 
         #region 参数化数据限制，或values数量限制
-        internal List<T1>[] SplitSource(int valuesLimit, int parameterLimit)
+        protected internal List<T1>[] SplitSource(int valuesLimit, int parameterLimit)
         {
             valuesLimit = valuesLimit - 1;
             parameterLimit = parameterLimit - 1;
@@ -163,7 +163,7 @@ namespace FreeSql.Internal.CommonProvider
                 ret[a] = _source.GetRange(a * takeMax, Math.Min(takeMax, _source.Count - a * takeMax));
             return ret;
         }
-        protected int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
+        protected virtual int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = 0;
@@ -237,7 +237,7 @@ namespace FreeSql.Internal.CommonProvider
             return ret;
         }
 
-        protected List<T1> SplitExecuteUpdated(int valuesLimit, int parameterLimit)
+        protected virtual List<T1> SplitExecuteUpdated(int valuesLimit, int parameterLimit)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = new List<T1>();
@@ -377,7 +377,7 @@ namespace FreeSql.Internal.CommonProvider
                 foreach (var col in table.Columns.Values)
                 {
                     object val = col.GetValue(d);
-                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties[col.CsName], val);
+                    var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
                     orm.Aop.AuditValueHandler(sender, auditArgs);
                     if (auditArgs.ValueIsChanged)
                     {
@@ -393,13 +393,13 @@ namespace FreeSql.Internal.CommonProvider
         public static void AuditDataValue(object sender, T1 data, IFreeSql orm, TableInfo table, Dictionary<string, bool> changedDict)
         {
             if (orm.Aop.AuditValueHandler == null) return;
-            if (data == null) return;
+            if (data == null || table == null) return;
             if (typeof(T1) == typeof(object) && new[] { table.Type, table.TypeLazy }.Contains(data.GetType()) == false)
                 throw new Exception($"操作的数据类型({data.GetType().DisplayCsharp()}) 与 AsType({table.Type.DisplayCsharp()}) 不一致，请检查。");
             foreach (var col in table.Columns.Values)
             {
                 object val = col.GetValue(data);
-                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties[col.CsName], val);
+                var auditArgs = new Aop.AuditValueEventArgs(Aop.AuditValueType.Update, col, table.Properties.TryGetValue(col.CsName, out var tryprop) ? tryprop : null, val);
                 orm.Aop.AuditValueHandler(sender, auditArgs);
                 if (auditArgs.ValueIsChanged)
                 {
@@ -412,10 +412,49 @@ namespace FreeSql.Internal.CommonProvider
             }
         }
 
+        public static void GetDictionaryTableInfo(T1 source, IFreeSql orm, ref TableInfo table)
+        {
+            if (table == null && typeof(T1) == typeof(Dictionary<string, object>))
+            {
+                if (source == null) throw new ArgumentNullException(nameof(source));
+                var dic = source as Dictionary<string, object>;
+                table = new TableInfo();
+                table.Type = typeof(Dictionary<string, object>);
+                table.CsName = dic.TryGetValue("", out var tryval) ? string.Concat(tryval) : "";
+                table.DbName = table.CsName;
+                table.DisableSyncStructure = true;
+                table.IsDictionaryType = true;
+                var colpos = new List<ColumnInfo>();
+                foreach (var kv in dic)
+                {
+                    var colName = kv.Key;
+                    if (orm.CodeFirst.IsSyncStructureToLower) colName = colName.ToLower();
+                    if (orm.CodeFirst.IsSyncStructureToUpper) colName = colName.ToUpper();
+                    var col = new ColumnInfo
+                    {
+                        CsName = kv.Key,
+                        Table = table,
+                        Attribute = new DataAnnotations.ColumnAttribute
+                        {
+                            Name = colName,
+                            MapType = typeof(object)
+                        },
+                        CsType = typeof(object)
+                    };
+                    table.Columns.Add(colName, col);
+                    table.ColumnsByCs.Add(kv.Key, col);
+                    colpos.Add(col);
+                }
+                table.ColumnsByPosition = colpos.ToArray();
+                colpos.Clear();
+            }
+        }
+
         public IUpdate<T1> SetSource(T1 source) => this.SetSource(new[] { source });
         public IUpdate<T1> SetSource(IEnumerable<T1> source, Expression<Func<T1, object>> tempPrimarys = null)
         {
             if (source == null || source.Any() == false) return this;
+            GetDictionaryTableInfo(source.FirstOrDefault(), _orm, ref _table);
             AuditDataValue(this, source, _orm, _table, _auditValueChangedDict);
             _source.AddRange(source.Where(a => a != null));
 
@@ -445,7 +484,7 @@ namespace FreeSql.Internal.CommonProvider
             _set.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
 
             var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_params, "u", col, col.Attribute.MapType, val) :
-                _commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, $"{_commonUtils.QuoteParamterName("p_")}{_params.Count}");
+                _commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_params.Count}"));
             _set.Append(_commonUtils.RewriteColumn(col, colsql));
             if (_noneParameter == false)
                 _commonUtils.AppendParamter(_params, null, col, col.Attribute.MapType, val);
@@ -487,7 +526,8 @@ namespace FreeSql.Internal.CommonProvider
                             var memberName = initExp.Bindings[a].Member.Name;
                             if (_table.ColumnsByCsIgnore.ContainsKey(memberName)) continue;
                             if (_table.ColumnsByCs.TryGetValue(memberName, out var col) == false) throw new Exception($"找不到属性：{memberName}");
-                            var memberValue = _commonExpression.ExpressionLambdaToSql(initAssignExp.Expression, new CommonExpression.ExpTSC { isQuoteName = true, mapType = col.Attribute.MapType });
+                            var memberValue = _commonExpression.ExpressionLambdaToSql(initAssignExp.Expression, new CommonExpression.ExpTSC { isQuoteName = true, 
+                                mapType = initAssignExp.Expression is BinaryExpression ? null : col.Attribute.MapType });
                             _setIncr.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(memberValue);
                         }
                     }
@@ -501,7 +541,8 @@ namespace FreeSql.Internal.CommonProvider
                             var memberName = newExp.Members[a].Name;
                             if (_table.ColumnsByCsIgnore.ContainsKey(memberName)) continue;
                             if (_table.ColumnsByCs.TryGetValue(memberName, out var col) == false) throw new Exception($"找不到属性：{memberName}");
-                            var memberValue = _commonExpression.ExpressionLambdaToSql(newExp.Arguments[a], new CommonExpression.ExpTSC { isQuoteName = true, mapType = col.Attribute.MapType });
+                            var memberValue = _commonExpression.ExpressionLambdaToSql(newExp.Arguments[a], new CommonExpression.ExpTSC { isQuoteName = true, 
+                                mapType = newExp.Arguments[a] is BinaryExpression ? null : col.Attribute.MapType });
                             _setIncr.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(memberValue);
                         }
                     }
@@ -665,6 +706,11 @@ namespace FreeSql.Internal.CommonProvider
             _tableRule = tableRule;
             return this;
         }
+        public IUpdate<T1> AsTable(string tableName)
+        {
+            _tableRule = (oldname) => tableName;
+            return this;
+        }
         public IUpdate<T1> AsType(Type entityType)
         {
             if (entityType == typeof(object)) throw new Exception("IUpdate.AsType 参数不支持指定为 object");
diff --git a/FreeSql/Internal/CommonProvider/UpdateProviderAsync.cs b/FreeSql/Internal/CommonProvider/UpdateProviderAsync.cs
index 32e97a6c..9f8aa53a 100644
--- a/FreeSql/Internal/CommonProvider/UpdateProviderAsync.cs
+++ b/FreeSql/Internal/CommonProvider/UpdateProviderAsync.cs
@@ -18,7 +18,7 @@ namespace FreeSql.Internal.CommonProvider
     {
 #if net40
 #else
-        async protected Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        async protected virtual Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = 0;
@@ -91,7 +91,7 @@ namespace FreeSql.Internal.CommonProvider
             ClearData();
             return ret;
         }
-        async protected Task<List<T1>> SplitExecuteUpdatedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        async protected virtual Task<List<T1>> SplitExecuteUpdatedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
         {
             var ss = SplitSource(valuesLimit, parameterLimit);
             var ret = new List<T1>();
diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs
index 63bd8905..93be8c72 100644
--- a/FreeSql/Internal/CommonUtils.cs
+++ b/FreeSql/Internal/CommonUtils.cs
@@ -54,7 +54,7 @@ namespace FreeSql.Internal
         public abstract string NowUtc { get; }
         public abstract string QuoteWriteParamterAdapter(Type type, string paramterName);
         protected abstract string QuoteReadColumnAdapter(Type type, Type mapType, string columnName);
-        public string RewriteColumn(ColumnInfo col, string sql)
+        public virtual string RewriteColumn(ColumnInfo col, string sql)
         {
             if (string.IsNullOrWhiteSpace(col?.Attribute.RewriteSql) == false)
                 return string.Format(col.Attribute.RewriteSql, sql);
diff --git a/FreeSql/Internal/Model/ColumnInfo.cs b/FreeSql/Internal/Model/ColumnInfo.cs
index ef69fcc6..d8a5c42c 100644
--- a/FreeSql/Internal/Model/ColumnInfo.cs
+++ b/FreeSql/Internal/Model/ColumnInfo.cs
@@ -31,6 +31,7 @@ namespace FreeSql.Internal.Model
         /// <returns></returns>
         public object GetDbValue(object obj)
         {
+            if (Table.IsDictionaryType) return (obj as Dictionary<string, object>)?.TryGetValue(CsName, out var tryval) == true ? tryval : null;
             var dbval = Table.GetPropertyValue(obj, CsName);
             //if (ConversionCsToDb != null) dbval = ConversionCsToDb(dbval);
             if (Attribute.MapType != CsType) dbval = Utils.GetDataReaderValue(Attribute.MapType, dbval);
@@ -40,13 +41,27 @@ namespace FreeSql.Internal.Model
         /// 获取 obj.CsName 属性原始值（不经过 MapType）
         /// </summary>
         /// <param name="obj"></param>
-        public object GetValue(object obj) => Table.GetPropertyValue(obj, CsName);
+        public object GetValue(object obj)
+        {
+            if (Table.IsDictionaryType) return (obj as Dictionary<string, object>)?.TryGetValue(CsName, out var tryval) == true ? tryval : null;
+            return Table.GetPropertyValue(obj, CsName);
+        }
         /// <summary>
         /// 设置 obj.CsName 属性值
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="val"></param>
-        public void SetValue(object obj, object val) => Table.SetPropertyValue(obj, CsName, Utils.GetDataReaderValue(CsType, val));
+        public void SetValue(object obj, object val)
+        {
+            if (Table.IsDictionaryType)
+            {
+                var dic = obj as Dictionary<string, object>;
+                if (dic.ContainsKey(CsName)) dic[CsName] = val;
+                else dic.Add(CsName, val);
+                return;
+            }
+            Table.SetPropertyValue(obj, CsName, Utils.GetDataReaderValue(CsType, val));
+        }
 
 
 
diff --git a/FreeSql/Internal/Model/DynamicFilterInfo.cs b/FreeSql/Internal/Model/DynamicFilterInfo.cs
index 060d772b..7b025e76 100644
--- a/FreeSql/Internal/Model/DynamicFilterInfo.cs
+++ b/FreeSql/Internal/Model/DynamicFilterInfo.cs
@@ -120,6 +120,28 @@ namespace FreeSql.Internal.Model
         /// not in (1,2,3)<para></para>
         /// 此时 Value 的值格式为逗号分割：value1,value2,value3... 或者数组
         /// </summary>
-        NotAny
+        NotAny,
+
+        /// <summary>
+        /// 自定义解析，此时 Field 为反射信息，Value 为静态方法的参数(string)<para></para>
+        /// 示范：{ Operator: "Custom", Field: "RawSql webapp1.DynamicFilterCustom,webapp1", Value: "(id,name) in ((1,'k'),(2,'m'))" }<para></para>
+        /// 注意：使用者自己承担【注入风险】<para></para>
+        /// 静态方法定义示范：<para></para>
+        /// namespace webapp1<para></para>
+        /// {<para></para>
+        /// public class DynamicFilterCustom<para></para>
+        /// {<para></para>
+        /// [DynamicFilterCustom]<para></para>
+        /// public static string RawSql(string value) => value;<para></para>
+        /// }<para></para>
+        /// }<para></para>
+        /// </summary>
+        Custom
     }
+
+    /// <summary>
+    /// 授权 DynamicFilter 支持 Custom 自定义解析
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method)]
+    public class DynamicFilterCustomAttribute : Attribute { }
 }
diff --git a/FreeSql/Internal/Model/TableInfo.cs b/FreeSql/Internal/Model/TableInfo.cs
index 44088248..4058a626 100644
--- a/FreeSql/Internal/Model/TableInfo.cs
+++ b/FreeSql/Internal/Model/TableInfo.cs
@@ -25,6 +25,7 @@ namespace FreeSql.Internal.Model
         public bool DisableSyncStructure { get; set; }
         public string Comment { get; internal set; }
         public bool IsRereadSql { get; internal set; }
+        public bool IsDictionaryType { get; internal set; }
 
         public ColumnInfo VersionColumn { get; set; }
 
diff --git a/FreeSql/Internal/ObjectPool/DefaultPolicy.cs b/FreeSql/Internal/ObjectPool/DefaultPolicy.cs
index 1e7e47a0..e505e273 100644
--- a/FreeSql/Internal/ObjectPool/DefaultPolicy.cs
+++ b/FreeSql/Internal/ObjectPool/DefaultPolicy.cs
@@ -17,6 +17,7 @@ namespace FreeSql.Internal.ObjectPool
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         public Func<T> CreateObject;
         public Action<Object<T>> OnGetObject;
diff --git a/FreeSql/Internal/ObjectPool/IPolicy.cs b/FreeSql/Internal/ObjectPool/IPolicy.cs
index 9a2b40d6..a4662db1 100644
--- a/FreeSql/Internal/ObjectPool/IPolicy.cs
+++ b/FreeSql/Internal/ObjectPool/IPolicy.cs
@@ -48,6 +48,11 @@ namespace FreeSql.Internal.ObjectPool
         /// </summary>
         int CheckAvailableInterval { get; set; }
 
+        /// <summary>
+        /// 权重
+        /// </summary>
+        int Weight { get; set; }
+
         /// <summary>
         /// 对象池的对象被创建时
         /// </summary>
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
index ffe5d765..6108c130 100644
--- a/FreeSql/Internal/UtilsExpressionTree.cs
+++ b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
@@ -118,7 +119,7 @@ namespace FreeSql.Internal
                     var leftBt = colattr.DbType.IndexOf('(');
                     colattr.DbType = colattr.DbType.Substring(0, leftBt).ToUpper() + colattr.DbType.Substring(leftBt);
                 }
-                else
+                else if (common._orm.Ado.DataType != DataType.ClickHouse)
                     colattr.DbType = colattr.DbType.ToUpper();
 
                 if (colattrIsNull == false && colattrIsNullable == true) colattr.DbType = colattr.DbType.Replace("NOT NULL", "");
@@ -129,12 +130,13 @@ namespace FreeSql.Internal
                 if (common.CodeFirst.IsSyncStructureToLower) colattr.Name = colattr.Name.ToLower();
                 if (common.CodeFirst.IsSyncStructureToUpper) colattr.Name = colattr.Name.ToUpper();
 
-                if ((colattr.IsNullable != true || colattr.IsIdentity == true || colattr.IsPrimary == true) && colattr.DbType.Contains("NOT NULL") == false)
+                if ((colattr.IsNullable != true || colattr.IsIdentity == true || colattr.IsPrimary == true) && colattr.DbType.Contains("NOT NULL") == false && common._orm.Ado.DataType != DataType.ClickHouse)
                 {
                     colattr.IsNullable = false;
                     colattr.DbType = Regex.Replace(colattr.DbType, @"\bNULL\b", "").Trim() + " NOT NULL";
                 }
                 if (colattr.IsNullable == true && colattr.DbType.Contains("NOT NULL")) colattr.DbType = colattr.DbType.Replace("NOT NULL", "");
+                else if (colattr.IsNullable == true && !colattr.DbType.Contains("Nullable") && common._orm.Ado.DataType == DataType.ClickHouse) colattr.DbType = $"Nullable({colattr.DbType})";
                 colattr.DbType = Regex.Replace(colattr.DbType, @"\([^\)]+\)", m =>
                 {
                     var tmpLt = Regex.Replace(m.Groups[0].Value, @"\s", "");
@@ -203,6 +205,36 @@ namespace FreeSql.Internal
                 //    else if (Math.Abs(dt.Subtract(DateTime.UtcNow).TotalSeconds) < 60)
                 //        col.DbDefaultValue = common.NowUtc;
                 //}
+
+                if (common._orm.Ado.DataType == DataType.GBase)
+                {
+                    if (colattr.IsIdentity == true)
+                    {
+                        var colType = col.CsType.NullableTypeOrThis();
+                        if (colType == typeof(int) || colType == typeof(uint))
+                            colattr.DbType = "SERIAL";
+                        else if (colType == typeof(long) || colType == typeof(ulong))
+                            colattr.DbType = "SERIAL8";
+                    }
+                    if (colattr.MapType.NullableTypeOrThis() == typeof(DateTime))
+                    {
+                        if (colattr._Precision == null)
+                        {
+                            colattr.DbType = "DATETIME YEAR TO FRACTION(3)";
+                            colattr.Precision = 3;
+                            col.DbPrecision = 3;
+                        }
+                        else if (colattr._Precision == 0)
+                        {
+                            colattr.DbType = "DATETIME YEAR TO SECOND";
+                        }
+                        else if (colattr._Precision > 0)
+                        {
+                            colattr.DbType = $"DATETIME YEAR TO FRACTION({colattr.Precision})";
+                            col.DbPrecision = (byte)colattr.Precision;
+                        }
+                    }
+                }
                 if (colattr.ServerTime != DateTimeKind.Unspecified && new[] { typeof(DateTime), typeof(DateTimeOffset) }.Contains(colattr.MapType.NullableTypeOrThis()))
                 {
                     var commonNow = common.Now;
@@ -234,12 +266,13 @@ namespace FreeSql.Internal
                 {
                     int strlen = colattr.StringLength;
                     var charPatten = @"(CHARACTER|CHAR2|CHAR)\s*(\([^\)]*\))?";
+                    var strNotNull = colattr.IsNullable == false ? " NOT NULL" : "";
                     switch (common._orm.Ado.DataType)
                     {
                         case DataType.MySql:
                         case DataType.OdbcMySql:
-                            if (strlen == -2) colattr.DbType = "LONGTEXT";
-                            else if (strlen < 0) colattr.DbType = "TEXT";
+                            if (strlen == -2) colattr.DbType = $"LONGTEXT{strNotNull}";
+                            else if (strlen < 0) colattr.DbType = $"TEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.SqlServer:
@@ -252,15 +285,15 @@ namespace FreeSql.Internal
                         case DataType.KingbaseES:
                         case DataType.OdbcKingbaseES:
                         case DataType.ShenTong:
-                            if (strlen < 0) colattr.DbType = "TEXT";
+                            if (strlen < 0) colattr.DbType = $"TEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.Oracle:
-                            if (strlen < 0) colattr.DbType = "NCLOB"; //v1.3.2+ https://github.com/dotnetcore/FreeSql/issues/259
+                            if (strlen < 0) colattr.DbType = $"NCLOB{strNotNull}"; //v1.3.2+ https://github.com/dotnetcore/FreeSql/issues/259
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.Dameng:
-                            if (strlen < 0) colattr.DbType = "TEXT";
+                            if (strlen < 0) colattr.DbType = $"TEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.OdbcOracle:
@@ -269,17 +302,21 @@ namespace FreeSql.Internal
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.Sqlite:
-                            if (strlen < 0) colattr.DbType = "TEXT";
+                            if (strlen < 0) colattr.DbType = $"TEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.MsAccess:
                             charPatten = @"(CHAR|CHAR2|CHARACTER|TEXT)\s*(\([^\)]*\))?";
-                            if (strlen < 0) colattr.DbType = "LONGTEXT";
+                            if (strlen < 0) colattr.DbType = $"LONGTEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                         case DataType.Firebird:
                             charPatten = @"(CHAR|CHAR2|CHARACTER|TEXT)\s*(\([^\)]*\))?";
-                            if (strlen < 0) colattr.DbType = "BLOB SUB_TYPE 1";
+                            if (strlen < 0) colattr.DbType = $"BLOB SUB_TYPE 1{strNotNull}";
+                            else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
+                            break;
+                        case DataType.GBase:
+                            if (strlen < 0) colattr.DbType = $"TEXT{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, charPatten, $"$1({strlen})");
                             break;
                     }
@@ -289,12 +326,13 @@ namespace FreeSql.Internal
                 {
                     int strlen = colattr.StringLength;
                     var bytePatten = @"(VARBINARY|BINARY|BYTEA)\s*(\([^\)]*\))?";
+                    var strNotNull = colattr.IsNullable == false ? " NOT NULL" : "";
                     switch (common._orm.Ado.DataType)
                     {
                         case DataType.MySql:
                         case DataType.OdbcMySql:
-                            if (strlen == -2) colattr.DbType = "LONGBLOB";
-                            else if (strlen < 0) colattr.DbType = "BLOB";
+                            if (strlen == -2) colattr.DbType = $"LONGBLOB{strNotNull}";
+                            else if (strlen < 0) colattr.DbType = $"BLOB{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, bytePatten, $"$1({strlen})");
                             break;
                         case DataType.SqlServer:
@@ -307,27 +345,30 @@ namespace FreeSql.Internal
                         case DataType.KingbaseES:
                         case DataType.OdbcKingbaseES:
                         case DataType.ShenTong: //驱动引发的异常:“System.Data.OscarClient.OscarException”(位于 System.Data.OscarClient.dll 中)
-                            colattr.DbType = "BYTEA"; //变长二进制串
+                            colattr.DbType = $"BYTEA{strNotNull}"; //变长二进制串
                             break;
                         case DataType.Oracle:
-                            colattr.DbType = "BLOB";
+                            colattr.DbType = $"BLOB{strNotNull}";
                             break;
                         case DataType.Dameng:
-                            colattr.DbType = "BLOB";
+                            colattr.DbType = $"BLOB{strNotNull}";
                             break;
                         case DataType.OdbcOracle:
                         case DataType.OdbcDameng:
-                            colattr.DbType = "BLOB";
+                            colattr.DbType = $"BLOB{strNotNull}";
                             break;
                         case DataType.Sqlite:
-                            colattr.DbType = "BLOB";
+                            colattr.DbType = $"BLOB{strNotNull}";
                             break;
                         case DataType.MsAccess:
-                            if (strlen < 0) colattr.DbType = "BLOB";
+                            if (strlen < 0) colattr.DbType = $"BLOB{strNotNull}";
                             else colattr.DbType = Regex.Replace(colattr.DbType, bytePatten, $"$1({strlen})");
                             break;
                         case DataType.Firebird:
-                            colattr.DbType = "BLOB";
+                            colattr.DbType = $"BLOB{strNotNull}";
+                            break;
+                        case DataType.GBase:
+                            colattr.DbType = $"BYTE{strNotNull}";
                             break;
                     }
                 }
@@ -1234,12 +1275,13 @@ namespace FreeSql.Internal
         });
 
         public static T[] GetDbParamtersByObject<T>(string sql, object obj, string paramPrefix, Func<string, Type, object, T> constructorParamter)
+            where T : IDataParameter
         {
             if (string.IsNullOrEmpty(sql) || obj == null) return new T[0];
             var isCheckSql = sql != "*";
             var ttype = typeof(T);
             var type = obj.GetType();
-            if (type == ttype) return new[] { (T)Convert.ChangeType(obj, type) };
+            if (ttype.IsAssignableFrom(type)) return new[] { (T)obj };
             var ret = new List<T>();
             var dic = obj as IDictionary;
             if (dic != null)
@@ -1250,7 +1292,7 @@ namespace FreeSql.Internal
                     if (isCheckSql && string.IsNullOrEmpty(paramPrefix) == false && sql.IndexOf($"{paramPrefix}{dbkey}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
                     var val = dic[key];
                     var valType = val == null ? typeof(string) : val.GetType();
-                    if (valType == ttype) ret.Add((T)Convert.ChangeType(val, ttype));
+                    if (ttype.IsAssignableFrom(valType)) ret.Add((T)val);
                     else ret.Add(constructorParamter(dbkey, valType, val));
                 }
             }
@@ -1261,7 +1303,7 @@ namespace FreeSql.Internal
                 {
                     if (isCheckSql && string.IsNullOrEmpty(paramPrefix) == false && sql.IndexOf($"{paramPrefix}{p.Name}", StringComparison.CurrentCultureIgnoreCase) == -1) continue;
                     var pvalue = p.GetValue(obj, null);
-                    if (p.PropertyType == ttype) ret.Add((T)Convert.ChangeType(pvalue, ttype));
+                    if (ttype.IsAssignableFrom(p.PropertyType)) ret.Add((T)pvalue);
                     else ret.Add(constructorParamter(p.Name, p.PropertyType, pvalue));
                 }
             }
@@ -1333,7 +1375,7 @@ namespace FreeSql.Internal
                 this.Value = value;
                 this.DataIndex = dataIndex;
             }
-            public static ConstructorInfo Constructor = typeof(RowInfo). GetConstructor(new[] { typeof(object), typeof(int) });
+            public static ConstructorInfo Constructor = typeof(RowInfo).GetConstructor(new[] { typeof(object), typeof(int) });
             public static PropertyInfo PropertyValue = typeof(RowInfo).GetProperty("Value");
             public static PropertyInfo PropertyDataIndex = typeof(RowInfo).GetProperty("DataIndex");
         }
@@ -1351,6 +1393,7 @@ namespace FreeSql.Internal
             switch (orm.Ado.DataType)
             {
                 case DataType.Dameng: //OdbcDameng 不会报错
+                case DataType.GBase:
                     if (dr.IsDBNull(index)) return null;
                     break;
             }
@@ -1464,7 +1507,7 @@ namespace FreeSql.Internal
                             ), new[] { typeExp, indexesExp, rowExp, dataIndexExp, commonUtilExp }).Compile();
                     }
 
-                    if (type == typeof(object) && indexes != null)
+                    if (type == typeof(object) && indexes != null || type == typeof(Dictionary<string, object>))
                     {
                         Func<Type, int[], DbDataReader, int, CommonUtils, RowInfo> dynamicFunc = (type2, indexes2, row2, dataindex2, commonUtils2) =>
                         {
@@ -1812,7 +1855,7 @@ namespace FreeSql.Internal
         static MethodInfo MethodBigIntegerParse = typeof(Utils).GetMethod("ToBigInteger", BindingFlags.Public | BindingFlags.Static, null, new[] { typeof(string) }, null);
         static PropertyInfo PropertyDateTimeOffsetDateTime = typeof(DateTimeOffset).GetProperty("DateTime", BindingFlags.Instance | BindingFlags.Public);
         static PropertyInfo PropertyDateTimeTicks = typeof(DateTime).GetProperty("Ticks", BindingFlags.Instance | BindingFlags.Public);
-        static ConstructorInfo CtorDateTimeOffsetArgsTicks = typeof(DateTimeOffset). GetConstructor(new[] { typeof(long), typeof(TimeSpan) });
+        static ConstructorInfo CtorDateTimeOffsetArgsTicks = typeof(DateTimeOffset).GetConstructor(new[] { typeof(long), typeof(TimeSpan) });
         static Encoding DefaultEncoding = Encoding.UTF8;
         static MethodInfo MethodEncodingGetBytes = typeof(Encoding).GetMethod("GetBytes", new[] { typeof(string) });
         static MethodInfo MethodEncodingGetString = typeof(Encoding).GetMethod("GetString", new[] { typeof(byte[]) });
@@ -1831,7 +1874,7 @@ namespace FreeSql.Internal
             {
                 if (type.IsArray)
                 {
-                    switch (type.FullName) 
+                    switch (type.FullName)
                     {
                         case "System.Byte[]":
                             return Expression.IfThenElse(
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseAdo.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseAdo.cs
new file mode 100644
index 00000000..0eb76626
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseAdo.cs
@@ -0,0 +1,79 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
+using System;
+using System.Collections;
+using System.Data.Common;
+using System.Text;
+using System.Threading;
+using ClickHouse.Client.ADO;
+
+namespace FreeSql.ClickHouse
+{
+    class ClickHouseAdo : FreeSql.Internal.CommonProvider.AdoProvider
+    {
+
+        public ClickHouseAdo() : base(DataType.ClickHouse, null, null) { }
+        public ClickHouseAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.ClickHouse, masterConnectionString, slaveConnectionStrings)
+        {
+            base._util = util;
+            if (connectionFactory != null)
+            {
+                MasterPool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.ClickHouse, connectionFactory);
+                return;
+            }
+            if (!string.IsNullOrEmpty(masterConnectionString))
+                MasterPool = new ClickHouseConnectionPool("主库", masterConnectionString, null, null);
+            if (slaveConnectionStrings != null)
+            {
+                foreach (var slaveConnectionString in slaveConnectionStrings)
+                {
+                    var slavePool = new ClickHouseConnectionPool($"从库{SlavePools.Count + 1}", slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables), () => Interlocked.Increment(ref slaveUnavailables));
+                    SlavePools.Add(slavePool);
+                }
+            }
+        }
+        public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
+        {
+            if (param == null) return "NULL";
+            if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
+                param = Utils.GetDataReaderValue(mapType, param);
+
+            if (param is bool || param is bool?)
+                return (bool)param ? 1 : 0;
+            else if (param is string)
+                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'"); //只有 mysql 需要处理反斜杠
+            else if (param is char)
+                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\").Replace('\0', ' '), "'");
+            else if (param is Enum)
+                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'"); //((Enum)val).ToInt64();
+            else if (decimal.TryParse(string.Concat(param), out var trydec))
+                return param;
+            else if (param is DateTime || param is DateTime?)
+                return string.Concat("'", ((DateTime)param).ToString("yyyy-MM-dd HH:mm:ss"), "'");
+            else if (param is TimeSpan || param is TimeSpan?)
+                return ((TimeSpan)param).Ticks / 10;
+            else if (param is byte[])
+                return $"0x{CommonUtils.BytesSqlRaw(param as byte[])}";
+            else if (param is IEnumerable)
+                return AddslashesIEnumerable(param, mapType, mapColumn);
+
+            return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'");
+        }
+
+        public override DbCommand CreateCommand()
+        {
+            System.Data.IDbCommand command =  new ClickHouseCommand();
+            return (DbCommand)command;
+        }
+
+        public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
+        {
+            var rawPool = pool as ClickHouseConnectionPool;
+            if (rawPool != null) rawPool.Return(conn, ex);
+            else pool.Return(conn);
+        }
+
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs
new file mode 100644
index 00000000..eb1bd06f
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs
@@ -0,0 +1,258 @@
+using FreeSql.Internal.ObjectPool;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using ClickHouse.Client.ADO;
+
+namespace FreeSql.ClickHouse
+{
+
+    class ClickHouseConnectionPool : ObjectPool<DbConnection>
+    {
+
+        internal Action availableHandler;
+        internal Action unavailableHandler;
+
+        public ClickHouseConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
+        {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
+            var policy = new ClickHouseConnectionPoolPolicy
+            {
+                _pool = this,
+                Name = name
+            };
+            this.Policy = policy;
+            policy.ConnectionString = connectionString;
+        }
+
+        public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
+        {
+            if (exception != null && exception is ClickHouseException)
+            {
+                try { if (obj.Value.Ping() == false) obj.Value.Open(); } catch { base.SetUnavailable(exception); }
+            }
+            base.Return(obj, isRecreate);
+        }
+    }
+    public class ClickHouseException : Exception
+    {
+        public int Code;
+
+        public string Name;
+        public string ServerStackTrace;
+
+        public ClickHouseException() { }
+
+        public ClickHouseException(string message) : base(message) { }
+
+        public ClickHouseException(string message, Exception innerException) : base(message, innerException) { }
+    }
+    class ClickHouseConnectionPoolPolicy : IPolicy<DbConnection>
+    {
+
+        internal ClickHouseConnectionPool _pool;
+        public string Name { get; set; } = "ClickHouse ClickHouseConnection 对象池";
+        public int PoolSize { get; set; } = 100;
+        public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(10);
+        public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
+        public int AsyncGetCapacity { get; set; } = 10000;
+        public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
+        public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
+
+        static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
+        private string _connectionString;
+        public string ConnectionString
+        {
+            get => _connectionString;
+            set
+            {
+                _connectionString = value ?? "";
+
+                //var pattern = @"Max\s*pool\s*size\s*=\s*(\d+)";
+                //var m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                //if (m.Success == false || int.TryParse(m.Groups[1].Value, out var poolsize) == false || poolsize <= 0) poolsize = 100;
+                //var connStrIncr = dicConnStrIncr.AddOrUpdate(_connectionString, 1, (oldkey, oldval) => Math.Min(5, oldval + 1));
+                //PoolSize = poolsize + connStrIncr;
+                //_connectionString = m.Success ?
+                //    Regex.Replace(_connectionString, pattern, $"Max pool size={PoolSize}", RegexOptions.IgnoreCase) :
+                //    $"{_connectionString};Max pool size={PoolSize}";
+
+
+                var pattern = @"Max\s*pool\s*size\s*=\s*(\d+)";
+                Match m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success)
+                {
+                    PoolSize = int.Parse(m.Groups[1].Value);
+                    _connectionString = Regex.Replace(_connectionString, pattern, "", RegexOptions.IgnoreCase);
+                }
+
+                pattern = @"Connection\s*LifeTime\s*=\s*(\d+)";
+                m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success)
+                {
+                    IdleTimeout = TimeSpan.FromSeconds(int.Parse(m.Groups[1].Value));
+                    _connectionString = Regex.Replace(_connectionString, pattern, "", RegexOptions.IgnoreCase);
+                }
+
+                var minPoolSize = 0;
+                pattern = @"Min\s*pool\s*size\s*=\s*(\d+)";
+                m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success)
+                {
+                    minPoolSize = int.Parse(m.Groups[1].Value);
+                    _connectionString = Regex.Replace(_connectionString, pattern, "", RegexOptions.IgnoreCase);
+                }
+
+                FreeSql.Internal.CommonUtils.PrevReheatConnectionPool(_pool, minPoolSize);
+            }
+        }
+
+        public bool OnCheckAvailable(Object<DbConnection> obj)
+        {
+            if (obj.Value.State == ConnectionState.Closed) obj.Value.Open();
+            return obj.Value.Ping(true);
+        }
+
+        public DbConnection OnCreate()
+        {
+            var conn = new ClickHouseConnection(_connectionString);
+            return conn;
+        }
+
+        public void OnDestroy(DbConnection obj)
+        {
+            if (obj.State != ConnectionState.Closed) obj.Close();
+            obj.Dispose();
+        }
+
+        public void OnGet(Object<DbConnection> obj)
+        {
+
+            if (_pool.IsAvailable)
+            {
+                if (obj.Value == null)
+                {
+                    if (_pool.SetUnavailable(new Exception("连接字符串错误")) == true)
+                        throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
+                    return;
+                }
+
+                if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false)
+                {
+
+                    try
+                    {
+                        obj.Value.Open();
+                    }
+                    catch (Exception ex)
+                    {
+                        if (_pool.SetUnavailable(ex) == true)
+                            throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
+                    }
+                }
+            }
+        }
+
+#if net40
+#else
+        async public Task OnGetAsync(Object<DbConnection> obj)
+        {
+
+            if (_pool.IsAvailable)
+            {
+                if (obj.Value == null)
+                {
+                    if (_pool.SetUnavailable(new Exception("连接字符串错误")) == true)
+                        throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
+                    return;
+                }
+
+                if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && (await obj.Value.PingAsync()) == false)
+                {
+
+                    try
+                    {
+                        await obj.Value.OpenAsync();
+                    }
+                    catch (Exception ex)
+                    {
+                        if (_pool.SetUnavailable(ex) == true)
+                            throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
+                    }
+                }
+            }
+        }
+#endif
+
+        public void OnGetTimeout()
+        {
+
+        }
+
+        public void OnReturn(Object<DbConnection> obj)
+        {
+            //if (obj?.Value != null && obj.Value.State != ConnectionState.Closed) try { obj.Value.Close(); } catch { }
+        }
+
+        public void OnAvailable()
+        {
+            _pool.availableHandler?.Invoke();
+        }
+
+        public void OnUnavailable()
+        {
+            _pool.unavailableHandler?.Invoke();
+        }
+    }
+
+    static class DbConnectionExtensions
+    {
+
+        static DbCommand PingCommand(DbConnection conn)
+        {
+            var cmd = conn.CreateCommand();
+            cmd.CommandTimeout = 5;
+            cmd.CommandText = "select 1";
+            return cmd;
+        }
+        public static bool Ping(this DbConnection that, bool isThrow = false)
+        {
+            try
+            {
+                PingCommand(that).ExecuteNonQuery();
+                return true;
+            }
+            catch
+            {
+                if (that.State != ConnectionState.Closed) try { that.Close(); } catch { }
+                if (isThrow) throw;
+                return false;
+            }
+        }
+
+#if net40
+#else
+        async public static Task<bool> PingAsync(this DbConnection that, bool isThrow = false)
+        {
+            try
+            {
+                await PingCommand(that).ExecuteNonQueryAsync();
+                return true;
+            }
+            catch
+            {
+                if (that.State != ConnectionState.Closed) try { that.Close(); } catch { }
+                if (isThrow) throw;
+                return false;
+            }
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
new file mode 100644
index 00000000..8f006685
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseCodeFirst.cs
@@ -0,0 +1,332 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Data.Common;
+using FreeSql.Internal.ObjectPool;
+using ClickHouse.Client.ADO;
+
+namespace FreeSql.ClickHouse
+{
+
+    class ClickHouseCodeFirst : Internal.CommonProvider.CodeFirstProvider
+    {
+
+        public ClickHouseCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) : base(orm, commonUtils, commonExpression) { }
+        
+        static object _dicCsToDbLock = new object();
+        
+        static Dictionary<string, CsToDb<DbType>> _dicCsToDb = new Dictionary<string, CsToDb<DbType>>() {
+                { typeof(bool).FullName, CsToDb.New(DbType.SByte, "Int8","Int8", null, false, false) },{ typeof(bool?).FullName, CsToDb.New(DbType.SByte, "Int8","Nullable(Int8)", null, true, null) },
+                
+                { typeof(sbyte).FullName, CsToDb.New(DbType.SByte, "Int8", "Int8", false, false, 0) },{ typeof(sbyte?).FullName, CsToDb.New(DbType.SByte, "Int8", "Nullable(Int8)", false, true, null) },
+                { typeof(short).FullName, CsToDb.New(DbType.Int16, "Int16","Int16", false, false, 0) },{ typeof(short?).FullName, CsToDb.New(DbType.Int16, "Int16", "Nullable(Int16)", false, true, null) },
+                { typeof(int).FullName, CsToDb.New(DbType.Int32, "Int32", "Int32", false, false, 0) },{ typeof(int?).FullName, CsToDb.New(DbType.Int32, "Int32", "Nullable(Int32)", false, true, null) },
+                { typeof(long).FullName, CsToDb.New(DbType.Int64, "Int64","Int64", false, false, 0) },{ typeof(long?).FullName, CsToDb.New(DbType.Int64, "Int64","Nullable(Int64)", false, true, null) },
+
+                { typeof(byte).FullName, CsToDb.New(DbType.Byte, "UInt8","UInt8", true, false, 0) },{ typeof(byte?).FullName, CsToDb.New(DbType.Byte, "UInt8","Nullable(UInt8)", true, true, null) },
+                { typeof(ushort).FullName, CsToDb.New(DbType.UInt16, "UInt16","UInt16", true, false, 0) },{ typeof(ushort?).FullName, CsToDb.New(DbType.UInt16, "UInt16", "Nullable(UInt16)", true, true, null) },
+                { typeof(uint).FullName, CsToDb.New(DbType.UInt32, "UInt32", "UInt32", true, false, 0) },{ typeof(uint?).FullName, CsToDb.New(DbType.UInt32, "UInt32", "Nullable(UInt32)", true, true, null) },
+                { typeof(ulong).FullName, CsToDb.New(DbType.UInt64, "UInt64", "UInt64", true, false, 0) },{ typeof(ulong?).FullName, CsToDb.New(DbType.UInt64, "UInt64", "Nullable(UInt64)", true, true, null) },
+
+                { typeof(double).FullName, CsToDb.New(DbType.Double, "Float64", "Float64", false, false, 0) },{ typeof(double?).FullName, CsToDb.New(DbType.Double, "Float64", "Nullable(Float64)", false, true, null) },
+                { typeof(float).FullName, CsToDb.New(DbType.Single, "Float32","Float32", false, false, 0) },{ typeof(float?).FullName, CsToDb.New(DbType.Single, "Float32","Nullable(Float32)", false, true, null) },
+                { typeof(decimal).FullName, CsToDb.New(DbType.Decimal, "Decimal128(19)","Decimal128(19)", false, false, 0) },{ typeof(decimal?).FullName, CsToDb.New(DbType.Decimal, "Nullable(Decimal128(19))","Nullable(Decimal128(19))", false, true, null) },
+
+                { typeof(DateTime).FullName, CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "DateTime('Asia/Shanghai')", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName, CsToDb.New(DbType.DateTime, "DateTime('Asia/Shanghai')", "Nullable(DateTime('Asia/Shanghai'))", false, true, null) },
+
+                { typeof(string).FullName, CsToDb.New(DbType.String, "String", "String", false, null, "") },
+                { typeof(char).FullName, CsToDb.New(DbType.String, "String", "String", false, false, "") },{ typeof(char?).FullName, CsToDb.New(DbType.Single, "String","Nullable(String)", false, true, null) },
+                { typeof(Guid).FullName, CsToDb.New(DbType.String, "String", "String", false, false, Guid.Empty) },{ typeof(Guid?).FullName, CsToDb.New(DbType.String, "String", "Nullable(String)", false, true, null) },
+
+            };
+
+        public override DbInfoResult GetDbInfo(Type type)
+        {
+            if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return new DbInfoResult((int)trydc.type, trydc.dbtype, trydc.dbtypeFull, trydc.isnullable, trydc.defaultValue);
+            if (type.IsArray) return null;
+            return null;
+        }
+
+        protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
+        {
+            Object<DbConnection> conn = null;
+            string database = null;
+            
+            try
+            {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+                database = conn.Value.Database;
+
+                var sb = new StringBuilder();
+                foreach (var obj in objects)
+                {
+                    if (sb.Length > 0) sb.Append("\r\n");
+                    var tb = _commonUtils.GetTableByEntity(obj.entityType);
+                    if (tb == null) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移");
+                    if (tb.Columns.Any() == false) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移，可迁移属性0个");
+                    var tbname = _commonUtils.SplitTableName(tb.DbName);
+                    if (tbname?.Length == 1) tbname = new[] { database, tbname[0] };
+
+                    var tboldname = _commonUtils.SplitTableName(tb.DbOldName); //旧表名
+                    if (tboldname?.Length == 1) tboldname = new[] { database, tboldname[0] };
+                    if (string.IsNullOrEmpty(obj.tableName) == false)
+                    {
+                        var tbtmpname = _commonUtils.SplitTableName(obj.tableName);
+                        if (tbtmpname?.Length == 1) tbtmpname = new[] { database, tbtmpname[0] };
+                        if (tbname[0] != tbtmpname[0] || tbname[1] != tbtmpname[1])
+                        {
+                            tbname = tbtmpname;
+                            tboldname = null;
+                        }
+                    }
+
+                    if (string.Compare(tbname[0], database, true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from system.databases d where name={0}", tbname[0])) == null) //创建数据库
+                        sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(" ENGINE=Ordinary;\r\n");
+
+                    var sbalter = new StringBuilder();
+                    var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
+                    if (LocalExecuteScalar(tbname[0], _commonUtils.FormatSql(" SELECT 1 FROM system.tables t WHERE database ={0} and name ={1}", tbname)) == null)
+                    { //表不存在
+                        if (tboldname != null)
+                        {
+                            if (string.Compare(tboldname[0], tbname[0], true) != 0 && LocalExecuteScalar(database, _commonUtils.FormatSql(" select 1 from system.databases where name={0}", tboldname[0])) == null ||
+                                LocalExecuteScalar(tboldname[0], _commonUtils.FormatSql(" SELECT 1 FROM system.tables WHERE database={0} and name={1}", tboldname)) == null)
+                                //数据库或表不存在
+                                tboldname = null;
+                        }
+                        if (tboldname == null)
+                        {
+                            //创建表
+                            var createTableName = _commonUtils.QuoteSqlName(tbname[0], tbname[1]);
+                            sb.Append("CREATE TABLE IF NOT EXISTS ").Append(createTableName).Append(" ( ");
+                            foreach (var tbcol in tb.ColumnsByPosition)
+                            {
+                                tbcol.Attribute.DbType = tbcol.Attribute.DbType.Replace(" NOT NULL", "");
+                                sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType);
+                                if (string.IsNullOrEmpty(tbcol.Comment) == false) sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment));
+                                sb.Append(",");
+                            }
+
+                            foreach (var uk in tb.Indexes)
+                            {
+                                sb.Append(" \r\n  ");
+                                sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1])));
+                                foreach (var tbcol in uk.Columns)
+                                {
+                                    sb.Append(" ");
+                                    sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
+                                    sb.Append("TYPE set(8192) GRANULARITY 5,  ");
+                                }
+                                sb.Remove(sb.Length - 2, 2);
+                            }
+                            sb.Remove(sb.Length - 1, 1);
+                            sb.Append("\r\n) ");
+                            sb.Append("\r\nENGINE = MergeTree()");
+                            
+                            if (tb.Primarys.Any())
+                            {
+                                sb.Append(" \r\nORDER BY ( ");
+                                var ls = new StringBuilder();
+                                foreach (var tbcol in tb.Primarys) ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
+                                sb.Append(ls);
+                                sb.Remove(sb.Length - 2, 2);
+                                sb.Append(" )");
+                                sb.Append(" \r\nPRIMARY KEY ");
+                                sb.Append(ls);
+                                sb.Remove(sb.Length - 2, 2).Append(",");
+                            }
+                            sb.Remove(sb.Length - 1, 1);
+                            //if (string.IsNullOrEmpty(tb.Comment) == false)
+                            //    sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
+                            sb.Append(" SETTINGS index_granularity = 8192;\r\n");
+                            continue;
+                        }
+                        //如果新表，旧表在一个数据库下，直接修改表名
+                        if (string.Compare(tbname[0], tboldname[0], true) == 0)
+                            sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tboldname[0], tboldname[1])).Append(" RENAME TO ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(";\r\n");
+                        else
+                        {
+                            //如果新表，旧表不在一起，创建新表，导入数据，删除旧表
+                            istmpatler = true;
+                        }
+                    }
+                    else
+                        tboldname = null; //如果新表已经存在，不走改表名逻辑
+
+                    //对比字段，只可以修改类型、增加字段、有限的修改字段名；保证安全不删除字段
+                    var sql = _commonUtils.FormatSql(@"
+select
+a.name,
+a.type,
+if(ilike(a.`type`, 'Nullable(%S%)'),'is_nullable','0'),
+a.comment as comment,
+a.is_in_partition_key,
+a.is_in_sorting_key,
+a.is_in_primary_key,
+a.is_in_sampling_key
+from system.columns a
+where a.database in ({0}) and a.table in ({1})", tboldname ?? tbname);
+                    var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+                    var tbstruct = ds.ToDictionary(a => string.Concat(a[0]), a =>
+                    {
+                        return new
+                        {
+                            column = string.Concat(a[0]),
+                            sqlType = (string)a[1],
+                            is_nullable = string.Concat(a[2]) == "1",
+                            is_identity = false,
+                            comment = string.Concat(a[3]),
+                            is_primary= string.Concat(a[6]) == "1",
+                        };
+                    }, StringComparer.CurrentCultureIgnoreCase);
+
+                    if (istmpatler == false)
+                    {
+                        var existsPrimary = tbstruct.Any(o => o.Value.is_primary);
+                        foreach (var tbcol in tb.ColumnsByPosition)
+                        {
+                            if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
+                                string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol))
+                            {
+                                var isCommentChanged = tbstructcol.comment != (tbcol.Comment ?? "");
+                                if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false ||
+                                    tbcol.Attribute.IsNullable != tbstructcol.is_nullable || isCommentChanged)
+                                    sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" MODIFY COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(tbcol.Attribute.IsNullable ? $"Nullable({tbcol.Attribute.DbType.Split(' ').First()})":tbcol.Attribute.DbType.Split(' ').First()).Append(";\r\n");
+                                if(isCommentChanged) sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" COMMENT COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? "")).Append(";\r\n");
+                                if (string.Compare(tbstructcol.column, tbcol.Attribute.OldName, true) == 0)
+                                    sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" COLUMN ").Append(_commonUtils.QuoteSqlName(tbstructcol.column)).Append(" TO ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(";\r\n");
+                                continue;
+                            }
+                            //添加列
+                            sbalter.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(" ADD ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType);
+                            if (tbcol.Attribute.IsNullable == false && tbcol.DbDefaultValue != "NULL" && tbcol.Attribute.IsIdentity == false) sbalter.Append(" DEFAULT ").Append(tbcol.DbDefaultValue);
+                            if (string.IsNullOrEmpty(tbcol.Comment) == false) sbalter.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment ?? ""));
+                            sbalter.Append(";\r\n");
+                        }
+
+                    }
+
+
+                    //创建临时表，数据导进临时表，然后删除原表，将临时表改名为原表名
+                    var tablename = tboldname == null ? _commonUtils.QuoteSqlName(tbname[0], tbname[1]) : _commonUtils.QuoteSqlName(tboldname[0], tboldname[1]);
+                    var tmptablename = _commonUtils.QuoteSqlName(tbname[0], $"FreeSqlTmp_{tbname[1]}");
+                    //创建临时表
+                    sb.Append("CREATE TABLE IF NOT EXISTS ").Append(tmptablename).Append(" ( ");
+                    foreach (var tbcol in tb.ColumnsByPosition)
+                    {
+                        tbcol.Attribute.DbType = tbcol.Attribute.DbType.Replace(" NOT NULL", "");
+                        sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType);
+                        if (string.IsNullOrEmpty(tbcol.Comment) == false) sb.Append(" COMMENT ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment));
+                        sb.Append(",");
+                    }
+
+                    foreach (var uk in tb.Indexes)
+                    {
+                        sb.Append(" \r\n  ");
+                        sb.Append("INDEX ").Append(_commonUtils.QuoteSqlName(ReplaceIndexName(uk.Name, tbname[1]))).Append("(");
+                        foreach (var tbcol in uk.Columns)
+                        {
+                            sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
+                            sb.Append("TYPE set(8192) GRANULARITY 5, ");
+                        }
+                        sb.Remove(sb.Length - 2, 2).Append("),");
+                    }
+                    sb.Remove(sb.Length - 1, 1);
+                    sb.Append("\r\n) ");
+                    sb.Append("\r\nENGINE = MergeTree()");
+
+                    if (tb.Primarys.Any())
+                    {
+                        sb.Append(" \r\nORDER BY ( ");
+                        var ls = new StringBuilder();
+                        foreach (var tbcol in tb.Primarys) ls.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
+                        sb.Append(ls);
+                        sb.Remove(sb.Length - 2, 2);
+                        sb.Append(" )");
+                        sb.Append(" \r\nPRIMARY KEY ");
+                        sb.Append(ls);
+                        sb.Remove(sb.Length - 2, 2).Append(",");
+                    }
+                    sb.Remove(sb.Length - 1, 1);
+                    //if (string.IsNullOrEmpty(tb.Comment) == false)
+                    //    sb.Append(" Comment=").Append(_commonUtils.FormatSql("{0}", tb.Comment));
+                    sb.Append(" SETTINGS index_granularity = 8192;\r\n");
+
+                    sb.Append("INSERT INTO ").Append(tmptablename).Append(" SELECT ");
+                    foreach (var tbcol in tb.ColumnsByPosition)
+                    {
+                        var insertvalue = "NULL";
+                        if (tbstruct.TryGetValue(tbcol.Attribute.Name, out var tbstructcol) ||
+                            string.IsNullOrEmpty(tbcol.Attribute.OldName) == false && tbstruct.TryGetValue(tbcol.Attribute.OldName, out tbstructcol))
+                        {
+                            insertvalue = _commonUtils.QuoteSqlName(tbstructcol.column);
+                            if (tbcol.Attribute.DbType.StartsWith(tbstructcol.sqlType, StringComparison.CurrentCultureIgnoreCase) == false)
+                            {
+                                //insertvalue = $"cast({insertvalue} as {tbcol.Attribute.DbType.Split(' ').First()})";
+                            }
+                            if (tbcol.Attribute.IsNullable != tbstructcol.is_nullable)
+                                insertvalue = $"ifnull({insertvalue},{tbcol.DbDefaultValue})";
+                        }
+                        else if (tbcol.Attribute.IsNullable == false)
+                            if (tbcol.DbDefaultValue != "NULL")
+                                insertvalue = tbcol.DbDefaultValue;
+                        sb.Append(insertvalue).Append(", ");
+                    }
+                    sb.Remove(sb.Length - 2, 2).Append(" FROM ").Append(tablename).Append(";\r\n");
+                    sb.Append("DROP TABLE ").Append(tablename).Append(";\r\n");
+                    sb.Append("RENAME TABLE ").Append(tmptablename).Append(" TO ").Append(_commonUtils.QuoteSqlName(tbname[0], tbname[1])).Append(";\r\n");
+                }
+                return sb.Length == 0 ? null : sb.ToString();
+            }
+            finally
+            {
+                try
+                {
+                    if (string.IsNullOrEmpty(database) == false)
+                        conn.Value.ChangeDatabase(database);
+                    _orm.Ado.MasterPool.Return(conn);
+                }
+                catch
+                {
+                    _orm.Ado.MasterPool.Return(conn, true);
+                }
+            }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
+        }
+
+        public override int ExecuteDDLStatements(string ddl)
+        {
+            if (string.IsNullOrEmpty(ddl)) return 0;
+            var scripts = ddl.Split(new string[] { ";\r\n" }, StringSplitOptions.None).Where(a => string.IsNullOrEmpty(a.Trim()) == false).ToArray();
+
+            if (scripts.Any() == false) return 0;
+
+            var affrows = 0;
+            foreach (var script in scripts)
+                affrows += base.ExecuteDDLStatements(script);
+            return affrows;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseDbFirst.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseDbFirst.cs
new file mode 100644
index 00000000..5c1b9da8
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseDbFirst.cs
@@ -0,0 +1,473 @@
+using FreeSql.DatabaseModel;
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using ClickHouse.Client.ADO;
+
+namespace FreeSql.ClickHouse
+{
+    class ClickHouseDbFirst : IDbFirst
+    {
+        IFreeSql _orm;
+        protected CommonUtils _commonUtils;
+        protected CommonExpression _commonExpression;
+        public ClickHouseDbFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
+        {
+            _orm = orm;
+            _commonUtils = commonUtils;
+            _commonExpression = commonExpression;
+        }
+
+        public int GetDbType(DbColumnInfo column) => (int)GetClickHouseDbType(column);
+        DbType GetClickHouseDbType(DbColumnInfo column)
+        {
+            if (column.DbTypeText == "Nullable")
+            {
+                column.DbTypeText = column.DbTypeTextFull;
+                   //(?<=\()(\S +)(?=\))
+            }
+            switch (column.DbTypeText?.ToLower())
+            {
+                case "bit":
+                case "tinyint":
+                case "bool":
+                case "sbyte":
+                case "int8":
+                case "nullable(int8)": return DbType.SByte;
+                case "byte":
+                case "uint8":
+                case "nullable(uint8)": return DbType.Byte;
+                case "smallint":
+                case "int16":
+                case "nullable(int16)": return DbType.Int16;
+                case "uint16":
+                case "nullable(uint16)": return DbType.UInt16;
+                case "int32":
+                case "int":
+                case "nullable(int32)": return DbType.Int32;
+                case "uint":
+                case "uint32":
+                case "nullable(uint32)": return DbType.UInt32;
+                case "bigint":
+                case "int64":
+                case "long":
+                case "nullable(int64)": return DbType.Int64;
+                case "uint64":
+                case "ulong":
+                case "nullable(uint64)": return DbType.UInt64;
+                case "real":
+                case "Float64":
+                case "double":
+                case "nullable(float64)": return DbType.Double;
+                case "Float32":
+                case "float":
+                case "nullable(float32)": return DbType.Single;
+                case "decimal":
+                case "decimal128":
+                case "nullable(decimal128)": return DbType.Decimal;
+                case "date":
+                case "nullable(date)": return DbType.Date;
+                case "datetime":
+                case "nullable(datetime)": return DbType.DateTime;
+                case "datetime64":
+                case "nullable(datetime64)": return DbType.DateTime;
+                case "tinytext":
+                case "text": 
+                case "mediumtext":
+                case "longtext":
+                case "char":
+                case "string":
+                case "nullable(string)":
+                case "varchar": return DbType.String;
+                default:
+                    {
+                        if (column.DbTypeText?.ToLower().Contains("datetime") == true) 
+                            return DbType.DateTime;
+                        return DbType.String;
+                    }
+            }
+        }
+
+        static readonly Dictionary<int, DbToCs> _dicDbToCs = new Dictionary<int, DbToCs>() {
+                { (int)DbType.SByte, new DbToCs("(sbyte?)", "sbyte.Parse({0})", "{0}.ToString()", "sbyte?", typeof(sbyte), typeof(sbyte?), "{0}.Value", "GetByte") },
+                { (int)DbType.Int16, new DbToCs("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") },
+                { (int)DbType.Int32, new DbToCs("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") },
+                { (int)DbType.Int64, new DbToCs("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") },
+
+                { (int)DbType.Byte, new DbToCs("(byte?)", "byte.Parse({0})", "{0}.ToString()", "byte?", typeof(byte), typeof(byte?), "{0}.Value", "GetByte") },
+                { (int)DbType.UInt16, new DbToCs("(ushort?)", "ushort.Parse({0})", "{0}.ToString()", "ushort?", typeof(ushort), typeof(ushort?), "{0}.Value", "GetInt16") },
+                { (int)DbType.UInt32, new DbToCs("(uint?)", "uint.Parse({0})", "{0}.ToString()", "uint?", typeof(uint), typeof(uint?), "{0}.Value", "GetInt32") },
+                { (int)DbType.UInt64, new DbToCs("(ulong?)", "ulong.Parse({0})", "{0}.ToString()", "ulong?", typeof(ulong), typeof(ulong?), "{0}.Value", "GetInt64") },
+
+                { (int)DbType.Double, new DbToCs("(double?)", "double.Parse({0})", "{0}.ToString()", "double?", typeof(double), typeof(double?), "{0}.Value", "GetDouble") },
+                { (int)DbType.Single, new DbToCs("(float?)", "float.Parse({0})", "{0}.ToString()", "float?", typeof(float), typeof(float?), "{0}.Value", "GetFloat") },
+                { (int)DbType.Decimal, new DbToCs("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") },
+
+                { (int)DbType.Date, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+                { (int)DbType.Date, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+                { (int)DbType.DateTime, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+                { (int)DbType.DateTime2, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+
+                { (int)DbType.Guid, new DbToCs("(Guid?)", "Guid.Parse({0})", "{0}.ToString()", "Guid?", typeof(Guid), typeof(Guid?), "{0}", "GetString") },
+                { (int)DbType.String, new DbToCs("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") },
+
+            };
+
+        public string GetCsConvert(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", "")) : null;
+        public string GetCsParse(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csParse : null;
+        public string GetCsStringify(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csStringify : null;
+        public string GetCsType(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", "")) : null;
+        public Type GetCsTypeInfo(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeInfo : null;
+        public string GetCsTypeValue(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeValue : null;
+        public string GetDataReaderMethod(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.dataReaderMethod : null;
+
+        public List<string> GetDatabases()
+        {
+            var sql = @" select name from system.databases where name not in ('system', 'default')";
+            var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+            return ds.Select(a => a.FirstOrDefault()?.ToString()).ToList();
+        }
+
+        public bool ExistsTable(string name, bool ignoreCase)
+        {
+            if (string.IsNullOrEmpty(name)) return false; 
+            var tbname = _commonUtils.SplitTableName(name);
+            if (tbname?.Length == 1)
+            {
+                var database = "";
+                using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
+                {
+                    database = conn.Value.Database;
+                }
+                tbname = new[] { database, tbname[0] };
+            }
+            if (ignoreCase) tbname = tbname.Select(a => a.ToLower()).ToArray();
+            var sql = $" SELECT 1 FROM information_schema.TABLES WHERE {(ignoreCase ? "lower(table_schema)" : "table_schema")} = {_commonUtils.FormatSql("{0}", tbname[0])} and {(ignoreCase ? "lower(table_name)" : "table_name")} = {_commonUtils.FormatSql("{0}", tbname[1])}";
+            return string.Concat(_orm.Ado.ExecuteScalar(CommandType.Text, sql)) == "1";
+        }
+
+        public DbTableInfo GetTableByName(string name, bool ignoreCase = true) => GetTables(null, name, ignoreCase)?.FirstOrDefault();
+        public List<DbTableInfo> GetTablesByDatabase(params string[] database) => GetTables(database, null, false);
+
+        public List<DbTableInfo> GetTables(string[] database, string tablename, bool ignoreCase)
+        {
+            var loc1 = new List<DbTableInfo>();
+            var loc2 = new Dictionary<string, DbTableInfo>(StringComparer.CurrentCultureIgnoreCase);
+            var loc3 = new Dictionary<string, Dictionary<string, DbColumnInfo>>(StringComparer.CurrentCultureIgnoreCase);
+            string[] tbname = null;
+            if (string.IsNullOrEmpty(tablename) == false)
+            {
+                tbname = _commonUtils.SplitTableName(tablename);
+                if (tbname?.Length == 1)
+                {
+                    using (var conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5)))
+                    {
+                        if (string.IsNullOrEmpty(conn.Value.Database)) return loc1;
+                        tbname = new[] { conn.Value.Database, tbname[0] };
+                    }
+                }
+                if (ignoreCase) tbname = tbname.Select(a => a.ToLower()).ToArray();
+                database = new[] { tbname[0] };
+            }
+            else if (database == null || database.Any() == false)
+            {
+                using (var conn = _orm.Ado.MasterPool.Get())
+                {
+                    if (string.IsNullOrEmpty(conn.Value.Database)) return loc1;
+                    database = new[] { conn.Value.Database };
+                }
+            }
+
+            var databaseIn = string.Join(",", database.Select(a => _commonUtils.FormatSql("{0}", a)));
+            var sql = $@"
+select 
+concat(a.table_schema, '.', a.table_name) 'id',
+a.table_schema 'schema',
+a.table_name 'table',
+a.table_comment,
+a.table_type 'type'
+from information_schema.tables a
+where {(ignoreCase ? "lower(a.table_schema)" : "a.table_schema")} in ({databaseIn}){(tbname == null ? "" : $" and {(ignoreCase ? "lower(a.table_name)" : "a.table_name")}={_commonUtils.FormatSql("{0}", tbname[1])}")}";
+            var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+            if (ds == null) return loc1;
+
+            var loc6 = new List<string[]>();
+            var loc66 = new List<string[]>();
+            var loc6_1000 = new List<string>();
+            var loc66_1000 = new List<string>();
+            foreach (var row in ds)
+            {
+                var table_id = string.Concat(row[0]);
+                var schema = string.Concat(row[1]);
+                var table = string.Concat(row[2]);
+                var comment = string.Concat(row[3]);
+                var type = string.Concat(row[4]) == "VIEW" ? DbTableType.VIEW : DbTableType.TABLE;
+                if (database.Length == 1)
+                {
+                    table_id = table_id.Substring(table_id.IndexOf('.') + 1);
+                    schema = "";
+                }
+                loc2.Add(table_id, new DbTableInfo { Id = table_id, Schema = schema, Name = table, Comment = comment, Type = type });
+                loc3.Add(table_id, new Dictionary<string, DbColumnInfo>(StringComparer.CurrentCultureIgnoreCase));
+                switch (type)
+                {
+                    case DbTableType.TABLE:
+                    case DbTableType.VIEW:
+                        loc6_1000.Add(table.Replace("'", "''"));
+                        if (loc6_1000.Count >= 500)
+                        {
+                            loc6.Add(loc6_1000.ToArray());
+                            loc6_1000.Clear();
+                        }
+                        break;
+                    case DbTableType.StoreProcedure:
+                        loc66_1000.Add(table.Replace("'", "''"));
+                        if (loc66_1000.Count >= 500)
+                        {
+                            loc66.Add(loc66_1000.ToArray());
+                            loc66_1000.Clear();
+                        }
+                        break;
+                }
+            }
+            if (loc6_1000.Count > 0) loc6.Add(loc6_1000.ToArray());
+            if (loc66_1000.Count > 0) loc66.Add(loc66_1000.ToArray());
+
+            if (loc6.Count == 0) return loc1;
+            var loc8 = new StringBuilder().Append("(");
+            for (var loc8idx = 0; loc8idx < loc6.Count; loc8idx++)
+            {
+                if (loc8idx > 0) loc8.Append(" OR ");
+                loc8.Append("a.table_name in (");
+                for (var loc8idx2 = 0; loc8idx2 < loc6[loc8idx].Length; loc8idx2++)
+                {
+                    if (loc8idx2 > 0) loc8.Append(",");
+                    loc8.Append($"'{loc6[loc8idx][loc8idx2]}'");
+                }
+                loc8.Append(")");
+            }
+            loc8.Append(")");
+
+            sql = $@"
+select
+concat(a.table_schema, '.', a.table_name),
+a.column_name,
+a.data_type,
+ifnull(a.character_maximum_length, 0) 'len',
+a.column_type,
+case when a.is_nullable = 'YES' then 1 else 0 end 'is_nullable',
+case when locate('auto_increment', a.extra) > 0 then 1 else 0 end 'is_identity',
+a.column_comment 'comment',
+a.column_default 'default_value'
+from information_schema.columns a
+where {(ignoreCase ? "lower(a.table_schema)" : "a.table_schema")} in ({databaseIn}) and {loc8}
+";
+            ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+            if (ds == null) return loc1;
+
+            var position = 0;
+            foreach (var row in ds)
+            {
+                string table_id = string.Concat(row[0]);
+                string column = string.Concat(row[1]);
+                string type = string.Concat(row[2]);
+                //long max_length = long.Parse(string.Concat(row[3]));
+                string sqlType = string.Concat(row[4]);
+                var m_len = Regex.Match(sqlType, @"\w+\((\d+)");
+                int max_length = m_len.Success ? int.Parse(m_len.Groups[1].Value) : -1;
+                bool is_nullable = string.Concat(row[5]) == "1";
+                bool is_identity = string.Concat(row[6]) == "1";
+                string comment = string.Concat(row[7]);
+                string defaultValue = string.Concat(row[8]);
+                if (max_length == 0) max_length = -1;
+                if (database.Length == 1)
+                {
+                    table_id = table_id.Substring(table_id.IndexOf('.') + 1);
+                }
+                loc3[table_id].Add(column, new DbColumnInfo
+                {
+                    Name = column,
+                    MaxLength = max_length,
+                    IsIdentity = is_identity,
+                    IsNullable = is_nullable,
+                    IsPrimary = false,
+                    DbTypeText = type,
+                    DbTypeTextFull = sqlType,
+                    Table = loc2[table_id],
+                    Comment = comment,
+                    DefaultValue = defaultValue,
+                    Position = ++position
+                });
+                loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
+                loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);
+            }
+
+            sql = $@"
+select 
+concat(a.table_schema, '.', a.table_name) 'table_id',
+a.column_name,
+a.index_name 'index_id',
+case when a.non_unique = 0 then 1 else 0 end 'IsUnique',
+case when a.index_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey',
+0 'IsClustered',
+0 'IsDesc'
+from information_schema.statistics a
+where {(ignoreCase ? "lower(a.table_schema)" : "a.table_schema")} in ({databaseIn}) and {loc8}
+";
+            ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+            if (ds == null) return loc1;
+
+            var indexColumns = new Dictionary<string, Dictionary<string, DbIndexInfo>>(StringComparer.CurrentCultureIgnoreCase);
+            var uniqueColumns = new Dictionary<string, Dictionary<string, DbIndexInfo>>(StringComparer.CurrentCultureIgnoreCase);
+            foreach (var row in ds)
+            {
+                string table_id = string.Concat(row[0]);
+                string column = string.Concat(row[1]);
+                string index_id = string.Concat(row[2]);
+                bool is_unique = string.Concat(row[3]) == "1";
+                bool is_primary_key = string.Concat(row[4]) == "1";
+                bool is_clustered = string.Concat(row[5]) == "1";
+                bool is_desc = string.Concat(row[6]) == "1";
+                if (database.Length == 1)
+                    table_id = table_id.Substring(table_id.IndexOf('.') + 1);
+                if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue;
+                var loc9 = loc3[table_id][column];
+                if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
+
+                Dictionary<string, DbIndexInfo> loc10 = null;
+                DbIndexInfo loc11 = null;
+                if (!indexColumns.TryGetValue(table_id, out loc10))
+                    indexColumns.Add(table_id, loc10 = new Dictionary<string, DbIndexInfo>(StringComparer.CurrentCultureIgnoreCase));
+                if (!loc10.TryGetValue(index_id, out loc11))
+                    loc10.Add(index_id, loc11 = new DbIndexInfo());
+                loc11.Columns.Add(new DbIndexColumnInfo { Column = loc9, IsDesc = is_desc });
+                if (is_unique && !is_primary_key)
+                {
+                    if (!uniqueColumns.TryGetValue(table_id, out loc10))
+                        uniqueColumns.Add(table_id, loc10 = new Dictionary<string, DbIndexInfo>(StringComparer.CurrentCultureIgnoreCase));
+                    if (!loc10.TryGetValue(index_id, out loc11))
+                        loc10.Add(index_id, loc11 = new DbIndexInfo());
+                    loc11.Columns.Add(new DbIndexColumnInfo { Column = loc9, IsDesc = is_desc });
+                }
+            }
+            foreach (string table_id in indexColumns.Keys)
+            {
+                foreach (var column in indexColumns[table_id])
+                    loc2[table_id].IndexesDict.Add(column.Key, column.Value);
+            }
+            foreach (string table_id in uniqueColumns.Keys)
+            {
+                foreach (var column in uniqueColumns[table_id])
+                {
+                    column.Value.Columns.Sort((c1, c2) => c1.Column.Name.CompareTo(c2.Column.Name));
+                    loc2[table_id].UniquesDict.Add(column.Key, column.Value);
+                }
+            }
+
+            if (tbname == null)
+            {
+                sql = $@"
+select 
+concat(a.constraint_schema, '.', a.table_name) 'table_id',
+a.column_name,
+a.constraint_name 'FKId',
+concat(a.referenced_table_schema, '.', a.referenced_table_name) 'ref_table_id',
+1 'IsForeignKey',
+a.referenced_column_name 'ref_column'
+from information_schema.key_column_usage a
+where {(ignoreCase ? "lower(a.constraint_schema)" : "a.constraint_schema")} in ({databaseIn}) and {loc8} and not isnull(position_in_unique_constraint)
+";
+                ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+                if (ds == null) return loc1;
+
+                var fkColumns = new Dictionary<string, Dictionary<string, DbForeignInfo>>(StringComparer.CurrentCultureIgnoreCase);
+                foreach (var row in ds)
+                {
+                    string table_id = string.Concat(row[0]);
+                    string column = string.Concat(row[1]);
+                    string fk_id = string.Concat(row[2]);
+                    string ref_table_id = string.Concat(row[3]);
+                    bool is_foreign_key = string.Concat(row[4]) == "1";
+                    string referenced_column = string.Concat(row[5]);
+                    if (database.Length == 1)
+                    {
+                        table_id = table_id.Substring(table_id.IndexOf('.') + 1);
+                        ref_table_id = ref_table_id.Substring(ref_table_id.IndexOf('.') + 1);
+                    }
+                    if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue;
+                    var loc9 = loc3[table_id][column];
+                    if (loc2.ContainsKey(ref_table_id) == false) continue;
+                    var loc10 = loc2[ref_table_id];
+                    var loc11 = loc3[ref_table_id][referenced_column];
+
+                    Dictionary<string, DbForeignInfo> loc12 = null;
+                    DbForeignInfo loc13 = null;
+                    if (!fkColumns.TryGetValue(table_id, out loc12))
+                        fkColumns.Add(table_id, loc12 = new Dictionary<string, DbForeignInfo>(StringComparer.CurrentCultureIgnoreCase));
+                    if (!loc12.TryGetValue(fk_id, out loc13))
+                        loc12.Add(fk_id, loc13 = new DbForeignInfo { Table = loc2[table_id], ReferencedTable = loc10 });
+                    loc13.Columns.Add(loc9);
+                    loc13.ReferencedColumns.Add(loc11);
+                }
+                foreach (var table_id in fkColumns.Keys)
+                    foreach (var fk in fkColumns[table_id])
+                        loc2[table_id].ForeignsDict.Add(fk.Key, fk.Value);
+            }
+
+            foreach (var table_id in loc3.Keys)
+            {
+                foreach (var loc5 in loc3[table_id].Values)
+                {
+                    loc2[table_id].Columns.Add(loc5);
+                    if (loc5.IsIdentity) loc2[table_id].Identitys.Add(loc5);
+                    if (loc5.IsPrimary) loc2[table_id].Primarys.Add(loc5);
+                }
+            }
+            foreach (var loc4 in loc2.Values)
+            {
+                //if (loc4.Primarys.Count == 0 && loc4.UniquesDict.Count > 0)
+                //{
+                //    foreach (var loc5 in loc4.UniquesDict.First().Value.Columns)
+                //    {
+                //        loc5.Column.IsPrimary = true;
+                //        loc4.Primarys.Add(loc5.Column);
+                //    }
+                //}
+                loc4.Primarys.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
+                loc4.Columns.Sort((c1, c2) =>
+                {
+                    int compare = c2.IsPrimary.CompareTo(c1.IsPrimary);
+                    if (compare == 0)
+                    {
+                        bool b1 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c1.Name).Any()).Any();
+                        bool b2 = loc4.ForeignsDict.Values.Where(fk => fk.Columns.Where(c3 => c3.Name == c2.Name).Any()).Any();
+                        compare = b2.CompareTo(b1);
+                    }
+                    if (compare == 0) compare = c1.Name.CompareTo(c2.Name);
+                    return compare;
+                });
+                loc1.Add(loc4);
+            }
+            loc1.Sort((t1, t2) =>
+            {
+                var ret = t1.Schema.CompareTo(t2.Schema);
+                if (ret == 0) ret = t1.Name.CompareTo(t2.Name);
+                return ret;
+            });
+
+            loc2.Clear();
+            loc3.Clear();
+            return loc1;
+        }
+
+        public List<DbEnumInfo> GetEnumsByDatabase(params string[] database)
+        {
+            return new List<DbEnumInfo>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseExpression.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExpression.cs
new file mode 100644
index 00000000..4d8f1c3f
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExpression.cs
@@ -0,0 +1,575 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FreeSql.ClickHouse
+{
+    class ClickHouseExpression : CommonExpression
+    {
+
+        public ClickHouseExpression(CommonUtils common) : base(common) { }
+
+        public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            switch (exp.NodeType)
+            {
+                case ExpressionType.ArrayLength:
+                    var arrOper = (exp as UnaryExpression)?.Operand;
+                    if (arrOper.Type == typeof(byte[])) return $"length({getExp(arrOper)})";
+                    break;
+                case ExpressionType.Convert:
+                    var operandExp = (exp as UnaryExpression)?.Operand;
+                    var gentype = exp.Type.NullableTypeOrThis();
+                    if (gentype != operandExp.Type.NullableTypeOrThis())
+                    {
+                        switch (gentype.ToString())
+                        {
+                            case "System.Boolean": return $"({getExp(operandExp)} not in ('0','false'))";
+                            case "System.Byte": return $"cast({getExp(operandExp)} as Int8)";
+                            case "System.Char": return $"substr(cast({getExp(operandExp)} as String), 1, 1)";
+                            case "System.DateTime": return $"cast({getExp(operandExp)} as DateTime)";
+                            case "System.Decimal": return $"cast({getExp(operandExp)} as Decimal128(19))";
+                            case "System.Double": return $"cast({getExp(operandExp)} as Float64)";
+                            case "System.Int16": return $"cast({getExp(operandExp)} as Int16)";
+                            case "System.Int32": return $"cast({getExp(operandExp)} as Int32)";
+                            case "System.Int64": return $"cast({getExp(operandExp)} as Int64)";
+                            case "System.SByte": return $"cast({getExp(operandExp)} as UInt8)";
+                            case "System.Single": return $"cast({getExp(operandExp)} as Float32)";
+                            case "System.String": return $"cast({getExp(operandExp)} as String)";
+                            case "System.UInt16": return $"cast({getExp(operandExp)} as UInt16)";
+                            case "System.UInt32": return $"cast({getExp(operandExp)} as UInt32)";
+                            case "System.UInt64": return $"cast({getExp(operandExp)} as UInt64)";
+                            case "System.Guid": return $"substr(cast({getExp(operandExp)} as String), 1, 36)";
+                        }
+                    }
+                    break;
+                case ExpressionType.Call:
+                    var callExp = exp as MethodCallExpression;
+
+                    switch (callExp.Method.Name)
+                    {
+                        case "Parse":
+                        case "TryParse":
+                            switch (callExp.Method.DeclaringType.NullableTypeOrThis().ToString())
+                            {
+                                case "System.Boolean": return $"({getExp(callExp.Arguments[0])} not in ('0','false'))";
+                                case "System.Byte": return $"cast({getExp(callExp.Arguments[0])} as Int8)";
+                                case "System.Char": return $"substr(cast({getExp(callExp.Arguments[0])} as String), 1, 1)";
+                                case "System.DateTime": return $"cast({getExp(callExp.Arguments[0])} as DateTime)";
+                                case "System.Decimal": return $"cast({getExp(callExp.Arguments[0])} as Decimal128(19))";
+                                case "System.Double": return $"cast({getExp(callExp.Arguments[0])} as Float64)";
+                                case "System.Int16": return $"cast({getExp(callExp.Arguments[0])} as Int16)";
+                                case "System.Int32": return $"cast({getExp(callExp.Arguments[0])} as Int32)";
+                                case "System.Int64": return $"cast({getExp(callExp.Arguments[0])} as Int64)";
+                                case "System.SByte": return $"cast({getExp(callExp.Arguments[0])} as UInt8)";
+                                case "System.Single": return $"cast({getExp(callExp.Arguments[0])} as Float32)";
+                                case "System.UInt16": return $"cast({getExp(callExp.Arguments[0])} as UInt16)";
+                                case "System.UInt32": return $"cast({getExp(callExp.Arguments[0])} as UInt32)";
+                                case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as UInt64)";
+                                case "System.Guid": return $"substr(cast({getExp(callExp.Arguments[0])} as String), 1, 36)";
+                            }
+                            return null;
+                        case "NewGuid":
+                            return null;
+                        case "Next":
+                            if (callExp.Object?.Type == typeof(Random)) return "cast(rand()*1000000000 as Int64)";
+                            return null;
+                        case "NextDouble":
+                            if (callExp.Object?.Type == typeof(Random)) return "rand()";
+                            return null;
+                        case "Random":
+                            if (callExp.Method.DeclaringType.IsNumberType()) return "rand()";
+                            return null;
+                        case "ToString":
+                            if (callExp.Object != null) return callExp.Arguments.Count == 0 ? $"cast({getExp(callExp.Object)} as String)" : null;
+                            return null;
+                    }
+
+                    var objExp = callExp.Object;
+                    var objType = objExp?.Type;
+                    if (objType?.FullName == "System.Byte[]") return null;
+
+                    var argIndex = 0;
+                    if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
+                    {
+                        objExp = callExp.Arguments.FirstOrDefault();
+                        objType = objExp?.Type;
+                        argIndex++;
+
+                        if (objType == typeof(string))
+                        {
+                            switch (callExp.Method.Name)
+                            {
+                                case "First":
+                                case "FirstOrDefault":
+                                    return $"substr({getExp(callExp.Arguments[0])}, 1, 1)";
+                            }
+                        }
+                    }
+                    if (objType == null) objType = callExp.Method.DeclaringType;
+                    if (objType != null || objType.IsArrayOrList())
+                    {
+                        if (argIndex >= callExp.Arguments.Count) break;
+                        tsc.SetMapColumnTmp(null);
+                        var args1 = getExp(callExp.Arguments[argIndex]);
+                        var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        var left = objExp == null ? null : getExp(objExp);
+                        tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
+                        switch (callExp.Method.Name)
+                        {
+                            case "Contains":
+                                //判断 in //在各大 Provider AdoProvider 中已约定，500元素分割, 3空格\r\n4空格
+                                return $"(({args1}) in {left.Replace(",   \r\n    \r\n", $") \r\n OR ({args1}) in (")})";
+                        }
+                    }
+                    break;
+                case ExpressionType.NewArrayInit:
+                    var arrExp = exp as NewArrayExpression;
+                    var arrSb = new StringBuilder();
+                    arrSb.Append("(");
+                    for (var a = 0; a < arrExp.Expressions.Count; a++)
+                    {
+                        if (a > 0) arrSb.Append(",");
+                        if (a % 500 == 499) arrSb.Append("   \r\n    \r\n"); //500元素分割, 3空格\r\n4空格
+                        arrSb.Append(getExp(arrExp.Expressions[a]));
+                    }
+                    if (arrSb.Length == 1) arrSb.Append("NULL");
+                    return arrSb.Append(")").ToString();
+                case ExpressionType.ListInit:
+                    var listExp = exp as ListInitExpression;
+                    var listSb = new StringBuilder();
+                    listSb.Append("(");
+                    for (var a = 0; a < listExp.Initializers.Count; a++)
+                    {
+                        if (listExp.Initializers[a].Arguments.Any() == false) continue;
+                        if (a > 0) listSb.Append(",");
+                        listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+                    }
+                    if (listSb.Length == 1) listSb.Append("NULL");
+                    return listSb.Append(")").ToString();
+                case ExpressionType.New:
+                    var newExp = exp as NewExpression;
+                    if (typeof(IList).IsAssignableFrom(newExp.Type))
+                    {
+                        if (newExp.Arguments.Count == 0) return "(NULL)";
+                        if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+                        return getExp(newExp.Arguments[0]);
+                    }
+                    return null;
+            }
+            return null;
+        }
+
+        public override string ExpressionLambdaToSqlMemberAccessString(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Empty": return "''";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            switch (exp.Member.Name)
+            {
+                case "Length": return $"char_length({left})";
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlMemberAccessDateTime(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Now": return _common.Now;
+                    case "UtcNow": return _common.NowUtc;
+                    case "Today": return "curdate()";
+                    case "MinValue": return "cast('0001/1/1 0:00:00' as DateTime)";
+                    case "MaxValue": return "cast('9999/12/31 23:59:59' as DateTime)";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            if ((exp.Expression as MemberExpression)?.Expression.NodeType == ExpressionType.Constant)
+                left = $"toDateTime({left})";
+            
+            //IsDate(left);
+            switch (exp.Member.Name)
+            {
+                case "Date": return $"toDate({left})";
+                case "TimeOfDay": return $"dateDiff(second, toDate({left}), toDateTime({left}))*1000000";
+                case "DayOfWeek": return $"(toDayOfWeek({left})-1)";
+                case "Day": return $"toDayOfMonth({left})";
+                case "DayOfYear": return $"toDayOfYear({left})";
+                case "Month": return $"toMonth({left})";
+                case "Year": return $"toYear({left})";
+                case "Hour": return $"toHour({left})";
+                case "Minute": return $"toMinute({left})";
+                case "Second": return $"toSecond({left})";
+                case "Millisecond": return $"(toSecond({left})/1000)";
+                case "Ticks": return $"(dateDiff(second, toDate('0001-1-1'), toDateTime({left}))*10000000+621355968000000000)";
+            }
+            return null;
+        }
+        public bool IsInt(string _string)
+        {
+            if (string.IsNullOrEmpty(_string))
+                return false;
+            int i = 0;
+            return int.TryParse(_string, out i);
+        }
+        public bool IsDate(string date)
+        {
+            if (string.IsNullOrEmpty(date))
+                return true;
+            return DateTime.TryParse(date, out var time);
+        }
+        public override string ExpressionLambdaToSqlMemberAccessTimeSpan(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Zero": return "0";
+                    case "MinValue": return "-922337203685477580"; //微秒 Ticks / 10
+                    case "MaxValue": return "922337203685477580";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            switch (exp.Member.Name)
+            {
+                case "Days": return $"intDiv(({left})/{60 * 60 * 24})";
+                case "Hours": return $"intDiv(({left})/{60 * 60}%24)";
+                case "Milliseconds": return $"(cast({left} as Int64)*1000)";
+                case "Minutes": return $"intDiv(({left})/60%60)";
+                case "Seconds": return $"(({left})%60)";
+                case "Ticks": return $"(intDiv({left} as Int64)*10000000)";
+                case "TotalDays": return $"(({left})/{60 * 60 * 24})";
+                case "TotalHours": return $"(({left})/{60 * 60})";
+                case "TotalMilliseconds": return $"(cast({left} as Int64)*1000)";
+                case "TotalMinutes": return $"(({left})/60)";
+                case "TotalSeconds": return $"({left})";
+            }
+            return null;
+        }
+
+        public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "IsNullOrEmpty":
+                        var arg1 = getExp(exp.Arguments[0]);
+                        return $"({arg1} is null or {arg1} = '')";
+                    case "IsNullOrWhiteSpace":
+                        var arg2 = getExp(exp.Arguments[0]);
+                        return $"({arg2} is null or {arg2} = '' or ltrim({arg2}) = '')";
+                    case "Concat":
+                        return _common.StringConcat(exp.Arguments.Select(a => getExp(a)).ToArray(), null);
+                    case "Format":
+                        if (exp.Arguments[0].NodeType != ExpressionType.Constant) throw new Exception($"未实现函数表达式 {exp} 解析，参数 {exp.Arguments[0]} 必须为常量");
+                        if (exp.Arguments.Count == 1) return ExpressionLambdaToSql(exp.Arguments[0], tsc);
+                        var expArgsHack = exp.Arguments.Count == 2 && exp.Arguments[1].NodeType == ExpressionType.NewArrayInit ?
+                            (exp.Arguments[1] as NewArrayExpression).Expressions : exp.Arguments.Where((a, z) => z > 0);
+                        //3个 {} 时，Arguments 解析出来是分开的
+                        //4个 {} 时，Arguments[1] 只能解析这个出来，然后里面是 NewArray []
+                        var expArgs = expArgsHack.Select(a => $"',{_common.IsNull(ExpressionLambdaToSql(a, tsc), "''")},'").ToArray();
+                        return $"concat({string.Format(ExpressionLambdaToSql(exp.Arguments[0], tsc), expArgs)})";
+                    case "Join":
+                        if (exp.IsStringJoin(out var tolistObjectExp, out var toListMethod, out var toListArgs1))
+                        {
+                            var newToListArgs0 = Expression.Call(tolistObjectExp, toListMethod,
+                                Expression.Lambda(
+                                    Expression.Call(
+                                        typeof(SqlExtExtensions).GetMethod("StringJoinClickHouseGroupConcat"),
+                                        Expression.Convert(toListArgs1.Body, typeof(object)),
+                                        Expression.Convert(exp.Arguments[0], typeof(object))),
+                                    toListArgs1.Parameters));
+                            var newToListSql = getExp(newToListArgs0);
+                            return newToListSql;
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                switch (exp.Method.Name)
+                {
+                    case "StartsWith":
+                    case "EndsWith":
+                    case "Contains":
+                        var args0Value = getExp(exp.Arguments[0]);
+                        if (args0Value == "NULL") return $"({left}) IS NULL";
+                        if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"concat({args0Value}, '%')")}";
+                        if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"concat('%', {args0Value})")}";
+                        if (args0Value.StartsWith("'") && args0Value.EndsWith("'")) return $"({left}) LIKE {args0Value.Insert(1, "%").Insert(args0Value.Length, "%")}";
+                        return $"({left}) LIKE concat('%', {args0Value}, '%')";
+                    case "ToLower": return $"lower({left})";
+                    case "ToUpper": return $"upper({left})";
+                    case "Substring":
+                        var substrArgs1 = getExp(exp.Arguments[0]);
+                        if (long.TryParse(substrArgs1, out var testtrylng1)) substrArgs1 = (testtrylng1 + 1).ToString();
+                        else substrArgs1 += "+1";
+                        if (exp.Arguments.Count == 1) return $"substr({left}, {substrArgs1})";
+                        return $"substr({left}, {substrArgs1}, {getExp(exp.Arguments[1])})";
+                    case "IndexOf":
+                        var indexOfFindStr = getExp(exp.Arguments[0]);
+                        if (exp.Arguments.Count > 1 && exp.Arguments[1].Type.FullName == "System.Int32")
+                        {
+                            var locateArgs1 = getExp(exp.Arguments[1]);
+                            if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
+                            else locateArgs1 += "+1";
+                            return $"(locate({indexOfFindStr}, {left}, {locateArgs1})-1)";
+                        }
+                        return $"(locate({indexOfFindStr}, {left})-1)";
+                    case "PadLeft":
+                        if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})";
+                        return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "PadRight":
+                        if (exp.Arguments.Count == 1) return $"rpad({left}, {getExp(exp.Arguments[0])})";
+                        return $"rpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "Trim":
+                    case "TrimStart":
+                    case "TrimEnd":
+                        if (exp.Arguments.Count == 0)
+                        {
+                            if (exp.Method.Name == "Trim") return $"trim({left})";
+                            if (exp.Method.Name == "TrimStart") return $"ltrim({left})";
+                            if (exp.Method.Name == "TrimEnd") return $"rtrim({left})";
+                        }
+                        foreach (var argsTrim02 in exp.Arguments)
+                        {
+                            var argsTrim01s = new[] { argsTrim02 };
+                            if (argsTrim02.NodeType == ExpressionType.NewArrayInit)
+                            {
+                                var arritem = argsTrim02 as NewArrayExpression;
+                                argsTrim01s = arritem.Expressions.ToArray();
+                            }
+                            foreach (var argsTrim01 in argsTrim01s)
+                            {
+                                if (exp.Method.Name == "Trim") left = $"trim({getExp(argsTrim01)} from {left})";
+                                if (exp.Method.Name == "TrimStart") left = $"trim(leading {getExp(argsTrim01)} from {left})";
+                                if (exp.Method.Name == "TrimEnd") left = $"trim(trailing {getExp(argsTrim01)} from {left})";
+                            }
+                        }
+                        return left;
+                    case "Replace": return $"replace({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "CompareTo": return $"strcmp({left}, {getExp(exp.Arguments[0])})";
+                    case "Equals": return $"({left} = {getExp(exp.Arguments[0])})";
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            switch (exp.Method.Name)
+            {
+                case "Abs": return $"abs({getExp(exp.Arguments[0])})";
+                case "Sign": return $"sign({getExp(exp.Arguments[0])})";
+                case "Floor": return $"floor({getExp(exp.Arguments[0])})";
+                case "Ceiling": return $"ceiling({getExp(exp.Arguments[0])})";
+                case "Round":
+                    if (exp.Arguments.Count > 1 && exp.Arguments[1].Type.FullName == "System.Int32") return $"round({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    return $"round({getExp(exp.Arguments[0])})";
+                case "Exp": return $"exp({getExp(exp.Arguments[0])})";
+                case "Log": return $"log({getExp(exp.Arguments[0])})";
+                case "Log10": return $"log10({getExp(exp.Arguments[0])})";
+                case "Pow": return $"pow({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                case "Sqrt": return $"sqrt({getExp(exp.Arguments[0])})";
+                case "Cos": return $"cos({getExp(exp.Arguments[0])})";
+                case "Sin": return $"sin({getExp(exp.Arguments[0])})";
+                case "Tan": return $"tan({getExp(exp.Arguments[0])})";
+                case "Acos": return $"acos({getExp(exp.Arguments[0])})";
+                case "Asin": return $"asin({getExp(exp.Arguments[0])})";
+                case "Atan": return $"atan({getExp(exp.Arguments[0])})";
+                case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                case "Truncate": return $"truncate({getExp(exp.Arguments[0])}, 0)";
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                
+                switch (exp.Method.Name)
+                {
+                    case "Compare": return $"({getExp(exp.Arguments[0])} - ({getExp(exp.Arguments[1])}))";
+                    case "DaysInMonth": return $"toDayOfMonth(subtractDays(addMonths(toStartOfMonth(concat({getExp(exp.Arguments[0])}, '-', {getExp(exp.Arguments[1])}, '-01')), 1), 1))";
+                    case "Equals": return $"({getExp(exp.Arguments[0])} = {getExp(exp.Arguments[1])})";
+
+                    case "IsLeapYear":
+                        var isLeapYearArgs1 = getExp(exp.Arguments[0]);
+                        return $"(({isLeapYearArgs1})%4=0 AND ({isLeapYearArgs1})%100<>0 OR ({isLeapYearArgs1})%400=0)";
+
+                    case "Parse": return $"cast({getExp(exp.Arguments[0])} as DateTime)";
+                    case "ParseExact":
+                    case "TryParse":
+                    case "TryParseExact": return $"cast({getExp(exp.Arguments[0])} as DateTime)";
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                var args1 = exp.Arguments.Count == 0 ? null : getExp(exp.Arguments[0]);
+                switch (exp.Method.Name)
+                {
+                    case "Add": return $"addSeconds(toDateTime({left}), {args1})";
+                    case "AddDays": return $"addDays(toDateTime({left}), {args1})";
+                    case "AddHours": return $"addHours(toDateTime({left}), {args1})";
+                    case "AddMilliseconds": return $"addSeconds(toDateTime({left}), {args1}/1000)";
+                    case "AddMinutes": return $"addMinutes(toDateTime({left}),{args1})";
+                    case "AddMonths": return $"addMonths(toDateTime({left}),{args1})";
+                    case "AddSeconds": return $"addSeconds(toDateTime({left}),{args1})";
+                    case "AddTicks": return $"addSeconds(toDateTime({left}), {args1}/10000000)";
+                    case "AddYears": return $"addYears(toDateTime({left}),{args1})";
+                    case "Subtract":
+                        switch ((exp.Arguments[0].Type.IsNullableType() ? exp.Arguments[0].Type.GetGenericArguments().FirstOrDefault() : exp.Arguments[0].Type).FullName)
+                        {
+                            case "System.DateTime": return $"dateDiff(second, {args1}, toDateTime({left}))";
+                            case "System.TimeSpan": return $"addSeconds(toDateTime({left}),(({args1})*-1))";
+                        }
+                        break;
+                    case "Equals": return $"({left} = {args1})";
+                    case "CompareTo": return $"dateDiff(second,{args1},toDateTime({left}))";
+                    case "ToString":
+                        if (exp.Arguments.Count == 0) return $"date_format({left},'%Y-%m-%d %H:%M:%S.%f')";
+                        switch (args1)
+                        {
+                            case "'yyyy-MM-dd HH:mm:ss'": return $"formatDateTime(toDateTime({left}),'%Y-%m-%d %H:%M:%S')";
+                            case "'yyyy-MM-dd HH:mm'": return $"formatDateTime(toDateTime({left}),'%Y-%m-%d %H:%M')";
+                            case "'yyyy-MM-dd HH'": return $"formatDateTime(toDateTime({left}),'%Y-%m-%d %H')";
+                            case "'yyyy-MM-dd'": return $"formatDateTime(toDateTime({left}),'%Y-%m-%d')";
+                            case "'yyyy-MM'": return $"formatDateTime(toDateTime({left}),'%Y-%m')";
+                            case "'yyyyMMddHHmmss'": return $"formatDateTime(toDateTime({left}),'%Y%m%d%H%M%S')";
+                            case "'yyyyMMddHHmm'": return $"formatDateTime(toDateTime({left}),'%Y%m%d%H%M')";
+                            case "'yyyyMMddHH'": return $"formatDateTime(toDateTime({left}),'%Y%m%d%H')";
+                            case "'yyyyMMdd'": return $"formatDateTime(toDateTime({left}),'%Y%m%d')";
+                            case "'yyyyMM'": return $"formatDateTime(toDateTime({left}),'%Y%m')";
+                            case "'yyyy'": return $"formatDateTime(toDateTime({left}),'%Y')";
+                            case "'HH:mm:ss'": return $"formatDateTime(toDateTime({left}),'%H:%M:%S')";
+                        }
+                        args1 = Regex.Replace(args1, "(yyyy|yy|MM|M|dd|d|HH|H|hh|h|mm|ss|tt)", m =>
+                        {
+                            switch (m.Groups[1].Value)
+                            {
+                                case "yyyy": return $"%Y";
+                                case "yy": return $"%y";
+                                case "MM": return $"%_a1";
+                                case "M": return $"%c";
+                                case "dd": return $"%d";
+                                case "d": return $"%e";
+                                case "HH": return $"%H";
+                                case "H": return $"%k";
+                                case "hh": return $"%h";
+                                case "h": return $"%l";
+                                case "mm": return $"%i";
+                                case "ss": return $"%_a2";
+                                case "tt": return $"%p";
+                            }
+                            return m.Groups[0].Value;
+                        });
+                        var argsFinds = new[] { "%Y", "%y", "%_a1", "%c", "%d", "%e", "%H", "%k", "%h", "%l", "%M", "%_a2", "%p" };
+                        var argsSpts = Regex.Split(args1, "(m|s|t)");
+                        for (var a = 0; a < argsSpts.Length; a++)
+                        {
+                            switch (argsSpts[a])
+                            {
+                                case "m": argsSpts[a] = $"case when substr(formatDateTime(toDateTime({left}),'%M'),1,1) = '0' then substr(formatDateTime(toDateTime({left}),'%M'),2,1) else formatDateTime(toDateTime({left}),'%M') end"; break;
+                                case "s": argsSpts[a] = $"case when substr(formatDateTime(toDateTime({left}),'%S'),1,1) = '0' then substr(formatDateTime(toDateTime({left}),'%S'),2,1) else formatDateTime(toDateTime({left}),'%S') end"; break;
+                                case "t": argsSpts[a] = $"trim(trailing 'M' from formatDateTime(toDateTime({left}),'%p'))"; break;
+                                default:
+                                    var argsSptsA = argsSpts[a];
+                                    if (argsSptsA.StartsWith("'")) argsSptsA = argsSptsA.Substring(1);
+                                    if (argsSptsA.EndsWith("'")) argsSptsA = argsSptsA.Remove(argsSptsA.Length - 1);
+                                    argsSpts[a] = argsFinds.Any(m => argsSptsA.Contains(m)) ? $"formatDateTime(toDateTime({left}),'{argsSptsA}')" : $"'{argsSptsA}'"; 
+                                    break;
+                            }
+                        }
+                        if (argsSpts.Length > 0) args1 = $"concat({string.Join(", ", argsSpts.Where(a => a != "''"))})";
+                        return args1.Replace("%_a1", "%m").Replace("%_a2", "%S");
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "Compare": return $"({getExp(exp.Arguments[0])}-({getExp(exp.Arguments[1])}))";
+                    case "Equals": return $"({getExp(exp.Arguments[0])} = {getExp(exp.Arguments[1])})";
+                    case "FromDays": return $"(({getExp(exp.Arguments[0])})*{(long)1000000 * 60 * 60 * 24})";
+                    case "FromHours": return $"(({getExp(exp.Arguments[0])})*{(long)1000000 * 60 * 60})";
+                    case "FromMilliseconds": return $"(({getExp(exp.Arguments[0])})*1000)";
+                    case "FromMinutes": return $"(({getExp(exp.Arguments[0])})*{(long)1000000 * 60})";
+                    case "FromSeconds": return $"(({getExp(exp.Arguments[0])})*1000000)";
+                    case "FromTicks": return $"(({getExp(exp.Arguments[0])})/10)";
+                    case "Parse": return $"cast({getExp(exp.Arguments[0])} as Int64)";
+                    case "ParseExact":
+                    case "TryParse":
+                    case "TryParseExact": return $"cast({getExp(exp.Arguments[0])} as Int64)";
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                var args1 = exp.Arguments.Count == 0 ? null : getExp(exp.Arguments[0]);
+                switch (exp.Method.Name)
+                {
+                    case "Add": return $"({left}+{args1})";
+                    case "Subtract": return $"({left}-({args1}))";
+                    case "Equals": return $"({left} = {args1})";
+                    case "CompareTo": return $"({left}-({args1}))";
+                    case "ToString": return $"cast({left} as String)";
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "ToBoolean": return $"({getExp(exp.Arguments[0])} not in ('0','false'))";
+                    case "ToByte": return $"cast({getExp(exp.Arguments[0])} as Int8)";
+                    case "ToChar": return $"substr(cast({getExp(exp.Arguments[0])} as String), 1, 1)";
+                    case "ToDateTime": return $"cast({getExp(exp.Arguments[0])} as DateTime)";
+                    case "ToDecimal": return $"cast({getExp(exp.Arguments[0])} as Decimal128(19))";
+                    case "ToDouble": return $"cast({getExp(exp.Arguments[0])} as Float64)";
+                    case "ToInt16":
+                    case "ToInt32":
+                    case "ToInt64":
+                    case "ToSByte": return $"cast({getExp(exp.Arguments[0])} as UInt8)";
+                    case "ToSingle": return $"cast({getExp(exp.Arguments[0])} as Float32)";
+                    case "ToString": return $"cast({getExp(exp.Arguments[0])} as String)";
+                    case "ToUInt16":
+                    case "ToUInt32":
+                    case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as UInt64)";
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs
new file mode 100644
index 00000000..d0f362a5
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseExtensions.cs
@@ -0,0 +1,18 @@
+using FreeSql;
+using FreeSql.ClickHouse.Curd;
+using System;
+
+public static partial class FreeSqlClickHouseGlobalExtensions
+{
+
+    /// <summary>
+    /// 特殊处理类似 string.Format 的使用方法，防止注入，以及 IS NULL 转换
+    /// </summary>
+    /// <param name="that"></param>
+    /// <param name="args"></param>
+    /// <returns></returns>
+    public static string FormatClickHouse(this string that, params object[] args) => _clickHouseAdo.Addslashes(that, args);
+    static FreeSql.ClickHouse.ClickHouseAdo _clickHouseAdo = new FreeSql.ClickHouse.ClickHouseAdo();
+
+
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseProvider.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseProvider.cs
new file mode 100644
index 00000000..41ff2dba
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseProvider.cs
@@ -0,0 +1,42 @@
+using FreeSql.Internal;
+using FreeSql.Internal.CommonProvider;
+using FreeSql.ClickHouse.Curd;
+using System;
+using System.Data.Common;
+using System.Linq.Expressions;
+using System.Threading;
+
+namespace FreeSql.ClickHouse
+{
+
+    public class ClickHouseProvider<TMark> : BaseDbProvider, IFreeSql<TMark>
+    {
+        public override ISelect<T1> CreateSelectProvider<T1>(object dywhere) => new ClickHouseSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IInsert<T1> CreateInsertProvider<T1>() => new ClickHouseInsert<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression);
+        public override IUpdate<T1> CreateUpdateProvider<T1>(object dywhere) => new ClickHouseUpdate<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere) => new ClickHouseDelete<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>()
+        {
+            throw new NotImplementedException();
+        }
+        public ClickHouseProvider(string masterConnectionString, string[] slaveConnectionString, Func<DbConnection> connectionFactory = null)
+        {
+            this.InternalCommonUtils = new ClickHouseUtils(this);
+            this.InternalCommonExpression = new ClickHouseExpression(this.InternalCommonUtils);
+
+            this.Ado = new ClickHouseAdo(this.InternalCommonUtils, masterConnectionString, slaveConnectionString, connectionFactory);
+            this.Aop = new AopProvider();
+
+            this.DbFirst = new ClickHouseDbFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
+            this.CodeFirst = new ClickHouseCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
+        }
+
+        ~ClickHouseProvider() => this.Dispose();
+        int _disposeCounter;
+        public override void Dispose()
+        {
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
+            (this.Ado as AdoProvider)?.Dispose();
+        }
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs
new file mode 100644
index 00000000..6d81e48b
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseUtils.cs
@@ -0,0 +1,148 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using ClickHouse.Client.ADO;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Globalization;
+using System.Data;
+using ClickHouse.Client.ADO.Parameters;
+using System.Text.RegularExpressions;
+
+namespace FreeSql.ClickHouse
+{
+    internal class ClickHouseUtils : CommonUtils
+    {
+        public ClickHouseUtils(IFreeSql orm) : base(orm)
+        {
+        }
+
+        public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
+        {
+            if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
+            var dbtype = (DbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
+            DbParameter ret = new ClickHouseDbParameter { ParameterName = parameterName, DbType = dbtype ?? default, Value = value };//QuoteParamterName(parameterName)
+            if (col != null)
+            {
+                var dbtype2 = (DbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
+                switch (dbtype2)
+                {
+                    case DbType.Binary:
+                    default:
+                        dbtype = dbtype2;
+                        //if (col.DbSize != 0) ret.Size = col.DbSize;
+                        if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
+                        if (col.DbScale != 0) ret.Scale = col.DbScale;
+                        break;
+                }
+                if (value is bool)
+                {
+                    ret.Value = (bool)value ? 1 : 0;
+                }
+            }
+            _params?.Add(ret);
+            return ret;
+        }
+
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
+            Utils.GetDbParamtersByObject<DbParameter>(sql, obj, "?", (name, type, value) =>
+            {
+                DbParameter ret = new ClickHouseDbParameter { ParameterName = $"?{name}", Value = value };
+                var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
+                if (tp != null)
+                    ret.DbType = (DbType)tp.Value;
+                return ret;
+            });
+
+        public override string RewriteColumn(ColumnInfo col, string sql)
+        {
+            col.Attribute.DbType = col.Attribute.DbType.Replace(" NOT NULL", "");
+            if (string.IsNullOrWhiteSpace(col?.Attribute.RewriteSql) == false)
+                return string.Format(col.Attribute.RewriteSql, sql);
+            if (Regex.IsMatch(sql, @"\{\{[\w\d]+_+\d:\{\d\}\}\}"))
+                return string.Format(sql, col.Attribute.DbType);
+            else
+                return sql;
+        }
+
+        public override string FormatSql(string sql, params object[] args) => sql?.FormatClickHouse(args);
+
+        public override string QuoteSqlName(params string[] name)
+        {
+            if (name.Length == 1)
+            {
+                var nametrim = name[0].Trim();
+                if (nametrim.StartsWith("(") && nametrim.EndsWith(")"))
+                    return nametrim; //原生SQL
+                if (nametrim.StartsWith("`") && nametrim.EndsWith("`"))
+                    return nametrim;
+                return $"`{nametrim.Replace(".", "`.`")}`";
+            }
+            return $"`{string.Join("`.`", name)}`";
+        }
+
+        public override string TrimQuoteSqlName(string name)
+        {
+            var nametrim = name.Trim();
+            if (nametrim.StartsWith("(") && nametrim.EndsWith(")"))
+                return nametrim; //原生SQL
+            return $"{nametrim.Trim('`').Replace("`.`", ".").Replace(".`", ".")}";
+        }
+
+        public override string[] SplitTableName(string name) => GetSplitTableNames(name, '`', '`', 2);
+
+        public override string QuoteParamterName(string name) => $"{{{{{name}:{{0}}}}}}";
+
+        public override string IsNull(string sql, object value) => $"ifnull({sql}, {value})";
+
+        public override string StringConcat(string[] objs, Type[] types) => $"concat({string.Join(", ", objs)})";
+
+        public override string Mod(string left, string right, Type leftType, Type rightType) => $"{left} % {right}";
+
+        public override string Div(string left, string right, Type leftType, Type rightType) => $"{left} div {right}";
+
+        public override string Now => "now()";
+        public override string NowUtc => "now('UTC')";
+
+        public override string QuoteWriteParamterAdapter(Type type, string paramterName)
+        {
+            switch (type.FullName)
+            {
+                case "MygisPoint":
+                case "MygisLineString":
+                case "MygisPolygon":
+                case "MygisMultiPoint":
+                case "MygisMultiLineString":
+                case "MygisMultiPolygon": return $"ST_GeomFromText({paramterName})";
+            }
+            return paramterName;
+        }
+
+        protected override string QuoteReadColumnAdapter(Type type, Type mapType, string columnName)
+        {
+            switch (mapType.FullName)
+            {
+                case "MygisPoint":
+                case "MygisLineString":
+                case "MygisPolygon":
+                case "MygisMultiPoint":
+                case "MygisMultiLineString":
+                case "MygisMultiPolygon": return $"ST_AsText({columnName})";
+            }
+            return columnName;
+        }
+
+        public override string GetNoneParamaterSqlValue(List<DbParameter> specialParams, string specialParamFlag, ColumnInfo col, Type type, object value)
+        {
+            if (value == null) return "NULL";
+            if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value);
+            if (type == typeof(byte[])) return $"0x{CommonUtils.BytesSqlRaw(value as byte[])}";
+            if (type == typeof(TimeSpan) || type == typeof(TimeSpan?))
+            {
+                var ts = (TimeSpan)value;
+                value = $"{Math.Floor(ts.TotalHours)}:{ts.Minutes}:{ts.Seconds}";
+            }
+            return FormatSql("{0}", value, 1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseDelete.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseDelete.cs
new file mode 100644
index 00000000..c950f12b
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseDelete.cs
@@ -0,0 +1,35 @@
+using FreeSql.Internal;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.ClickHouse.Curd
+{
+
+    class ClickHouseDelete<T1> : Internal.CommonProvider.DeleteProvider<T1>
+    {
+        public ClickHouseDelete(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere)
+            : base(orm, commonUtils, commonExpression, dywhere)
+        {
+        }
+
+        public override List<T1> ExecuteDeleted()
+        {
+            throw new NotImplementedException("FreeSql.ClickHouse.Curd 暂未实现");
+        }
+        public override string ToSql()
+        {
+            return base.ToSql().Replace("DELETE FROM", "ALTER TABLE").Replace("WHERE", "DELETE WHERE");
+        }
+#if net40
+#else
+        public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException("FreeSql.ClickHouse.Curd 暂未实现");
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseInsert.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseInsert.cs
new file mode 100644
index 00000000..db63dad4
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseInsert.cs
@@ -0,0 +1,475 @@
+using ClickHouse.Client.ADO;
+using ClickHouse.Client.Copy;
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.ClickHouse.Curd
+{
+
+    class ClickHouseInsert<T1> : Internal.CommonProvider.InsertProvider<T1> where T1 : class
+    {
+        public ClickHouseInsert(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
+            : base(orm, commonUtils, commonExpression)
+        {
+        }
+
+        internal bool InternalIsIgnoreInto = false;
+        internal IFreeSql InternalOrm => _orm;
+        internal TableInfo InternalTable => _table;
+        internal DbParameter[] InternalParams => _params;
+        internal DbConnection InternalConnection => _connection;
+        internal DbTransaction InternalTransaction => _transaction;
+        internal CommonUtils InternalCommonUtils => _commonUtils;
+        internal CommonExpression InternalCommonExpression => _commonExpression;
+        internal List<T1> InternalSource => _source;
+        internal Dictionary<string, bool> InternalIgnore => _ignore;
+        internal void InternalClearData() => ClearData();
+
+        public override int ExecuteAffrows() => SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchParameterLimit > 0 ? _batchParameterLimit : int.MaxValue);
+        public override long ExecuteIdentity() => SplitExecuteIdentity(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchParameterLimit > 0 ? _batchParameterLimit : int.MaxValue);
+        public override List<T1> ExecuteInserted() => SplitExecuteInserted(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchParameterLimit > 0 ? _batchParameterLimit : int.MaxValue);
+
+
+        public override string ToSql()
+        {
+            if (InternalIsIgnoreInto == false) return base.ToSqlValuesOrSelectUnionAll();
+            var sql = base.ToSqlValuesOrSelectUnionAll();
+            return $"INSERT IGNORE INTO {sql.Substring(12)}";
+        }
+
+        protected override int RawExecuteAffrows()
+        {
+            var affrows = 0;
+            Exception exception = null;
+            Aop.CurdBeforeEventArgs before = null;
+            if (_source.Count > 1)
+            {
+                try
+                {
+                    before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, null, _params);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+                    using (var conn = _orm.Ado.MasterPool.Get())
+                    {
+                        using var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
+                        {
+                            DestinationTableName = _table.DbName,
+                            BatchSize = _source.Count
+                        };
+                        var data = ToDataTable();
+                        bulkCopyInterface.WriteToServerAsync(data, default).Wait();
+                    }
+                    return affrows;
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                    throw ex;
+                }
+                finally
+                {
+                    var after = new Aop.CurdAfterEventArgs(before, exception, affrows);
+                    _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+                }
+            }
+            else
+            {
+                var sql = this.ToSql();
+                before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
+                _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+                try
+                {
+                    affrows = _orm.Ado.ExecuteNonQuery(_connection, null, CommandType.Text, sql, _commandTimeout, _params);
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                    throw ex;
+                }
+                finally
+                {
+                    var after = new Aop.CurdAfterEventArgs(before, exception, affrows);
+                    _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+                }
+                return affrows;
+            }
+        }
+
+        private IDictionary<string, object> GetValue<T>(T u, System.Reflection.PropertyInfo[] columns)
+        {
+            try
+            {
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                foreach (var item in columns)
+                {
+                    object v = null;
+                    if (u != null)
+                    {
+                        v = item.GetValue(u);
+                    }
+                    dic.TryAdd(item.Name, v);
+                }
+                return dic;
+            }
+            catch (Exception e)
+            {
+                throw;
+            }
+        }
+
+        protected override long RawExecuteIdentity()
+        {
+            long ret = 0;
+            var identCols = _table.Columns.Where(a => a.Value.Attribute.IsIdentity == true);
+            if (identCols.Any()&&_source.Count==1)
+                ret = (long)identCols.First().Value.GetValue(_source.First());
+            return ret;
+        }
+        protected override List<T1> RawExecuteInserted()
+        {
+            var sql = this.ToSql();
+            if (string.IsNullOrEmpty(sql)) return new List<T1>();
+
+            var sb = new StringBuilder();
+            sb.Append(sql).Append(" RETURNING ");
+
+            var colidx = 0;
+            foreach (var col in _table.Columns.Values)
+            {
+                if (colidx > 0) sb.Append(", ");
+                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                ++colidx;
+            }
+            sql = sb.ToString();
+            var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
+            _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+            var ret = new List<T1>();
+            Exception exception = null;
+            try
+            {
+                ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, null, CommandType.Text, sql, _commandTimeout, _params);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.CurdAfterEventArgs(before, exception, ret);
+                _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+            }
+            return ret;
+        }
+
+#if net40
+#else
+        public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, cancellationToken);
+        public override Task<long> ExecuteIdentityAsync(CancellationToken cancellationToken = default) => SplitExecuteIdentityAsync(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, cancellationToken);
+        public override Task<List<T1>> ExecuteInsertedAsync(CancellationToken cancellationToken = default) => SplitExecuteInsertedAsync(_batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, _batchValuesLimit > 0 ? _batchValuesLimit : int.MaxValue, cancellationToken);
+
+        async protected override Task<int> RawExecuteAffrowsAsync(CancellationToken cancellationToken = default)
+        {
+            var affrows = 0;
+            Exception exception = null;
+            Aop.CurdBeforeEventArgs before = null;
+            if (_source.Count > 1)
+            {
+                try
+                {
+                    before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, null, _params);
+                    _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+                    using (var conn = await _orm.Ado.MasterPool.GetAsync())
+                    {
+                        using var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
+                        {
+                            DestinationTableName = _table.DbName,
+                            BatchSize = _source.Count
+                        };
+                        var data = ToDataTable();
+                        await bulkCopyInterface.WriteToServerAsync(data, default);
+                    }
+                    return affrows;
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                    throw ex;
+                }
+                finally
+                {
+                    var after = new Aop.CurdAfterEventArgs(before, exception, affrows);
+                    _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+                }
+            }
+            else
+            {
+                var sql = this.ToSql();
+                before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
+                _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+                try
+                {
+                    affrows = await _orm.Ado.ExecuteNonQueryAsync(_connection, null, CommandType.Text, sql, _commandTimeout, _params);
+                }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                    throw ex;
+                }
+                finally
+                {
+                    var after = new Aop.CurdAfterEventArgs(before, exception, affrows);
+                    _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+                }
+                return affrows;
+            }
+        }
+
+        async protected override Task<long> RawExecuteIdentityAsync(CancellationToken cancellationToken = default)
+        {
+            //var sql = this.ToSql();
+            //if (string.IsNullOrEmpty(sql)) return 0;
+
+            //sql = string.Concat(sql, "; SELECT LAST_INSERT_ID();");
+            //var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
+            //_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+            long ret = 0;
+            //Exception exception = null;
+            //try
+            //{
+            //    ret = long.TryParse(string.Concat(await _orm.Ado.ExecuteScalarAsync(_connection, null, CommandType.Text, sql, _commandTimeout, _params, cancellationToken)), out var trylng) ? trylng : 0;
+            //}
+            //catch (Exception ex)
+            //{
+            //    exception = ex;
+            //    throw;
+            //}
+            //finally
+            //{
+            //    var after = new Aop.CurdAfterEventArgs(before, exception, ret);
+            //    _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+            //}
+            return await Task.FromResult(ret);
+        }
+
+
+        protected override int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = 0;
+            if (ss.Any() == false)
+            {
+                ClearData();
+                return ret;
+            }
+            if (ss.Length == 1)
+            {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = this.RawExecuteAffrows();
+                ClearData();
+                return ret;
+            }
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteAffrows", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    ret += this.RawExecuteAffrows();
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+        async protected override Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = 0;
+            if (ss.Any() == false)
+            {
+                ClearData();
+                return ret;
+            }
+            if (ss.Length == 1)
+            {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                await this.RawExecuteAffrowsAsync(cancellationToken);
+                ret = _source.Count;
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteAffrowsAsync", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    await this.RawExecuteAffrowsAsync(cancellationToken);
+                    ret += _source.Count;
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+
+        async protected override Task<long> SplitExecuteIdentityAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            long ret = 0;
+            if (ss.Any() == false)
+            {
+                ClearData();
+                return ret;
+            }
+            if (ss.Length == 1)
+            {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = await this.RawExecuteIdentityAsync(cancellationToken);
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteIdentityAsync", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    if (a < ss.Length - 1) await this.RawExecuteAffrowsAsync(cancellationToken);
+                    else ret = await this.RawExecuteIdentityAsync(cancellationToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+
+        async protected override Task<List<T1>> SplitExecuteInsertedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = new List<T1>();
+            if (ss.Any() == false)
+            {
+                ClearData();
+                return ret;
+            }
+            if (ss.Length == 1)
+            {
+                _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = await this.RawExecuteInsertedAsync(cancellationToken);
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteInsertedAsync", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    ret.AddRange(await this.RawExecuteInsertedAsync(cancellationToken));
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+
+        async protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToken cancellationToken = default)
+        {
+            var sql = this.ToSql();
+            if (string.IsNullOrEmpty(sql)) return new List<T1>();
+
+            var sb = new StringBuilder();
+            sb.Append(sql).Append(" RETURNING ");
+
+            var colidx = 0;
+            foreach (var col in _table.Columns.Values)
+            {
+                if (colidx > 0) sb.Append(", ");
+                sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
+                ++colidx;
+            }
+            sql = sb.ToString();
+            var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
+            _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+            var ret = new List<T1>();
+            Exception exception = null;
+            try
+            {
+                ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, null, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.CurdAfterEventArgs(before, exception, ret);
+                _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+            }
+            return ret;
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs
new file mode 100644
index 00000000..0f018e6a
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseSelect.cs
@@ -0,0 +1,210 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace FreeSql.ClickHouse.Curd
+{
+
+    class ClickHouseSelect<T1> : FreeSql.Internal.CommonProvider.Select1Provider<T1>
+    {
+
+        internal static string ToSqlStatic(CommonUtils _commonUtils, CommonExpression _commonExpression, string _select, bool _distinct, string field, StringBuilder _join, StringBuilder _where, string _groupby, string _having, string _orderby, int _skip, int _limit, List<SelectTableInfo> _tables, List<Dictionary<Type, string>> tbUnions, Func<Type, string, string> _aliasRule, string _tosqlAppendContent, List<GlobalFilter.Item> _whereGlobalFilter, IFreeSql _orm)
+        {
+            if (_orm.CodeFirst.IsAutoSyncStructure)
+                _orm.CodeFirst.SyncStructure(_tables.Select(a => a.Table.Type).ToArray());
+
+            if (_whereGlobalFilter.Any())
+                foreach (var tb in _tables.Where(a => a.Type != SelectTableInfoType.Parent))
+                    tb.Cascade = _commonExpression.GetWhereCascadeSql(tb, _whereGlobalFilter, true);
+
+            var sb = new StringBuilder();
+            var tbUnionsGt0 = tbUnions.Count > 1;
+            for (var tbUnionsIdx = 0; tbUnionsIdx < tbUnions.Count; tbUnionsIdx++)
+            {
+                if (tbUnionsIdx > 0) sb.Append("\r\n \r\nUNION ALL\r\n \r\n");
+                if (tbUnionsGt0) sb.Append(_select).Append(" * from (");
+                var tbUnion = tbUnions[tbUnionsIdx];
+
+                var sbnav = new StringBuilder();
+                sb.Append(_select);
+                if (_distinct) sb.Append("DISTINCT ");
+                sb.Append(field).Append(" \r\nFROM ");
+                var tbsjoin = _tables.Where(a => a.Type != SelectTableInfoType.From).ToArray();
+                var tbsfrom = _tables.Where(a => a.Type == SelectTableInfoType.From).ToArray();
+                for (var a = 0; a < tbsfrom.Length; a++)
+                {
+                    sb.Append(_commonUtils.QuoteSqlName(tbUnion[tbsfrom[a].Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tbsfrom[a].Table.Type, tbsfrom[a].Alias) ?? tbsfrom[a].Alias);
+                    if (tbsjoin.Length > 0)
+                    {
+                        //如果存在 join 查询，则处理 from t1, t2 改为 from t1 inner join t2 on 1 = 1
+                        for (var b = 1; b < tbsfrom.Length; b++)
+                        {
+                            sb.Append(" \r\nLEFT JOIN ").Append(_commonUtils.QuoteSqlName(tbUnion[tbsfrom[b].Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tbsfrom[b].Table.Type, tbsfrom[b].Alias) ?? tbsfrom[b].Alias);
+
+                            if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade)) sb.Append(" ON 1 = 1");
+                            else
+                            {
+                                var onSql = tbsfrom[b].NavigateCondition ?? tbsfrom[b].On;
+                                sb.Append(" ON ").Append(onSql);
+                                if (string.IsNullOrEmpty(tbsfrom[b].Cascade) == false)
+                                {
+                                    if (string.IsNullOrEmpty(onSql)) sb.Append(tbsfrom[b].Cascade);
+                                    else sb.Append(" AND ").Append(tbsfrom[b].Cascade);
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(tbsfrom[a].NavigateCondition)) sbnav.Append(" AND (").Append(tbsfrom[a].NavigateCondition).Append(")");
+                        if (!string.IsNullOrEmpty(tbsfrom[a].On)) sbnav.Append(" AND (").Append(tbsfrom[a].On).Append(")");
+                        if (a > 0 && !string.IsNullOrEmpty(tbsfrom[a].Cascade)) sbnav.Append(" AND ").Append(tbsfrom[a].Cascade);
+                    }
+                    if (a < tbsfrom.Length - 1) sb.Append(", ");
+                }
+                foreach (var tb in tbsjoin)
+                {
+                    if (tb.Type == SelectTableInfoType.Parent) continue;
+                    switch (tb.Type)
+                    {
+                        case SelectTableInfoType.LeftJoin:
+                            sb.Append(" \r\nLEFT JOIN ");
+                            break;
+                        case SelectTableInfoType.InnerJoin:
+                            sb.Append(" \r\nINNER JOIN ");
+                            break;
+                        case SelectTableInfoType.RightJoin:
+                            sb.Append(" \r\nRIGHT JOIN ");
+                            break;
+                    }
+                    sb.Append(_commonUtils.QuoteSqlName(tbUnion[tb.Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tb.Table.Type, tb.Alias) ?? tb.Alias).Append(" ON ").Append(tb.On ?? tb.NavigateCondition);
+                    if (!string.IsNullOrEmpty(tb.Cascade)) sb.Append(" AND ").Append(tb.Cascade);
+                    if (!string.IsNullOrEmpty(tb.On) && !string.IsNullOrEmpty(tb.NavigateCondition)) sbnav.Append(" AND (").Append(tb.NavigateCondition).Append(")");
+                }
+                if (_join.Length > 0) sb.Append(_join);
+
+                sbnav.Append(_where);
+                if (!string.IsNullOrEmpty(_tables[0].Cascade))
+                    sbnav.Append(" AND ").Append(_tables[0].Cascade);
+
+                if (sbnav.Length > 0)
+                {
+                    sb.Append(" \r\nWHERE ").Append(sbnav.Remove(0, 5));
+                }
+                if (string.IsNullOrEmpty(_groupby) == false)
+                {
+                    sb.Append(_groupby);
+                    if (string.IsNullOrEmpty(_having) == false)
+                        sb.Append(" \r\nHAVING ").Append(_having.Substring(5));
+                }
+                sb.Append(_orderby);
+                if (_skip > 0 || _limit > 0)
+                    sb.Append(" \r\nlimit ").Append(Math.Max(0, _skip)).Append(",").Append(_limit > 0 ? _limit : -1);
+
+                sbnav.Clear();
+                if (tbUnionsGt0) sb.Append(") ftb");
+            }
+            return sb.Append(_tosqlAppendContent).ToString();
+        }
+
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override ISelect<T1, T2> From<T2>(Expression<Func<ISelectFromExpression<T1>, T2, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3> From<T2, T3>(Expression<Func<ISelectFromExpression<T1>, T2, T3, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4> From<T2, T3, T4>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5> From<T2, T3, T4, T5>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6> From<T2, T3, T4, T5, T6>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7> From<T2, T3, T4, T5, T6, T7>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8> From<T2, T3, T4, T5, T6, T7, T8>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> From<T2, T3, T4, T5, T6, T7, T8, T9>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> From<T2, T3, T4, T5, T6, T7, T8, T9, T10>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(_orm, _commonUtils, _commonExpression, null); ClickHouseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override string ToSql(string field = null) => ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2> : FreeSql.Internal.CommonProvider.Select2Provider<T1, T2> where T2 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3> : FreeSql.Internal.CommonProvider.Select3Provider<T1, T2, T3> where T2 : class where T3 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4> : FreeSql.Internal.CommonProvider.Select4Provider<T1, T2, T3, T4> where T2 : class where T3 : class where T4 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5> : FreeSql.Internal.CommonProvider.Select5Provider<T1, T2, T3, T4, T5> where T2 : class where T3 : class where T4 : class where T5 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6> : FreeSql.Internal.CommonProvider.Select6Provider<T1, T2, T3, T4, T5, T6> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7> : FreeSql.Internal.CommonProvider.Select7Provider<T1, T2, T3, T4, T5, T6, T7> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8> : FreeSql.Internal.CommonProvider.Select8Provider<T1, T2, T3, T4, T5, T6, T7, T8> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> : FreeSql.Internal.CommonProvider.Select9Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : FreeSql.Internal.CommonProvider.Select10Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : FreeSql.Internal.CommonProvider.Select11Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> : FreeSql.Internal.CommonProvider.Select12Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> : FreeSql.Internal.CommonProvider.Select13Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> : FreeSql.Internal.CommonProvider.Select14Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : FreeSql.Internal.CommonProvider.Select15Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class where T15 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class ClickHouseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> : FreeSql.Internal.CommonProvider.Select16Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class where T15 : class where T16 : class
+    {
+        public ClickHouseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => ClickHouseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs
new file mode 100644
index 00000000..9e69b3c9
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseUpdate.cs
@@ -0,0 +1,381 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.ClickHouse.Curd
+{
+
+    class ClickHouseUpdate<T1> : Internal.CommonProvider.UpdateProvider<T1>
+    {
+
+        public ClickHouseUpdate(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere)
+            : base(orm, commonUtils, commonExpression, dywhere)
+        {
+        }
+
+        internal StringBuilder InternalSbSet => _set;
+        internal StringBuilder InternalSbSetIncr => _setIncr;
+        internal Dictionary<string, bool> InternalIgnore => _ignore;
+        internal void InternalResetSource(List<T1> source) => _source = source;
+        internal string InternalWhereCaseSource(string CsName, Func<string, string> thenValue) => WhereCaseSource(CsName, thenValue);
+        internal void InternalToSqlCaseWhenEnd(StringBuilder sb, ColumnInfo col) => ToSqlCaseWhenEnd(sb, col);
+
+        public override int ExecuteAffrows() => SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
+        public override List<T1> ExecuteUpdated() => SplitExecuteUpdated(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
+        protected override List<T1> RawExecuteUpdated() => throw new NotImplementedException("FreeSql.ClickHouse.Custom 未实现该功能 未实现该功能");
+        protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys)
+        {
+            if (primarys.Length == 1)
+            {
+                var pk = primarys.First();
+                caseWhen.Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name)));
+                return;
+            }
+            caseWhen.Append("CONCAT(");
+            var pkidx = 0;
+            foreach (var pk in primarys)
+            {
+                if (pkidx > 0) caseWhen.Append(", '+', ");
+                caseWhen.Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name)));
+                ++pkidx;
+            }
+            caseWhen.Append(")");
+        }
+        protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d)
+        {
+            if (primarys.Length == 1)
+            {
+                sb.Append(_commonUtils.FormatSql("{0}", primarys[0].GetDbValue(d)));
+                return;
+            }
+            sb.Append("concat(");
+            var pkidx = 0;
+            foreach (var pk in primarys)
+            {
+                if (pkidx > 0) sb.Append(", '+', ");
+                sb.Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d)));
+                ++pkidx;
+            }
+            sb.Append(")");
+        }
+
+        public override string ToSql()
+        {
+            if (_where.Length == 0 && _source.Any() == false) return null;
+
+            var sb = new StringBuilder();
+            sb.Append("ALTER TABLE ").Append(_commonUtils.QuoteSqlName(TableRuleInvoke())).Append(" UPDATE ");
+
+            if (_set.Length > 0)
+            { //指定 set 更新
+                sb.Append(_set.ToString().Substring(2));
+
+            }
+            else if (_source.Count == 1)
+            { //保存 Source
+                _paramsSource.Clear();
+                var colidx = 0;
+                foreach (var col in _table.Columns.Values)
+                {
+                    if (col.Attribute.IsPrimary) continue;
+                    if (_tempPrimarys.Any(a => a.CsName == col.CsName)) continue;
+                    if (col.Attribute.IsIdentity == false && col.Attribute.IsVersion == false && _ignore.ContainsKey(col.Attribute.Name) == false)
+                    {
+                        if (colidx > 0) sb.Append(", ");
+                        sb.Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ");
+
+                        if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            sb.Append(col.DbUpdateValue);
+                        else
+                        {
+                            var val = col.GetDbValue(_source.First());
+
+                            var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_paramsSource, "u", col, col.Attribute.MapType, val) :
+                                _commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_paramsSource.Count}"));
+                            sb.Append(_commonUtils.RewriteColumn(col, colsql));
+                            if (_noneParameter == false)
+                                _commonUtils.AppendParamter(_paramsSource, null, col, col.Attribute.MapType, val);
+                        }
+                        ++colidx;
+                    }
+                }
+                if (colidx == 0) return null;
+
+            }
+            else if (_source.Count > 1)
+            { //批量保存 Source
+                if (_tempPrimarys.Any() == false) return null;
+
+                var caseWhen = new StringBuilder();
+                ToSqlCase(caseWhen, _tempPrimarys);
+                var cw = $"{caseWhen.ToString()}=";
+                _paramsSource.Clear();
+                var colidx = 0;
+                foreach (var col in _table.Columns.Values)
+                {
+                    if (col.Attribute.IsPrimary) continue;
+                    if (_tempPrimarys.Any(a => a.CsName == col.CsName)) continue;
+                    if (col.Attribute.IsIdentity == false && col.Attribute.IsVersion == false && _ignore.ContainsKey(col.Attribute.Name) == false)
+                    {
+                        if (colidx > 0) sb.Append(", ");
+                        var columnName = _commonUtils.QuoteSqlName(col.Attribute.Name);
+                        sb.Append(columnName).Append(" = ");
+
+                        if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                            sb.Append(col.DbUpdateValue);
+                        else
+                        {
+                            var nulls = 0;
+                            var cwsb = new StringBuilder().Append(" multiIf( ");
+                            foreach (var d in _source)
+                            {
+                                cwsb.Append(cw);
+                                ToSqlWhen(cwsb, _tempPrimarys, d);
+                                cwsb.Append(",");
+                                var val = col.GetDbValue(d);
+
+                                var colsql = _noneParameter ? _commonUtils.GetNoneParamaterSqlValue(_paramsSource, "u", col, col.Attribute.MapType, val) :
+                                    _commonUtils.QuoteWriteParamterAdapter(col.Attribute.MapType, _commonUtils.QuoteParamterName($"p_{_paramsSource.Count}"));
+                                cwsb.Append(_commonUtils.RewriteColumn(col, colsql));
+                                if (_noneParameter == false)
+                                    _commonUtils.AppendParamter(_paramsSource, null, col, col.Attribute.MapType, val);
+                                if (val == null || val == DBNull.Value) nulls++;
+                                cwsb.Append(", ");
+                            }
+                            if (nulls == _source.Count) sb.Append("NULL");
+                            else
+                            {
+                                cwsb.Append(columnName).Append(" )");
+                                ToSqlCaseWhenEnd(cwsb, col);
+                                sb.Append(cwsb);
+                            }
+                            cwsb.Clear();
+                        }
+                        ++colidx;
+                    }
+                }
+                if (colidx == 0) return null;
+            }
+            else if (_setIncr.Length == 0)
+                return null;
+
+            if (_setIncr.Length > 0)
+                sb.Append(_set.Length > 0 ? _setIncr.ToString() : _setIncr.ToString().Substring(2));
+
+            if (_source.Any() == false)
+            {
+                foreach (var col in _table.Columns.Values)
+                    if (col.Attribute.CanUpdate && string.IsNullOrEmpty(col.DbUpdateValue) == false)
+                        sb.Append(", ").Append(_commonUtils.QuoteSqlName(col.Attribute.Name)).Append(" = ").Append(col.DbUpdateValue);
+            }
+
+            if (_table.VersionColumn != null)
+            {
+                var vcname = _commonUtils.QuoteSqlName(_table.VersionColumn.Attribute.Name);
+                if (_table.VersionColumn.Attribute.MapType == typeof(byte[]))
+                {
+                    _updateVersionValue = Utils.GuidToBytes(Guid.NewGuid());
+                    sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.GetNoneParamaterSqlValue(_paramsSource, "uv", _table.VersionColumn, _table.VersionColumn.Attribute.MapType, _updateVersionValue));
+                }
+                else
+                    sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.IsNull(vcname, 0)).Append(" + 1");
+            }
+
+            sb.Append(" \r\nWHERE ");
+            if (_source.Any())
+            {
+                if (_tempPrimarys.Any() == false) throw new ArgumentException($"{_table.Type.DisplayCsharp()} 没有定义主键，无法使用 SetSource，请尝试 SetDto");
+                sb.Append('(').Append(_commonUtils.WhereItems(_tempPrimarys, "", _source)).Append(')');
+            }
+
+            if (_where.Length > 0)
+                sb.Append(_source.Any() ? _where.ToString() : _where.ToString().Substring(5));
+
+            if (_whereGlobalFilter.Any())
+            {
+                var globalFilterCondi = _commonExpression.GetWhereCascadeSql(new SelectTableInfo { Table = _table }, _whereGlobalFilter, false);
+                if (string.IsNullOrEmpty(globalFilterCondi) == false)
+                    sb.Append(" AND ").Append(globalFilterCondi);
+            }
+
+            if (_table.VersionColumn != null)
+            {
+                var versionCondi = WhereCaseSource(_table.VersionColumn.CsName, sqlval => sqlval);
+                if (string.IsNullOrEmpty(versionCondi) == false)
+                    sb.Append(" AND ").Append(versionCondi);
+            }
+
+            _interceptSql?.Invoke(sb);
+            return sb.ToString();
+        }
+
+        protected override int SplitExecuteAffrows(int valuesLimit, int parameterLimit)
+        {
+            var ss = base.SplitSource(valuesLimit, parameterLimit);
+            var ret = 0;
+            if (ss.Length <= 1)
+            {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = this.RawExecuteAffrows();
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteAffrows", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    ret += this.RawExecuteAffrows();
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+        protected override List<T1> SplitExecuteUpdated(int valuesLimit, int parameterLimit)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = new List<T1>();
+            if (ss.Length <= 1)
+            {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = this.RawExecuteUpdated();
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteUpdated", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    ret.AddRange(this.RawExecuteUpdated());
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+
+
+#if net40
+#else
+        public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => SplitExecuteAffrowsAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
+        public override Task<List<T1>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default) => SplitExecuteUpdatedAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
+        protected override Task<List<T1>> RawExecuteUpdatedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException("FreeSql.ClickHouse.Custom 未实现该功能 未实现该功能");
+
+        async protected override Task<int> SplitExecuteAffrowsAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = 0;
+            if (ss.Length <= 1)
+            {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                await this.RawExecuteAffrowsAsync(cancellationToken);
+                ret = _source.Count;
+                ClearData();
+                return ret;
+            }
+
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteAffrowsAsync", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    await this.RawExecuteAffrowsAsync(cancellationToken);
+                    ret += _source.Count;
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+        async protected override Task<List<T1>> SplitExecuteUpdatedAsync(int valuesLimit, int parameterLimit, CancellationToken cancellationToken = default)
+        {
+            var ss = SplitSource(valuesLimit, parameterLimit);
+            var ret = new List<T1>();
+            if (ss.Length <= 1)
+            {
+                if (_source?.Any() == true) _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, 1, 1));
+                ret = await this.RawExecuteUpdatedAsync(cancellationToken);
+                ClearData();
+                return ret;
+            }
+
+            var before = new Aop.TraceBeforeEventArgs("SplitExecuteUpdatedAsync", null);
+            _orm.Aop.TraceBeforeHandler?.Invoke(this, before);
+            Exception exception = null;
+            try
+            {
+                for (var a = 0; a < ss.Length; a++)
+                {
+                    _source = ss[a];
+                    _batchProgress?.Invoke(new BatchProgressStatus<T1>(_source, a + 1, ss.Length));
+                    ret.AddRange(await this.RawExecuteUpdatedAsync(cancellationToken));
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw;
+            }
+            finally
+            {
+                var after = new Aop.TraceAfterEventArgs(before, null, exception);
+                _orm.Aop.TraceAfterHandler?.Invoke(this, after);
+            }
+            ClearData();
+            return ret;
+        }
+
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj b/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
new file mode 100644
index 00000000..8633a48a
--- /dev/null
+++ b/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<!--;netcoreapp2.2;net472-->
+		<TargetFrameworks>netstandard2.1</TargetFrameworks>
+		<Version>3.2.300</Version>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<Authors>FreeSql;ncc;YeXiangQin;ChenBo</Authors>
+		<Description>FreeSql 数据库实现，基于 ClickHouse.Client Ado.net</Description>
+		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageTags>FreeSql;ORM</PackageTags>
+		<PackageId>$(AssemblyName)</PackageId>
+		<PackageIcon>logo.png</PackageIcon>
+		<Title>$(AssemblyName)</Title>
+		<IsPackable>true</IsPackable>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<SignAssembly>False</SignAssembly>
+		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="../../logo.png" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="ClickHouse.Client">
+		  <Version>4.0.1.462</Version>
+		</PackageReference>
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+	</ItemGroup>
+
+</Project>
+
diff --git a/Providers/FreeSql.Provider.Custom/CustomExpression.cs b/Providers/FreeSql.Provider.Custom/CustomExpression.cs
index 136f0776..93d8d1c8 100644
--- a/Providers/FreeSql.Provider.Custom/CustomExpression.cs
+++ b/Providers/FreeSql.Provider.Custom/CustomExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Custom
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj b/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
index aa0935a0..79827225 100644
--- a/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
+++ b/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库自定义适配，访问所有数据库</Description>
diff --git a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs
index b10d3749..c7085cc2 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs
@@ -68,6 +68,7 @@ namespace FreeSql.Dameng
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs b/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
index 613dbda5..b6275462 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengDbFirst.cs
@@ -27,7 +27,7 @@ namespace FreeSql.Dameng
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         DmDbType GetSqlDbType(DbColumnInfo column)
         {
-            var dbfull = column.DbTypeTextFull.ToLower();
+            var dbfull = column.DbTypeTextFull?.ToLower();
             switch (dbfull)
             {
                 case "number(1)": return DmDbType.Bit;
@@ -55,7 +55,7 @@ namespace FreeSql.Dameng
 
                 case "char(36)": return DmDbType.Char;
             }
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit":
                     _dicDbToCs.TryAdd(dbfull, _dicDbToCs["number(1)"]);
@@ -157,7 +157,7 @@ namespace FreeSql.Dameng
                     return DmDbType.Double;
                 case "rowid":
                 default:
-                    _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
+                    if (dbfull != null) _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
                     return DmDbType.VarChar;
             }
             throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
@@ -406,7 +406,7 @@ where {(ignoreCase ? "lower(a.owner)" : "a.owner")} in ({databaseIn}) and {loc8}
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Dameng/DamengExpression.cs b/Providers/FreeSql.Provider.Dameng/DamengExpression.cs
index cc51f3c6..87d0a74b 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengExpression.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Dameng
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Dameng/DamengExtensions.cs b/Providers/FreeSql.Provider.Dameng/DamengExtensions.cs
index 7774195f..24931172 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengExtensions.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengExtensions.cs
@@ -48,15 +48,19 @@ public static partial class FreeSqlDamengGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
-                {
-                    using (var bulkCopy = copyOptions == DmBulkCopyOptions.Default ?
-                        new DmBulkCopy(conn.Value as DmConnection) :
-                        new DmBulkCopy(conn.Value as DmConnection, copyOptions, insert.InternalTransaction as DmTransaction))
-                    {
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    using (var bulkCopy = new DmBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as DmConnection, copyOptions, insert._orm.Ado.TransactionCurrentThread as DmTransaction))
                         writeToServer(bulkCopy);
+                else
+                    using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
+                    {
+                        using (var bulkCopy = copyOptions == DmBulkCopyOptions.Default ?
+                            new DmBulkCopy(conn.Value as DmConnection) :
+                            new DmBulkCopy(conn.Value as DmConnection, copyOptions, insert.InternalTransaction as DmTransaction))
+                        {
+                            writeToServer(bulkCopy);
+                        }
                     }
-                }
             }
             else if (insert.InternalTransaction != null)
             {
diff --git a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs
index 7376f7c4..5dc1bd37 100644
--- a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs
+++ b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs
@@ -18,7 +18,7 @@ namespace FreeSql.Dameng
         public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
-            var dbtype = (DmDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (DmDbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             switch (dbtype)
             {
                 case DmDbType.Bit:
@@ -40,7 +40,7 @@ namespace FreeSql.Dameng
                     }
                     break;
             }
-            var ret = new DmParameter { ParameterName = QuoteParamterName(parameterName), DmSqlType = dbtype, Value = value };
+            var ret = new DmParameter { ParameterName = QuoteParamterName(parameterName), DmSqlType = dbtype ?? default, Value = value };
             _params?.Add(ret);
             return ret;
         }
diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
index e5725ec1..22ac7af2 100644
--- a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
+++ b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider)</Description>
diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs b/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs
index 8b0c930a..65961f26 100644
--- a/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs
@@ -52,6 +52,7 @@ namespace FreeSql.Firebird
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdDbFirst.cs b/Providers/FreeSql.Provider.Firebird/FirebirdDbFirst.cs
index fa7fb0f0..a995b509 100644
--- a/Providers/FreeSql.Provider.Firebird/FirebirdDbFirst.cs
+++ b/Providers/FreeSql.Provider.Firebird/FirebirdDbFirst.cs
@@ -27,10 +27,10 @@ namespace FreeSql.Firebird
         FbDbType GetFbDbType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             FbDbType ret = FbDbType.VarChar;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "bigint": ret = FbDbType.BigInt; break;
                 case "blob": ret = FbDbType.Binary; break;
@@ -267,7 +267,7 @@ order by a.rdb$relation_name, a.rdb$field_position
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs b/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs
index 3b542f8e..fea3bbae 100644
--- a/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs
+++ b/Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs
@@ -109,10 +109,10 @@ namespace FreeSql.Firebird
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs
index 28870b33..bb65b3e0 100644
--- a/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs
+++ b/Providers/FreeSql.Provider.Firebird/FirebirdUtils.cs
@@ -19,7 +19,7 @@ namespace FreeSql.Firebird
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
             var ret = new FbParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
-            var dbtype = (FbDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (FbDbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             if (col != null)
             {
                 var dbtype2 = (FbDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
@@ -35,7 +35,7 @@ namespace FreeSql.Firebird
                         break;
                 }
             }
-            ret.FbDbType = dbtype;
+            ret.FbDbType = dbtype ?? default;
             _params?.Add(ret);
             return ret;
         }
diff --git a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
index cef5e976..9f3d9bd4 100644
--- a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
+++ b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Firebird</Description>
@@ -26,7 +26,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.5.3" />
+		<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.5.4" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
 		<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.10.1" />
diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseDelete.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseDelete.cs
new file mode 100644
index 00000000..7e9f7b90
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/Curd/GBaseDelete.cs
@@ -0,0 +1,32 @@
+using FreeSql.Internal;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.GBase.Curd
+{
+
+    class GBaseDelete<T1> : Internal.CommonProvider.DeleteProvider<T1>
+    {
+        public GBaseDelete(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere)
+            : base(orm, commonUtils, commonExpression, dywhere)
+        {
+        }
+
+        public override List<T1> ExecuteDeleted()
+        {
+            throw new NotImplementedException();
+        }
+
+#if net40
+#else
+        public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseInsert.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseInsert.cs
new file mode 100644
index 00000000..a6bf0ed5
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/Curd/GBaseInsert.cs
@@ -0,0 +1,155 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.GBase.Curd
+{
+
+    class GBaseInsert<T1> : Internal.CommonProvider.InsertProvider<T1> where T1 : class
+    {
+        public GBaseInsert(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
+            : base(orm, commonUtils, commonExpression)
+        {
+        }
+
+        public override int ExecuteAffrows() => base.SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
+        public override long ExecuteIdentity() => base.SplitExecuteIdentity(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
+        public override List<T1> ExecuteInserted() => base.SplitExecuteInserted(1, 999);
+
+        public override string ToSql()
+        {
+            if (_source?.Count <= 1) return base.ToSqlValuesOrSelectUnionAll();
+            var sql = base.ToSqlValuesOrSelectUnionAllExtension102(false, null, (rowd, idx, sb) => sb.Append(" FROM dual"));
+            var validx = sql.IndexOf(") SELECT ");
+            if (validx == -1) throw new ArgumentException("找不到 SELECT");
+            return new StringBuilder()
+                .Insert(0, sql.Substring(0, validx + 1))
+                .Append("\r\nSELECT * FROM (\r\n")
+                .Append(sql.Substring(validx + 1))
+                .Append("\r\n) ftbtmp")
+                .ToString();
+        }
+
+        protected override long RawExecuteIdentity()
+        {
+            var sql = this.ToSql();
+            if (string.IsNullOrEmpty(sql)) return 0;
+
+            var identityType = _table.Primarys.Where(a => a.Attribute.IsIdentity).FirstOrDefault()?.CsType.NullableTypeOrThis();
+            var identitySql = "";
+            if (identityType != null)
+            {
+                if (identityType == typeof(int) || identityType == typeof(uint)) identitySql = "SELECT dbinfo('sqlca.sqlerrd1') FROM dual";
+                else if (identityType == typeof(long) || identityType == typeof(ulong)) identitySql = "SELECT dbinfo('serial8') FROM dual";
+            }
+            var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, $"; {identitySql};"), _params);
+            _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+            long ret = 0;
+            Exception exception = null;
+            var isUseConnection = _connection != null;
+            try
+            {
+                if (isUseConnection == false)
+                {
+                    using (var conn = _orm.Ado.MasterPool.Get())
+                    {
+                        _connection = conn.Value;
+                        _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                        if (string.IsNullOrWhiteSpace(identitySql) == false)
+                            long.TryParse(string.Concat(_orm.Ado.ExecuteScalar(_connection, _transaction, CommandType.Text, identitySql, _commandTimeout, _params)), out ret);
+                    }
+                }
+                else
+                {
+                    _orm.Ado.ExecuteNonQuery(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                    if (string.IsNullOrWhiteSpace(identitySql) == false)
+                        long.TryParse(string.Concat(_orm.Ado.ExecuteScalar(_connection, _transaction, CommandType.Text, identitySql, _commandTimeout, _params)), out ret);
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw ex;
+            }
+            finally
+            {
+                if (isUseConnection == false) _connection = null;
+                var after = new Aop.CurdAfterEventArgs(before, exception, ret);
+                _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+            }
+            return ret;
+        }
+        protected override List<T1> RawExecuteInserted()
+        {
+            throw new NotImplementedException();
+        }
+
+#if net40
+#else
+        public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => base.SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
+        public override Task<long> ExecuteIdentityAsync(CancellationToken cancellationToken = default) => base.SplitExecuteIdentityAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
+        public override Task<List<T1>> ExecuteInsertedAsync(CancellationToken cancellationToken = default) => base.SplitExecuteInsertedAsync(1, 1000, cancellationToken);
+
+        async protected override Task<long> RawExecuteIdentityAsync(CancellationToken cancellationToken = default)
+        {
+            var sql = this.ToSql();
+            if (string.IsNullOrEmpty(sql)) return 0;
+
+            var identityType = _table.Primarys.Where(a => a.Attribute.IsIdentity).FirstOrDefault()?.CsType.NullableTypeOrThis();
+            var identitySql = "";
+            if (identityType != null)
+            {
+                if (identityType == typeof(int) || identityType == typeof(uint)) identitySql = "SELECT dbinfo('sqlca.sqlerrd1') FROM dual";
+                else if (identityType == typeof(long) || identityType == typeof(ulong)) identitySql = "SELECT dbinfo('serial8') FROM dual";
+            }
+            var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, string.Concat(sql, $"; {identitySql};"), _params);
+            _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
+            long ret = 0;
+            Exception exception = null;
+            var isUseConnection = _connection != null;
+            try
+            {
+                if (isUseConnection == false)
+                {
+                    using (var conn = await _orm.Ado.MasterPool.GetAsync())
+                    {
+                        _connection = conn.Value;
+                        await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                        if (string.IsNullOrWhiteSpace(identitySql) == false)
+                            long.TryParse(string.Concat(await _orm.Ado.ExecuteScalarAsync(_connection, _transaction, CommandType.Text, identitySql, _commandTimeout, _params)), out ret);
+                    }
+                }
+                else
+                {
+                    await _orm.Ado.ExecuteNonQueryAsync(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                    if (string.IsNullOrWhiteSpace(identitySql) == false)
+                        long.TryParse(string.Concat(await _orm.Ado.ExecuteScalarAsync(_connection, _transaction, CommandType.Text, identitySql, _commandTimeout, _params)), out ret);
+                }
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+                throw ex;
+            }
+            finally
+            {
+                if (isUseConnection == false) _connection = null;
+                var after = new Aop.CurdAfterEventArgs(before, exception, ret);
+                _orm.Aop.CurdAfterHandler?.Invoke(this, after);
+            }
+            return ret;
+        }
+        protected override Task<List<T1>> RawExecuteInsertedAsync(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseInsertOrUpdate.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseInsertOrUpdate.cs
new file mode 100644
index 00000000..b54366b0
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/Curd/GBaseInsertOrUpdate.cs
@@ -0,0 +1,72 @@
+using FreeSql.Internal;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Linq;
+using System.Text;
+
+namespace FreeSql.GBase.Curd
+{
+
+    class GBaseInsertOrUpdate<T1> : Internal.CommonProvider.InsertOrUpdateProvider<T1> where T1 : class
+    {
+        public GBaseInsertOrUpdate(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
+            : base(orm, commonUtils, commonExpression)
+        {
+        }
+
+        public override string ToSql()
+        {
+            if (_source?.Any() != true) return null;
+
+            var sqls = new string[2];
+            var dbParams = new List<DbParameter>();
+            var ds = SplitSourceByIdentityValueIsNull(_source);
+            if (ds.Item1.Any()) sqls[0] = getMergeSql(ds.Item1);
+            if (ds.Item2.Any()) sqls[1] = getInsertSql(ds.Item2);
+            _params = dbParams.ToArray();
+            if (ds.Item2.Any() == false) return sqls[0];
+            if (ds.Item1.Any() == false) return sqls[1];
+            return string.Join("\r\n\r\n;\r\n\r\n", sqls);
+
+            string getMergeSql(List<T1> data)
+            {
+                if (_table.Primarys.Any() == false) throw new Exception($"InsertOrUpdate 功能执行 merge into 要求实体类 {_table.CsName} 必须有主键");
+
+                var sb = new StringBuilder().Append("MERGE INTO ").Append(_commonUtils.QuoteSqlName(TableRuleInvoke())).Append(" t1 \r\nUSING (");
+                WriteSourceSelectUnionAll(data, sb, dbParams);
+                sb.Append(" ) t2 ON (").Append(string.Join(" AND ", _table.Primarys.Select(a => $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{_commonUtils.QuoteSqlName(a.Attribute.Name)}"))).Append(") \r\n");
+
+                var cols = _table.Columns.Values.Where(a => a.Attribute.IsPrimary == false && a.Attribute.CanUpdate == true && _updateIgnore.ContainsKey(a.Attribute.Name) == false);
+                if (_doNothing == false && cols.Any())
+                    sb.Append("WHEN MATCHED THEN \r\n")
+                        .Append("  update set ").Append(string.Join(", ", cols.Select(a =>
+                            a.Attribute.IsVersion && a.Attribute.MapType != typeof(byte[]) ?
+                            $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} + 1" :
+                            $"t1.{_commonUtils.QuoteSqlName(a.Attribute.Name)} = t2.{_commonUtils.QuoteSqlName(a.Attribute.Name)}"
+                            ))).Append(" \r\n");
+
+                cols = _table.Columns.Values.Where(a => a.Attribute.CanInsert == true);
+                if (cols.Any())
+                    sb.Append("WHEN NOT MATCHED THEN \r\n")
+                        .Append("  insert (").Append(string.Join(", ", cols.Select(a => _commonUtils.QuoteSqlName(a.Attribute.Name)))).Append(") \r\n")
+                        .Append("  values (").Append(string.Join(", ", cols.Select(a => $"t2.{_commonUtils.QuoteSqlName(a.Attribute.Name)}"))).Append(")");
+
+                return sb.ToString();
+            }
+            string getInsertSql(List<T1> data)
+            {
+                var insert = _orm.Insert<T1>()
+                    .AsTable(_tableRule).AsType(_table.Type)
+                    .WithConnection(_connection)
+                    .WithTransaction(_transaction)
+                    .NoneParameter(true) as Internal.CommonProvider.InsertProvider<T1>;
+                insert._source = data;
+                var sql = insert.ToSql();
+                if (string.IsNullOrEmpty(sql)) return null;
+                if (insert._params?.Any() == true) dbParams.AddRange(insert._params);
+                return sql;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseSelect.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseSelect.cs
new file mode 100644
index 00000000..daf5a217
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/Curd/GBaseSelect.cs
@@ -0,0 +1,214 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+
+namespace FreeSql.GBase.Curd
+{
+
+    class GBaseSelect<T1> : FreeSql.Internal.CommonProvider.Select1Provider<T1>
+    {
+
+        internal static string ToSqlStatic(CommonUtils _commonUtils, CommonExpression _commonExpression, string _select, bool _distinct, string field, StringBuilder _join, StringBuilder _where, string _groupby, string _having, string _orderby, int _skip, int _limit, List<SelectTableInfo> _tables, List<Dictionary<Type, string>> tbUnions, Func<Type, string, string> _aliasRule, string _tosqlAppendContent, List<GlobalFilter.Item> _whereGlobalFilter, IFreeSql _orm)
+        {
+            if (_orm.CodeFirst.IsAutoSyncStructure)
+                _orm.CodeFirst.SyncStructure(_tables.Select(a => a.Table.Type).ToArray());
+
+            if (_whereGlobalFilter.Any())
+                foreach (var tb in _tables.Where(a => a.Type != SelectTableInfoType.Parent))
+                    tb.Cascade = _commonExpression.GetWhereCascadeSql(tb, _whereGlobalFilter, true);
+
+            var sb = new StringBuilder();
+            var tbUnionsGt0 = tbUnions.Count > 1;
+            for (var tbUnionsIdx = 0; tbUnionsIdx < tbUnions.Count; tbUnionsIdx++)
+            {
+                if (tbUnionsIdx > 0) sb.Append(" \r\n\r\nUNION ALL\r\n\r\n");
+                if (tbUnionsGt0) sb.Append(_select).Append(" * from (");
+                var tbUnion = tbUnions[tbUnionsIdx];
+
+                var sbnav = new StringBuilder();
+                sb.Append(_select);
+
+                if (_limit > 0 && _skip > 0) sb.Append("SKIP ").Append(_skip).Append(" FIRST ").Append(_limit).Append(" ");
+                else if (_skip > 0) sb.Append("SKIP ").Append(_skip).Append(" ");
+                else if (_limit > 0) sb.Append("FIRST ").Append(_limit).Append(" ");
+
+                if (_distinct) sb.Append("DISTINCT ");
+                sb.Append(field).Append(" \r\nFROM ");
+                var tbsjoin = _tables.Where(a => a.Type != SelectTableInfoType.From).ToArray();
+                var tbsfrom = _tables.Where(a => a.Type == SelectTableInfoType.From).ToArray();
+                for (var a = 0; a < tbsfrom.Length; a++)
+                {
+                    sb.Append(_commonUtils.QuoteSqlName(tbUnion[tbsfrom[a].Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tbsfrom[a].Table.Type, tbsfrom[a].Alias) ?? tbsfrom[a].Alias);
+                    if (tbsjoin.Length > 0)
+                    {
+                        //如果存在 join 查询，则处理 from t1, t2 改为 from t1 inner join t2 on 1 = 1
+                        for (var b = 1; b < tbsfrom.Length; b++)
+                        {
+                            sb.Append(" \r\nLEFT JOIN ").Append(_commonUtils.QuoteSqlName(tbUnion[tbsfrom[b].Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tbsfrom[b].Table.Type, tbsfrom[b].Alias) ?? tbsfrom[b].Alias);
+
+                            if (string.IsNullOrEmpty(tbsfrom[b].NavigateCondition) && string.IsNullOrEmpty(tbsfrom[b].On) && string.IsNullOrEmpty(tbsfrom[b].Cascade)) sb.Append(" ON 1 = 1");
+                            else
+                            {
+                                var onSql = tbsfrom[b].NavigateCondition ?? tbsfrom[b].On;
+                                sb.Append(" ON ").Append(onSql);
+                                if (string.IsNullOrEmpty(tbsfrom[b].Cascade) == false)
+                                {
+                                    if (string.IsNullOrEmpty(onSql)) sb.Append(tbsfrom[b].Cascade);
+                                    else sb.Append(" AND ").Append(tbsfrom[b].Cascade);
+                                }
+                            }
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(tbsfrom[a].NavigateCondition)) sbnav.Append(" AND (").Append(tbsfrom[a].NavigateCondition).Append(")");
+                        if (!string.IsNullOrEmpty(tbsfrom[a].On)) sbnav.Append(" AND (").Append(tbsfrom[a].On).Append(")");
+                        if (a > 0 && !string.IsNullOrEmpty(tbsfrom[a].Cascade)) sbnav.Append(" AND ").Append(tbsfrom[a].Cascade);
+                    }
+                    if (a < tbsfrom.Length - 1) sb.Append(", ");
+                }
+                foreach (var tb in tbsjoin)
+                {
+                    if (tb.Type == SelectTableInfoType.Parent) continue;
+                    switch (tb.Type)
+                    {
+                        case SelectTableInfoType.LeftJoin:
+                            sb.Append(" \r\nLEFT JOIN ");
+                            break;
+                        case SelectTableInfoType.InnerJoin:
+                            sb.Append(" \r\nINNER JOIN ");
+                            break;
+                        case SelectTableInfoType.RightJoin:
+                            sb.Append(" \r\nRIGHT JOIN ");
+                            break;
+                    }
+                    sb.Append(_commonUtils.QuoteSqlName(tbUnion[tb.Table.Type])).Append(" ").Append(_aliasRule?.Invoke(tb.Table.Type, tb.Alias) ?? tb.Alias).Append(" ON ").Append(tb.On ?? tb.NavigateCondition);
+                    if (!string.IsNullOrEmpty(tb.Cascade)) sb.Append(" AND ").Append(tb.Cascade);
+                    if (!string.IsNullOrEmpty(tb.On) && !string.IsNullOrEmpty(tb.NavigateCondition)) sbnav.Append(" AND (").Append(tb.NavigateCondition).Append(")");
+                }
+                if (_join.Length > 0) sb.Append(_join);
+
+                sbnav.Append(_where);
+                if (!string.IsNullOrEmpty(_tables[0].Cascade))
+                    sbnav.Append(" AND ").Append(_tables[0].Cascade);
+
+                if (sbnav.Length > 0)
+                {
+                    sb.Append(" \r\nWHERE ").Append(sbnav.Remove(0, 5));
+                }
+                if (string.IsNullOrEmpty(_groupby) == false)
+                {
+                    sb.Append(_groupby);
+                    if (string.IsNullOrEmpty(_having) == false)
+                        sb.Append(" \r\nHAVING ").Append(_having.Substring(5));
+                }
+                sb.Append(_orderby);
+
+                sbnav.Clear();
+                if (tbUnionsGt0) sb.Append(") ftb");
+            }
+            return sb.Append(_tosqlAppendContent).ToString();
+        }
+
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override ISelect<T1, T2> From<T2>(Expression<Func<ISelectFromExpression<T1>, T2, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3> From<T2, T3>(Expression<Func<ISelectFromExpression<T1>, T2, T3, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4> From<T2, T3, T4>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5> From<T2, T3, T4, T5>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6> From<T2, T3, T4, T5, T6>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7> From<T2, T3, T4, T5, T6, T7>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8> From<T2, T3, T4, T5, T6, T7, T8>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> From<T2, T3, T4, T5, T6, T7, T8, T9>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> From<T2, T3, T4, T5, T6, T7, T8, T9, T10>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> From<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Expression<Func<ISelectFromExpression<T1>, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, ISelectFromExpression<T1>>> exp) { this.InternalFrom(exp); var ret = new GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(_orm, _commonUtils, _commonExpression, null); GBaseSelect<T1>.CopyData(this, ret, exp?.Parameters); return ret; }
+        public override string ToSql(string field = null) => ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2> : FreeSql.Internal.CommonProvider.Select2Provider<T1, T2> where T2 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3> : FreeSql.Internal.CommonProvider.Select3Provider<T1, T2, T3> where T2 : class where T3 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4> : FreeSql.Internal.CommonProvider.Select4Provider<T1, T2, T3, T4> where T2 : class where T3 : class where T4 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5> : FreeSql.Internal.CommonProvider.Select5Provider<T1, T2, T3, T4, T5> where T2 : class where T3 : class where T4 : class where T5 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6> : FreeSql.Internal.CommonProvider.Select6Provider<T1, T2, T3, T4, T5, T6> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7> : FreeSql.Internal.CommonProvider.Select7Provider<T1, T2, T3, T4, T5, T6, T7> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8> : FreeSql.Internal.CommonProvider.Select8Provider<T1, T2, T3, T4, T5, T6, T7, T8> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> : FreeSql.Internal.CommonProvider.Select9Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : FreeSql.Internal.CommonProvider.Select10Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : FreeSql.Internal.CommonProvider.Select11Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> : FreeSql.Internal.CommonProvider.Select12Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> : FreeSql.Internal.CommonProvider.Select13Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> : FreeSql.Internal.CommonProvider.Select14Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : FreeSql.Internal.CommonProvider.Select15Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class where T15 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+    class GBaseSelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> : FreeSql.Internal.CommonProvider.Select16Provider<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class where T11 : class where T12 : class where T13 : class where T14 : class where T15 : class where T16 : class
+    {
+        public GBaseSelect(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere) : base(orm, commonUtils, commonExpression, dywhere) { }
+        public override string ToSql(string field = null) => GBaseSelect<T1>.ToSqlStatic(_commonUtils, _commonExpression, _select, _distinct, field ?? this.GetAllFieldExpressionTreeLevel2().Field, _join, _where, _groupby, _having, _orderby, _skip, _limit, _tables, this.GetTableRuleUnions(), _aliasRule, _tosqlAppendContent, _whereGlobalFilter, _orm);
+    }
+}
+
diff --git a/Providers/FreeSql.Provider.GBase/Curd/GBaseUpdate.cs b/Providers/FreeSql.Provider.GBase/Curd/GBaseUpdate.cs
new file mode 100644
index 00000000..20eb39b4
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/Curd/GBaseUpdate.cs
@@ -0,0 +1,78 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FreeSql.GBase.Curd
+{
+
+    class GBaseUpdate<T1> : Internal.CommonProvider.UpdateProvider<T1>
+    {
+
+        public GBaseUpdate(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression, object dywhere)
+            : base(orm, commonUtils, commonExpression, dywhere)
+        {
+        }
+
+        public override int ExecuteAffrows() => base.SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
+        public override List<T1> ExecuteUpdated() => base.SplitExecuteUpdated(_batchRowsLimit > 0 ? _batchRowsLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
+
+        protected override List<T1> RawExecuteUpdated()
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys)
+        {
+            if (primarys.Length == 1)
+            {
+                var pk = primarys.First();
+                caseWhen.Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name)));
+                return;
+            }
+            caseWhen.Append("(");
+            var pkidx = 0;
+            foreach (var pk in primarys)
+            {
+                if (pkidx > 0) caseWhen.Append(" || '+' || ");
+                caseWhen.Append(_commonUtils.RereadColumn(pk, _commonUtils.QuoteSqlName(pk.Attribute.Name)));
+                ++pkidx;
+            }
+            caseWhen.Append(")");
+        }
+
+        protected override void ToSqlWhen(StringBuilder sb, ColumnInfo[] primarys, object d)
+        {
+            if (primarys.Length == 1)
+            {
+                sb.Append(_commonUtils.FormatSql("{0}", primarys[0].GetDbValue(d)));
+                return;
+            }
+            sb.Append("(");
+            var pkidx = 0;
+            foreach (var pk in primarys)
+            {
+                if (pkidx > 0) sb.Append(" || '+' || ");
+                sb.Append(_commonUtils.FormatSql("{0}", pk.GetDbValue(d)));
+                ++pkidx;
+            }
+            sb.Append(")");
+        }
+
+#if net40
+#else
+        public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => base.SplitExecuteAffrowsAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
+        public override Task<List<T1>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default) => base.SplitExecuteUpdatedAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
+
+        protected override Task<List<T1>> RawExecuteUpdatedAsync(CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj b/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
new file mode 100644
index 00000000..5f1fca4d
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<Version>3.2.300</Version>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<Authors>FreeSql;GBase</Authors>
+		<Description>FreeSql 数据库实现，基于 南大通用 8.0</Description>
+		<PackageProjectUrl>https://github.com/dotnetcore/FreeSql</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/dotnetcore/FreeSql</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageTags>FreeSql;ORM;GBase;南大通用</PackageTags>
+		<PackageId>$(AssemblyName)</PackageId>
+		<PackageIcon>logo.png</PackageIcon>
+		<Title>$(AssemblyName)</Title>
+		<IsPackable>true</IsPackable>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="../../logo.png" Pack="true" PackagePath="\" />
+		<None Include="lib/**/*.dll">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="System.Data.Odbc" Version="5.0.0" />
+	</ItemGroup>
+	
+	<ItemGroup>
+		<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseAdo.cs b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseAdo.cs
new file mode 100644
index 00000000..bcdea701
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseAdo.cs
@@ -0,0 +1,93 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using FreeSql.Internal.ObjectPool;
+using System;
+using System.Collections;
+using System.Data.Common;
+using System.Data.Odbc;
+using System.Text;
+using System.Threading;
+
+namespace FreeSql.GBase
+{
+    class GBaseAdo : FreeSql.Internal.CommonProvider.AdoProvider
+    {
+
+        public GBaseAdo() : base(DataType.GBase, null, null) { }
+        public GBaseAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.GBase, masterConnectionString, slaveConnectionStrings)
+        {
+            base._util = util;
+            if (connectionFactory != null)
+            {
+                var pool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.GBase, connectionFactory);
+                MasterPool = pool;
+                _CreateCommandConnection = pool.TestConnection;
+                return;
+            }
+            if (!string.IsNullOrEmpty(masterConnectionString))
+                MasterPool = new GBaseConnectionPool("主库", masterConnectionString, null, null);
+            if (slaveConnectionStrings != null)
+            {
+                foreach (var slaveConnectionString in slaveConnectionStrings)
+                {
+                    var slavePool = new GBaseConnectionPool($"从库{SlavePools.Count + 1}", slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables), () => Interlocked.Increment(ref slaveUnavailables));
+                    SlavePools.Add(slavePool);
+                }
+            }
+        }
+
+        public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn)
+        {
+            if (param == null) return "NULL";
+            if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false))
+                param = Utils.GetDataReaderValue(mapType, param);
+
+            if (param is bool || param is bool?)
+                return (bool)param ? "'t'" : "'f'";
+            else if (param is string || param is char)
+                return string.Concat("'", param.ToString().Replace("'", "''"), "'");
+            else if (param is Enum)
+                return ((Enum)param).ToInt64();
+            else if (decimal.TryParse(string.Concat(param), out var trydec))
+                return param;
+            else if (param is DateTime || param is DateTime?)
+            {
+                if (mapColumn?.DbPrecision > 0)
+                    return string.Concat("'", ((DateTime)param).ToString($"yyyy-MM-dd HH:mm:ss.{"f".PadRight(mapColumn.DbPrecision, 'f')}"), "'");
+                return string.Concat("'", ((DateTime)param).ToString("yyyy-MM-dd HH:mm:ss"), "'");
+            }
+            else if (param is TimeSpan || param is TimeSpan?)
+            {
+                var ts = (TimeSpan)param;
+                return $"interval({ts.Days} {ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}) day(9) to fraction";
+            }
+            else if (param is byte[])
+                return $"x'{CommonUtils.BytesSqlRaw(param as byte[])}'";
+            else if (param is IEnumerable)
+                return AddslashesIEnumerable(param, mapType, mapColumn);
+
+            return string.Concat("'", param.ToString().Replace("'", "''"), "'");
+        }
+
+        DbConnection _CreateCommandConnection;
+        public override DbCommand CreateCommand()
+        {
+            if (_CreateCommandConnection != null)
+            {
+                var cmd = _CreateCommandConnection.CreateCommand();
+                cmd.Connection = null;
+                return cmd;
+            }
+            return new OdbcCommand();
+        }
+
+        public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
+        {
+            var rawPool = pool as GBaseConnectionPool;
+            if (rawPool != null) rawPool.Return(conn, ex);
+            else pool.Return(conn);
+        }
+
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs
new file mode 100644
index 00000000..5c803c21
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs
@@ -0,0 +1,237 @@
+using FreeSql.Internal.ObjectPool;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Data.Odbc;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace FreeSql.GBase
+{
+
+    class GBaseConnectionPool : ObjectPool<DbConnection>
+    {
+
+        internal Action availableHandler;
+        internal Action unavailableHandler;
+
+        public GBaseConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
+        {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
+            var policy = new GBaseConnectionPoolPolicy
+            {
+                _pool = this,
+                Name = name
+            };
+            this.Policy = policy;
+            policy.ConnectionString = connectionString;
+        }
+
+        public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
+        {
+            if (exception != null && exception is OdbcException)
+            {
+                try { if (obj.Value.Ping() == false) obj.Value.Open(); } catch { base.SetUnavailable(exception); }
+            }
+            base.Return(obj, isRecreate);
+        }
+    }
+
+    class GBaseConnectionPoolPolicy : IPolicy<DbConnection>
+    {
+
+        internal GBaseConnectionPool _pool;
+        public string Name { get; set; } = "GBase IfxConnection 对象池";
+        public int PoolSize { get; set; } = 100;
+        public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(10);
+        public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
+        public int AsyncGetCapacity { get; set; } = 10000;
+        public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
+        public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
+
+        static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
+        private string _connectionString;
+        public string ConnectionString
+        {
+            get => _connectionString;
+            set
+            {
+                _connectionString = value ?? "";
+
+                var pattern = @"Max\s*pool\s*size\s*=\s*(\d+)";
+                var m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success == false || int.TryParse(m.Groups[1].Value, out var poolsize) == false || poolsize <= 0) poolsize = 100;
+                var connStrIncr = dicConnStrIncr.AddOrUpdate(_connectionString, 1, (oldkey, oldval) => Math.Min(5, oldval + 1));
+                PoolSize = poolsize + connStrIncr;
+                _connectionString = m.Success ?
+                    Regex.Replace(_connectionString, pattern, $"Max pool size={PoolSize}", RegexOptions.IgnoreCase) :
+                    $"{_connectionString};Max pool size={PoolSize}";
+
+                pattern = @"Connection\s*LifeTime\s*=\s*(\d+)";
+                m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success)
+                {
+                    IdleTimeout = TimeSpan.FromSeconds(int.Parse(m.Groups[1].Value));
+                    _connectionString = Regex.Replace(_connectionString, pattern, "", RegexOptions.IgnoreCase);
+                }
+
+                var minPoolSize = 0;
+                pattern = @"Min\s*pool\s*size\s*=\s*(\d+)";
+                m = Regex.Match(_connectionString, pattern, RegexOptions.IgnoreCase);
+                if (m.Success)
+                {
+                    minPoolSize = int.Parse(m.Groups[1].Value);
+                    _connectionString = Regex.Replace(_connectionString, pattern, "", RegexOptions.IgnoreCase);
+                }
+
+                FreeSql.Internal.CommonUtils.PrevReheatConnectionPool(_pool, minPoolSize);
+            }
+        }
+
+        public bool OnCheckAvailable(Object<DbConnection> obj)
+        {
+            if (obj.Value.State == ConnectionState.Closed) obj.Value.Open();
+            return obj.Value.Ping(true);
+        }
+
+        public DbConnection OnCreate()
+        {
+            var conn = new OdbcConnection(_connectionString);
+            return conn;
+        }
+
+        public void OnDestroy(DbConnection obj)
+        {
+            try { if (obj.State != ConnectionState.Closed) obj.Close(); } catch { }
+            obj.Dispose();
+        }
+
+        public void OnGet(Object<DbConnection> obj)
+        {
+
+            if (_pool.IsAvailable)
+            {
+                if (obj.Value == null)
+                {
+                    if (_pool.SetUnavailable(new Exception("连接字符串错误")) == true)
+                        throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
+                    return;
+                }
+
+                if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false)
+                {
+
+                    try
+                    {
+                        obj.Value.Open();
+                    }
+                    catch (Exception ex)
+                    {
+                        if (_pool.SetUnavailable(ex) == true)
+                            throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
+                    }
+                }
+            }
+        }
+
+#if net40
+#else
+        async public Task OnGetAsync(Object<DbConnection> obj)
+        {
+
+            if (_pool.IsAvailable)
+            {
+                if (obj.Value == null)
+                {
+                    if (_pool.SetUnavailable(new Exception("连接字符串错误")) == true)
+                        throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
+                    return;
+                }
+
+                if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && (await obj.Value.PingAsync()) == false)
+                {
+
+                    try
+                    {
+                        await obj.Value.OpenAsync();
+                    }
+                    catch (Exception ex)
+                    {
+                        if (_pool.SetUnavailable(ex) == true)
+                            throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}");
+                    }
+                }
+            }
+        }
+#endif
+
+        public void OnGetTimeout()
+        {
+
+        }
+
+        public void OnReturn(Object<DbConnection> obj)
+        {
+            //if (obj?.Value != null && obj.Value.State != ConnectionState.Closed) try { obj.Value.Close(); } catch { }
+        }
+
+        public void OnAvailable()
+        {
+            _pool.availableHandler?.Invoke();
+        }
+
+        public void OnUnavailable()
+        {
+            _pool.unavailableHandler?.Invoke();
+        }
+    }
+
+    static class DbConnectionExtensions
+    {
+
+        static DbCommand PingCommand(DbConnection conn)
+        {
+            var cmd = conn.CreateCommand();
+            cmd.CommandTimeout = 5;
+            cmd.CommandText = "select 1 from dual";
+            return cmd;
+        }
+        public static bool Ping(this DbConnection that, bool isThrow = false)
+        {
+            try
+            {
+                PingCommand(that).ExecuteNonQuery();
+                return true;
+            }
+            catch
+            {
+                if (that.State != ConnectionState.Closed) try { that.Close(); } catch { }
+                if (isThrow) throw;
+                return false;
+            }
+        }
+
+#if net40
+#else
+        async public static Task<bool> PingAsync(this DbConnection that, bool isThrow = false)
+        {
+            try
+            {
+                await PingCommand(that).ExecuteNonQueryAsync();
+                return true;
+            }
+            catch
+            {
+                if (that.State != ConnectionState.Closed) try { that.Close(); } catch { }
+                if (isThrow) throw;
+                return false;
+            }
+        }
+#endif
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs b/Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs
new file mode 100644
index 00000000..250ace61
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseCodeFirst.cs
@@ -0,0 +1,213 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using FreeSql.DataAnnotations;
+using FreeSql.Internal.ObjectPool;
+using System.Data.Common;
+using System.Data.Odbc;
+
+namespace FreeSql.GBase
+{
+
+    class GBaseCodeFirst : Internal.CommonProvider.CodeFirstProvider
+    {
+
+        public override bool IsNoneCommandParameter { get => true; set => base.IsNoneCommandParameter = true; }
+        public GBaseCodeFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) : base(orm, commonUtils, commonExpression) { }
+
+        static object _dicCsToDbLock = new object();
+        static Dictionary<string, CsToDb<OdbcType>> _dicCsToDb = new Dictionary<string, CsToDb<OdbcType>>() {
+                { typeof(sbyte).FullName, CsToDb.New(OdbcType.SmallInt, "smallint","smallint NOT NULL", false, false, 0) },{ typeof(sbyte?).FullName, CsToDb.New(OdbcType.SmallInt, "smallint", "smallint", false, true, null) },
+                { typeof(short).FullName, CsToDb.New(OdbcType.SmallInt, "smallint","smallint NOT NULL", false, false, 0) },{ typeof(short?).FullName, CsToDb.New(OdbcType.SmallInt, "smallint", "smallint", false, true, null) },
+                { typeof(int).FullName, CsToDb.New(OdbcType.Int, "integer","integer NOT NULL", false, false, 0) },{ typeof(int?).FullName, CsToDb.New(OdbcType.Int, "integer", "integer", false, true, null) },
+                { typeof(long).FullName, CsToDb.New(OdbcType.BigInt, "bigint","bigint NOT NULL", false, false, 0) },{ typeof(long?).FullName, CsToDb.New(OdbcType.BigInt, "bigint", "bigint", false, true, null) },
+
+                { typeof(byte).FullName, CsToDb.New(OdbcType.SmallInt, "smallint","smallint NOT NULL", false, false, 0) },{ typeof(byte?).FullName, CsToDb.New(OdbcType.SmallInt, "smallint", "smallint", false, true, null) },
+                { typeof(ushort).FullName, CsToDb.New(OdbcType.Int, "integer","integer NOT NULL", false, false, 0) },{ typeof(ushort?).FullName, CsToDb.New(OdbcType.Int, "integer", "integer", false, true, null) },
+                { typeof(uint).FullName, CsToDb.New(OdbcType.BigInt, "bigint","bigint NOT NULL", false, false, 0) },{ typeof(uint?).FullName, CsToDb.New(OdbcType.BigInt, "bigint", "bigint", false, true, null) },
+                { typeof(ulong).FullName, CsToDb.New(OdbcType.Decimal, "decimal","decimal(20,0) NOT NULL", false, false, 0) },{ typeof(ulong?).FullName, CsToDb.New(OdbcType.Decimal, "decimal", "decimal(20,0)", false, true, null) },
+
+                { typeof(float).FullName, CsToDb.New(OdbcType.Real, "real","real NOT NULL", false, false, 0) },{ typeof(float?).FullName, CsToDb.New(OdbcType.Real, "real", "real", false, true, null) },
+                { typeof(double).FullName, CsToDb.New(OdbcType.Double, "float","float NOT NULL", false, false, 0) },{ typeof(double?).FullName, CsToDb.New(OdbcType.Double, "float", "float", false, true, null) },
+                { typeof(decimal).FullName, CsToDb.New(OdbcType.Decimal, "decimal", "decimal(10,2) NOT NULL", false, false, 0) },{ typeof(decimal?).FullName, CsToDb.New(OdbcType.Decimal, "decimal", "decimal(10,2)", false, true, null) },
+
+                { typeof(string).FullName, CsToDb.New(OdbcType.VarChar, "varchar", "varchar(255)", false, null, "") },
+
+                { typeof(TimeSpan).FullName, CsToDb.New(OdbcType.Time, "interval day to fraction","interval day(3) to fraction(3) NOT NULL", false, false, 0) },{ typeof(TimeSpan?).FullName, CsToDb.New(OdbcType.Time, "interval day to fraction", "interval day(3) to fraction(3) NULL",false, true, null) },
+                { typeof(DateTime).FullName, CsToDb.New(OdbcType.DateTime, "datetime year to fraction", "datetime year to fraction(3) NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName, CsToDb.New(OdbcType.DateTime, "datetime year to fraction", "datetime year to fraction(3)", false, true, null) },
+
+                { typeof(bool).FullName, CsToDb.New(OdbcType.Bit, "boolean","boolean NOT NULL", null, false, false) },{ typeof(bool?).FullName, CsToDb.New(OdbcType.Bit, "boolean","boolean", null, true, null) },
+                { typeof(byte[]).FullName, CsToDb.New(OdbcType.VarBinary, "byte", "byte", false, null, new byte[0]) },
+
+                { typeof(Guid).FullName, CsToDb.New(OdbcType.UniqueIdentifier, "char(36)", "char(36) NOT NULL", false, false, Guid.Empty) },{ typeof(Guid?).FullName, CsToDb.New(OdbcType.UniqueIdentifier, "char(36)", "char(36)", false, true, null) },
+            };
+
+        public override DbInfoResult GetDbInfo(Type type)
+        {
+            var info = GetDbInfoNoneArray(type);
+            if (info == null) return null;
+            return new DbInfoResult((int)info.type, info.dbtype, info.dbtypeFull, info.isnullable, info.defaultValue);
+        }
+        CsToDb<OdbcType> GetDbInfoNoneArray(Type type)
+        {
+            if (_dicCsToDb.TryGetValue(type.FullName, out var trydc)) return trydc;
+            if (type.IsArray) return null;
+            var enumType = type.IsEnum ? type : null;
+            if (enumType == null && type.IsNullableType() && type.GenericTypeArguments.Length == 1 && type.GenericTypeArguments.First().IsEnum) enumType = type.GenericTypeArguments.First();
+            if (enumType != null)
+            {
+                var newItem = enumType.GetCustomAttributes(typeof(FlagsAttribute), false).Any() ?
+                    CsToDb.New(OdbcType.BigInt, "bigint", $"bigint{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, enumType.CreateInstanceGetDefaultValue()) :
+                    CsToDb.New(OdbcType.Int, "integer", $"integer{(type.IsEnum ? " NOT NULL" : "")}", false, type.IsEnum ? false : true, enumType.CreateInstanceGetDefaultValue());
+                if (_dicCsToDb.ContainsKey(type.FullName) == false)
+                {
+                    lock (_dicCsToDbLock)
+                    {
+                        if (_dicCsToDb.ContainsKey(type.FullName) == false)
+                            _dicCsToDb.Add(type.FullName, newItem);
+                    }
+                }
+                return newItem;
+            }
+            return null;
+        }
+
+        protected override string GetComparisonDDLStatements(params TypeAndName[] objects)
+        {
+            Object<DbConnection> conn = null;
+            string database = null;
+
+            try
+            {
+                conn = _orm.Ado.MasterPool.Get(TimeSpan.FromSeconds(5));
+                database = conn.Value.Database;
+
+                var sb = new StringBuilder();
+                foreach (var obj in objects)
+                {
+                    if (sb.Length > 0) sb.Append("\r\n");
+                    var tb = _commonUtils.GetTableByEntity(obj.entityType);
+                    if (tb == null) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移");
+                    if (tb.Columns.Any() == false) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移，可迁移属性0个");
+                    var tbname = _commonUtils.SplitTableName(tb.DbName);
+                    if (tbname?.Length == 1) tbname = new[] { database, tbname[0] };
+
+                    var tboldname = _commonUtils.SplitTableName(tb.DbOldName); //旧表名
+                    if (tboldname?.Length == 1) tboldname = new[] { database, tboldname[0] };
+                    if (string.IsNullOrEmpty(obj.tableName) == false)
+                    {
+                        var tbtmpname = _commonUtils.SplitTableName(obj.tableName);
+                        if (tbtmpname?.Length == 1) tbtmpname = new[] { database, tbtmpname[0] };
+                        if (tbname[0] != tbtmpname[0] || tbname[1] != tbtmpname[1])
+                        {
+                            tbname = tbtmpname;
+                            tboldname = null;
+                        }
+                    }
+
+                    if (string.Compare(tbname[0], database, true) != 0) //创建数据库
+                    {
+                        try
+                        {
+                            LocalExecuteScalar(tbname[0], $" select first 1 1 from syscolcomms");
+                        }
+                        catch
+                        {
+                            sb.Append($"CREATE DATABASE IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(tbname[0])).Append(";\r\n");
+                        }
+                    }
+
+                    //创建表
+                    var createTableName = _commonUtils.QuoteSqlName(tbname[0], tbname[1]);
+                    sb.Append("CREATE TABLE IF NOT EXISTS ").Append(createTableName).Append(" ( ");
+                    foreach (var tbcol in tb.ColumnsByPosition)
+                    {
+                        sb.Append(" \r\n  ").Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(" ").Append(tbcol.Attribute.DbType);
+                        sb.Append(",");
+                    }
+                    if (tb.Primarys.Any())
+                    {
+                        sb.Append(" \r\n  PRIMARY KEY (");
+                        foreach (var tbcol in tb.Primarys) sb.Append(_commonUtils.QuoteSqlName(tbcol.Attribute.Name)).Append(", ");
+                        sb.Remove(sb.Length - 2, 2).Append("),");
+                    }
+                    sb.Remove(sb.Length - 1, 1);
+                    sb.Append("\r\n)");
+                    sb.Append(";\r\n");
+                    //创建表的索引
+                    foreach (var uk in tb.Indexes)
+                    {
+                        sb.Append("CREATE ");
+                        if (uk.IsUnique) sb.Append("UNIQUE ");
+                        sb.Append("INDEX IF NOT EXISTS ").Append(_commonUtils.QuoteSqlName(uk.Name)).Append(" ON ").Append(createTableName).Append("(");
+                        foreach (var tbcol in uk.Columns)
+                        {
+                            sb.Append(_commonUtils.QuoteSqlName(tbcol.Column.Attribute.Name));
+                            sb.Append(", ");
+                        }
+                        sb.Remove(sb.Length - 2, 2).Append(");\r\n");
+                    }
+                    //备注
+                    foreach (var tbcol in tb.ColumnsByPosition)
+                    {
+                        if (string.IsNullOrEmpty(tbcol.Comment) == false)
+                            sb.Append("COMMENT ON COLUMN ").Append(_commonUtils.QuoteSqlName($"{tbname.Last()}.{tbcol.Attribute.Name}")).Append(" IS ").Append(_commonUtils.FormatSql("{0}", tbcol.Comment)).Append(";\r\n");
+                    }
+                    if (string.IsNullOrEmpty(tb.Comment) == false)
+                        sb.Append("COMMENT ON TABLE ").Append(_commonUtils.QuoteSqlName(tbname.Last())).Append(" IS ").Append(_commonUtils.FormatSql("{0}", tb.Comment)).Append(";\r\n");
+                    continue;
+                }
+                return sb.Length == 0 ? null : sb.ToString();
+            }
+            finally
+            {
+                try
+                {
+                    if (string.IsNullOrEmpty(database) == false)
+                        conn.Value.ChangeDatabase(database);
+                    _orm.Ado.MasterPool.Return(conn);
+                }
+                catch
+                {
+                    _orm.Ado.MasterPool.Return(conn, true);
+                }
+            }
+
+            object LocalExecuteScalar(string db, string sql)
+            {
+                if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(db);
+                try
+                {
+                    using (var cmd = conn.Value.CreateCommand())
+                    {
+                        cmd.CommandText = sql;
+                        cmd.CommandType = CommandType.Text;
+                        return cmd.ExecuteScalar();
+                    }
+                }
+                finally
+                {
+                    if (string.Compare(database, db) != 0) conn.Value.ChangeDatabase(database);
+                }
+            }
+        }
+
+        public override int ExecuteDDLStatements(string ddl)
+        {
+            if (string.IsNullOrEmpty(ddl)) return 0;
+            var scripts = ddl.Split(new string[] { ";\r\n" }, StringSplitOptions.None).Where(a => string.IsNullOrEmpty(a.Trim()) == false).ToArray();
+
+            if (scripts.Any() == false) return 0;
+
+            var affrows = 0;
+            foreach (var script in scripts)
+                affrows += base.ExecuteDDLStatements(script);
+            return affrows;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.GBase/GBaseDbFirst.cs b/Providers/FreeSql.Provider.GBase/GBaseDbFirst.cs
new file mode 100644
index 00000000..ddd2be1b
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseDbFirst.cs
@@ -0,0 +1,201 @@
+using FreeSql.DatabaseModel;
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Data.Odbc;
+
+namespace FreeSql.GBase
+{
+    class GBaseDbFirst : IDbFirst
+    {
+        IFreeSql _orm;
+        protected CommonUtils _commonUtils;
+        protected CommonExpression _commonExpression;
+        public GBaseDbFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression)
+        {
+            _orm = orm;
+            _commonUtils = commonUtils;
+            _commonExpression = commonExpression;
+        }
+
+        public int GetDbType(DbColumnInfo column) => (int)GetOdbcType(column);
+        OdbcType GetOdbcType(DbColumnInfo column)
+        {
+            var dbtype = column.DbTypeText;
+            OdbcType ret = OdbcType.VarChar;
+            switch (dbtype?.ToLower().TrimStart('_'))
+            {
+                case "int8":
+                case "serial8":
+                case "bigserial":
+                case "bigint": ret = OdbcType.BigInt; break;
+                case "byte":
+                case "blob": ret = OdbcType.VarBinary; break;
+                case "nchar": ret = OdbcType.NChar; break;
+                case "char":
+                case "character": ret = OdbcType.Char; break;
+                case "date": ret = OdbcType.Date; break;
+                case "dec":
+                case "decimal": ret = OdbcType.Decimal; break;
+                case "double":
+                case "double precision":
+                case "float": ret = OdbcType.Double; break;
+                case "real":
+                case "smallfloat": ret = OdbcType.Real; break;
+                case "serial":
+                case "integer":
+                case "int": ret = OdbcType.Int; break;
+                case "numeric":
+                case "numeric precision": ret = OdbcType.Decimal; break;
+                case "smallint": ret = OdbcType.SmallInt; break;
+                case "interval": ret = OdbcType.Time; break;
+                case "datetime":
+                case "timestamp": ret = OdbcType.DateTime; break;
+                case "varchar":
+                case "char varying":
+                case "character varying": ret = OdbcType.VarChar; break;
+                case "nvarchar": ret = OdbcType.NVarChar; break;
+
+                case "text": ret = OdbcType.Text; break;
+                case "boolean": ret = OdbcType.Bit; break;
+                case "char(36)": ret = OdbcType.UniqueIdentifier; break;
+            }
+            return ret;
+        }
+
+        static readonly Dictionary<int, DbToCs> _dicDbToCs = new Dictionary<int, DbToCs>() {
+            { (int)OdbcType.SmallInt, new DbToCs("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") },
+            { (int)OdbcType.Int, new DbToCs("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") },
+            { (int)OdbcType.BigInt, new DbToCs("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") },
+            { (int)OdbcType.Decimal, new DbToCs("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") },
+            { (int)OdbcType.Real, new DbToCs("(float?)", "float.Parse({0})", "{0}.ToString()", "float?", typeof(float), typeof(float?), "{0}.Value", "GetFloat") },
+            { (int)OdbcType.Double, new DbToCs("(double?)", "double.Parse({0})", "{0}.ToString()", "double?", typeof(double), typeof(double?), "{0}.Value", "GetDouble") },
+            { (int)OdbcType.Decimal, new DbToCs("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") },
+
+            { (int)OdbcType.Char, new DbToCs("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") },
+            { (int)OdbcType.VarChar, new DbToCs("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") },
+            { (int)OdbcType.Text, new DbToCs("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") },
+
+            { (int)OdbcType.DateTime, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+            { (int)OdbcType.Date, new DbToCs("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
+            { (int)OdbcType.Time, new DbToCs("(TimeSpan?)", "TimeSpan.Parse(double.Parse({0}))", "{0}.Ticks.ToString()", "TimeSpan?", typeof(TimeSpan), typeof(TimeSpan?), "{0}.Value", "GetValue") },
+
+            { (int)OdbcType.Bit, new DbToCs("(bool?)", "{0} == \"1\"", "{0} == true ? \"1\" : \"0\"", "bool?", typeof(bool), typeof(bool?), "{0}.Value", "GetBoolean") },
+            { (int)OdbcType.VarBinary, new DbToCs("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") },
+
+            { (int)OdbcType.UniqueIdentifier, new DbToCs("(Guid?)", "Guid.Parse({0})", "{0}.ToString()", "Guid", typeof(Guid), typeof(Guid?), "{0}", "GetString") },
+        };
+
+        public string GetCsConvert(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", "")) : null;
+        public string GetCsParse(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csParse : null;
+        public string GetCsStringify(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csStringify : null;
+        public string GetCsType(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", "")) : null;
+        public Type GetCsTypeInfo(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeInfo : null;
+        public string GetCsTypeValue(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeValue : null;
+        public string GetDataReaderMethod(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.dataReaderMethod : null;
+
+        public List<string> GetDatabases()
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool ExistsTable(string name, bool ignoreCase)
+        {
+            if (string.IsNullOrEmpty(name)) return false;
+            var tbname = _commonUtils.SplitTableName(name);
+            if (ignoreCase) tbname = tbname.Select(a => a.ToUpper()).ToArray();
+            var sql = $" select 1 from systables where tabtype='T' and {(ignoreCase ? "upper(trim(tabname))" : "trim(tabname)")} = {_commonUtils.FormatSql("{0}", tbname.Last())}";
+            return string.Concat(_orm.Ado.ExecuteScalar(CommandType.Text, sql)) == "1";
+        }
+
+        public DbTableInfo GetTableByName(string name, bool ignoreCase = true) => GetTables(null, name, ignoreCase)?.FirstOrDefault();
+        public List<DbTableInfo> GetTablesByDatabase(params string[] database) => GetTables(database, null, false);
+
+        public List<DbTableInfo> GetTables(string[] database, string tablename, bool ignoreCase)
+        {
+            string[] tbname = null;
+            if (string.IsNullOrEmpty(tablename) == false)
+            {
+                tbname = _commonUtils.SplitTableName(tablename);
+                if (ignoreCase) tbname = tbname.Select(a => a.ToUpper()).ToArray();
+            }
+
+            var loc1 = new List<DbTableInfo>();
+            var loc2 = new Dictionary<string, DbTableInfo>();
+            var loc3 = new Dictionary<string, Dictionary<string, DbColumnInfo>>();
+
+            var sql = @"
+select
+a.""owner"" || a.tabname as id,
+trim(a.""owner"") as owner,
+trim(a.tabname) as name,
+trim(b.comments) as comment,
+a.tabtype as type
+from systables a
+left join syscomments b on b.tabname = a.tabname
+where a.tabtype in ('T', 'V')" + (tbname == null ? "" : $" and {(ignoreCase ? "upper(trim(a.tabname))" : "trim(a.tabname)")} = {_commonUtils.FormatSql("{0}", tbname.Last())}");
+            var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
+            if (ds == null) return loc1;
+
+            var loc6 = new List<string[]>();
+            var loc66 = new List<string[]>();
+            var loc6_1000 = new List<string>();
+            var loc66_1000 = new List<string>();
+            foreach (var row in ds)
+            {
+                var table_id = string.Concat(row[0]);
+                var schema = string.Concat(row[1]);
+                var table = string.Concat(row[2]);
+                var comment = string.Concat(row[3]);
+                DbTableType type = DbTableType.TABLE;
+                switch (string.Concat(row[4]))
+                {
+                    case "V": type = DbTableType.VIEW; break;
+                }
+                if (database?.Length == 1)
+                {
+                    table_id = table_id.Substring(table_id.IndexOf('.') + 1);
+                    schema = "";
+                }
+                loc2.Add(table_id, new DbTableInfo { Id = table_id, Schema = schema, Name = table, Comment = comment, Type = type });
+                loc3.Add(table_id, new Dictionary<string, DbColumnInfo>());
+                switch (type)
+                {
+                    case DbTableType.TABLE:
+                    case DbTableType.VIEW:
+                        loc6_1000.Add(table.Replace("'", "''"));
+                        if (loc6_1000.Count >= 500)
+                        {
+                            loc6.Add(loc6_1000.ToArray());
+                            loc6_1000.Clear();
+                        }
+                        break;
+                    case DbTableType.StoreProcedure:
+                        loc66_1000.Add(table.Replace("'", "''"));
+                        if (loc66_1000.Count >= 500)
+                        {
+                            loc66.Add(loc66_1000.ToArray());
+                            loc66_1000.Clear();
+                        }
+                        break;
+                }
+                loc1.Add(loc2[table_id]);
+            }
+            if (loc6_1000.Count > 0) loc6.Add(loc6_1000.ToArray());
+            if (loc66_1000.Count > 0) loc66.Add(loc66_1000.ToArray());
+
+            //todo: ...
+            return loc1;
+        }
+
+        public List<DbEnumInfo> GetEnumsByDatabase(params string[] database)
+        {
+            return new List<DbEnumInfo>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.GBase/GBaseExpression.cs b/Providers/FreeSql.Provider.GBase/GBaseExpression.cs
new file mode 100644
index 00000000..09ab3304
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseExpression.cs
@@ -0,0 +1,556 @@
+using FreeSql.Internal;
+using System;
+using System.Collections;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FreeSql.GBase
+{
+    class GBaseExpression : CommonExpression
+    {
+
+        public GBaseExpression(CommonUtils common) : base(common) { }
+
+        public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            switch (exp.NodeType)
+            {
+                case ExpressionType.ArrayLength:
+                    var arrOper = (exp as UnaryExpression)?.Operand;
+                    if (arrOper.Type == typeof(byte[])) return $"octet_length({getExp(arrOper)})";
+                    break;
+                case ExpressionType.Convert:
+                    var operandExp = (exp as UnaryExpression)?.Operand;
+                    var gentype = exp.Type.NullableTypeOrThis();
+                    if (gentype != operandExp.Type.NullableTypeOrThis())
+                    {
+                        switch (gentype.ToString())
+                        {
+                            case "System.Boolean": return $"({getExp(operandExp)} not in ('0','F','f'))";
+                            case "System.Byte": return $"cast({getExp(operandExp)} as smallint)";
+                            case "System.Char": return $"substring(cast({getExp(operandExp)} as varchar(10)) from 1 for 1)";
+                            case "System.DateTime": return $"to_date({getExp(operandExp)})";
+                            case "System.Decimal": return $"cast({getExp(operandExp)} as decimal(18,6))";
+                            case "System.Double": return $"cast({getExp(operandExp)} as decimal(18,10))";
+                            case "System.Int16": return $"cast({getExp(operandExp)} as smallint)";
+                            case "System.Int32": return $"cast({getExp(operandExp)} as integer)";
+                            case "System.Int64": return $"cast({getExp(operandExp)} as bigint)";
+                            case "System.SByte": return $"cast({getExp(operandExp)} as smallint)";
+                            case "System.Single": return $"cast({getExp(operandExp)} as decimal(14,7))";
+                            case "System.String": return $"cast({getExp(operandExp)} as varchar(8000))";
+                            case "System.UInt16": return $"cast({getExp(operandExp)} as integer)";
+                            case "System.UInt32": return $"cast({getExp(operandExp)} as bigint)";
+                            case "System.UInt64": return $"cast({getExp(operandExp)} as decimal(21,0))";
+                            case "System.Guid": return $"substring(cast({getExp(operandExp)} as char(36)) from 1 for 36)";
+                        }
+                    }
+                    break;
+                case ExpressionType.Call:
+                    var callExp = exp as MethodCallExpression;
+
+                    switch (callExp.Method.Name)
+                    {
+                        case "Parse":
+                        case "TryParse":
+                            switch (callExp.Method.DeclaringType.NullableTypeOrThis().ToString())
+                            {
+                                case "System.Boolean": return $"({getExp(callExp.Arguments[0])} not in ('0','F','f'))";
+                                case "System.Byte": return $"cast({getExp(callExp.Arguments[0])} as smallint)";
+                                case "System.Char": return $"substring(cast({getExp(callExp.Arguments[0])} as varchar(10)) from 1 for 1)";
+                                case "System.DateTime": return $"to_date({getExp(callExp.Arguments[0])})";
+                                case "System.Decimal": return $"cast({getExp(callExp.Arguments[0])} as decimal(18,6))";
+                                case "System.Double": return $"cast({getExp(callExp.Arguments[0])} as decimal(18,10))";
+                                case "System.Int16": return $"cast({getExp(callExp.Arguments[0])} as smallint)";
+                                case "System.Int32": return $"cast({getExp(callExp.Arguments[0])} as integer)";
+                                case "System.Int64": return $"cast({getExp(callExp.Arguments[0])} as bigint)";
+                                case "System.SByte": return $"cast({getExp(callExp.Arguments[0])} as smallint)";
+                                case "System.Single": return $"cast({getExp(callExp.Arguments[0])} as decimal(14,7))";
+                                case "System.String": return $"cast({getExp(callExp.Arguments[0])} as varchar(8000))";
+                                case "System.UInt16": return $"cast({getExp(callExp.Arguments[0])} as integer)";
+                                case "System.UInt32": return $"cast({getExp(callExp.Arguments[0])} as bigint)";
+                                case "System.UInt64": return $"cast({getExp(callExp.Arguments[0])} as decimal(18,0))";
+                                case "System.Guid": return $"substring(cast({getExp(callExp.Arguments[0])} as char(36)) from 1 for 36)";
+                            }
+                            return null;
+                        case "NewGuid":
+                            return null;
+                        case "Next":
+                            if (callExp.Object?.Type == typeof(Random)) return "random()";
+                            return null;
+                        case "NextDouble":
+                            if (callExp.Object?.Type == typeof(Random)) return "cast(random() as float)";
+                            return null;
+                        case "Random":
+                            if (callExp.Method.DeclaringType.IsNumberType()) return "random()";
+                            return null;
+                        case "ToString":
+                            if (callExp.Object != null) return callExp.Arguments.Count == 0 ? $"cast({getExp(callExp.Object)} as varchar(8000))" : null;
+                            return null;
+                    }
+
+                    var objExp = callExp.Object;
+                    var objType = objExp?.Type;
+                    if (objType?.FullName == "System.Byte[]") return null;
+
+                    var argIndex = 0;
+                    if (objType == null && callExp.Method.DeclaringType == typeof(Enumerable))
+                    {
+                        objExp = callExp.Arguments.FirstOrDefault();
+                        objType = objExp?.Type;
+                        argIndex++;
+                    }
+                    if (objType == null) objType = callExp.Method.DeclaringType;
+                    if (objType != null || objType.IsArrayOrList())
+                    {
+                        if (argIndex >= callExp.Arguments.Count) break;
+                        tsc.SetMapColumnTmp(null);
+                        var args1 = getExp(callExp.Arguments[argIndex]);
+                        var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        var left = objExp == null ? null : getExp(objExp);
+                        tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
+                        switch (callExp.Method.Name)
+                        {
+                            case "Contains":
+                                //判断 in //在各大 Provider AdoProvider 中已约定，500元素分割, 3空格\r\n4空格
+                                return $"(({args1}) in {left.Replace(",   \r\n    \r\n", $") \r\n OR ({args1}) in (")})";
+                        }
+                    }
+                    break;
+                case ExpressionType.NewArrayInit:
+                    var arrExp = exp as NewArrayExpression;
+                    var arrSb = new StringBuilder();
+                    arrSb.Append("(");
+                    for (var a = 0; a < arrExp.Expressions.Count; a++)
+                    {
+                        if (a > 0) arrSb.Append(",");
+                        if (a % 500 == 499) arrSb.Append("   \r\n    \r\n"); //500元素分割, 3空格\r\n4空格
+                        arrSb.Append(getExp(arrExp.Expressions[a]));
+                    }
+                    if (arrSb.Length == 1) arrSb.Append("NULL");
+                    return arrSb.Append(")").ToString();
+                case ExpressionType.ListInit:
+                    var listExp = exp as ListInitExpression;
+                    var listSb = new StringBuilder();
+                    listSb.Append("(");
+                    for (var a = 0; a < listExp.Initializers.Count; a++)
+                    {
+                        if (listExp.Initializers[a].Arguments.Any() == false) continue;
+                        if (a > 0) listSb.Append(",");
+                        listSb.Append(getExp(listExp.Initializers[a].Arguments.FirstOrDefault()));
+                    }
+                    if (listSb.Length == 1) listSb.Append("NULL");
+                    return listSb.Append(")").ToString();
+                case ExpressionType.New:
+                    var newExp = exp as NewExpression;
+                    if (typeof(IList).IsAssignableFrom(newExp.Type))
+                    {
+                        if (newExp.Arguments.Count == 0) return "(NULL)";
+                        if (typeof(IEnumerable).IsAssignableFrom(newExp.Arguments[0].Type) == false) return "(NULL)";
+                        return getExp(newExp.Arguments[0]);
+                    }
+                    return null;
+            }
+            return null;
+        }
+
+        public override string ExpressionLambdaToSqlMemberAccessString(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Empty": return "''";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            switch (exp.Member.Name)
+            {
+                case "Length": return $"char_length({left})";
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlMemberAccessDateTime(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Now": return _common.Now;
+                    case "UtcNow": return _common.NowUtc;
+                    case "Today": return "current_date";
+                    case "MinValue": return "to_date('0001-1-1', 'YYYY-MM-DD')";
+                    case "MaxValue": return "to_date('9999-12-31 23:59:59', 'YYYY-MM-DD HH24:MI:SS')";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            switch (exp.Member.Name)
+            {
+                case "Date": return $"to_date(to_char({left}, 'YYYY-MM-DD'), 'YYYY-MM-DD')";
+                case "TimeOfDay": return $"('0 '||to_char({left}, 'HH24:MI:SS.FF3'))::interval day(9) to fraction";
+                case "DayOfWeek": return $"weekday({left})";
+                case "Day": return $"day({left})";
+                case "DayOfYear": return $"cast(to_char({left},'DDD') as int)";
+                case "Month": return $"month({left})";
+                case "Year": return $"year({left})";
+                case "Hour": return $"cast(to_char({left},'HH24') as int)";
+                case "Minute": return $"cast(to_char({left},'MI') as int)";
+                case "Second": return $"cast(to_char({left},'SS') as int)";
+                case "Millisecond": return $"cast(to_char({left},'FF3') as int)";
+                //case "Ticks": return $"cast(to_char({left},'FF7') as bigint)";
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlMemberAccessTimeSpan(MemberExpression exp, ExpTSC tsc)
+        {
+            if (exp.Expression == null)
+            {
+                switch (exp.Member.Name)
+                {
+                    case "Zero": return "0";
+                    case "MinValue": return "interval(0) day(9) to fraction"; //秒 Ticks / 1000,000,0
+                    case "MaxValue": return "interval(99 23:59:59.999) day(9) to fraction";
+                }
+                return null;
+            }
+            var left = ExpressionLambdaToSql(exp.Expression, tsc);
+            switch (exp.Member.Name)
+            {
+                case "Days": return $"({left})::interval day(9) to day::varchar(40)::int8";
+                case "Hours": return $"substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8";
+                case "Milliseconds": return $"substring_index(({left})::varchar(40),'.',-1)::int8";
+                case "Minutes": return $"substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8";
+                case "Seconds": return $"substr(substring_index(({left})::varchar(40),' ',-1),7,2)::int8";
+                case "Ticks": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24*60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8 *60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8 *60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),7,2)::int8 *1000 + substring_index(({left})::varchar(40),'.',-1)::int8) * 10000";
+                case "TotalDays": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8) /24.0";
+                case "TotalHours": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24*60 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8 *60 + substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8) /60.0";
+                case "TotalMilliseconds": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24*60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8 *60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8 *60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),7,2)::int8 *1000 + substring_index(({left})::varchar(40),'.',-1)::int8)";
+                case "TotalMinutes": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24*60*60 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8 *60*60 + substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8 *60 + substr(substring_index(({left})::varchar(40),' ',-1),7,2)::int8) /60.0";
+                case "TotalSeconds": return $"(({left})::interval day(9) to day::varchar(40)::int8 *24*60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),1,2)::int8 *60*60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),4,2)::int8 *60*1000 + substr(substring_index(({left})::varchar(40),' ',-1),7,2)::int8 *1000 + substring_index(({left})::varchar(40),'.',-1)::int8) /1000.0";
+            }
+            return null;
+        }
+
+        public override string ExpressionLambdaToSqlCallString(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "IsNullOrEmpty":
+                        var arg1 = getExp(exp.Arguments[0]);
+                        return $"({arg1} is null or {arg1} = '')";
+                    case "IsNullOrWhiteSpace":
+                        var arg2 = getExp(exp.Arguments[0]);
+                        return $"({arg2} is null or {arg2} = '' or trim({arg2}) = '')";
+                    case "Concat":
+                        return _common.StringConcat(exp.Arguments.Select(a => getExp(a)).ToArray(), null);
+                    case "Format":
+                        if (exp.Arguments[0].NodeType != ExpressionType.Constant) throw new Exception($"未实现函数表达式 {exp} 解析，参数 {exp.Arguments[0]} 必须为常量");
+                        var expArgsHack = exp.Arguments.Count == 2 && exp.Arguments[1].NodeType == ExpressionType.NewArrayInit ?
+                            (exp.Arguments[1] as NewArrayExpression).Expressions : exp.Arguments.Where((a, z) => z > 0);
+                        //3个 {} 时，Arguments 解析出来是分开的
+                        //4个 {} 时，Arguments[1] 只能解析这个出来，然后里面是 NewArray []
+                        var expArgs = expArgsHack.Select(a => $"'||{_common.IsNull(ExpressionLambdaToSql(a, tsc), "''")}||'").ToArray();
+                        return string.Format(ExpressionLambdaToSql(exp.Arguments[0], tsc), expArgs);
+                    case "Join":
+                        if (exp.IsStringJoin(out var tolistObjectExp, out var toListMethod, out var toListArgs1))
+                        {
+                            var newToListArgs0 = Expression.Call(tolistObjectExp, toListMethod,
+                                Expression.Lambda(
+                                    Expression.Call(
+                                        typeof(SqlExtExtensions).GetMethod("StringJoinGBaseWmConcatText"),
+                                        Expression.Convert(toListArgs1.Body, typeof(object)),
+                                        Expression.Convert(exp.Arguments[0], typeof(object))),
+                                    toListArgs1.Parameters));
+                            var newToListSql = getExp(newToListArgs0);
+                            return newToListSql;
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                switch (exp.Method.Name)
+                {
+                    case "StartsWith":
+                    case "EndsWith":
+                    case "Contains":
+                        var args0Value = getExp(exp.Arguments[0]);
+                        if (args0Value == "NULL") return $"({left}) IS NULL";
+                        if (exp.Method.Name == "StartsWith") return $"({left}) LIKE {(args0Value.EndsWith("'") ? args0Value.Insert(args0Value.Length - 1, "%") : $"({args0Value})||'%'")}";
+                        if (exp.Method.Name == "EndsWith") return $"({left}) LIKE {(args0Value.StartsWith("'") ? args0Value.Insert(1, "%") : $"'%'||({args0Value})")}";
+                        if (args0Value.StartsWith("'") && args0Value.EndsWith("'")) return $"({left}) LIKE {args0Value.Insert(1, "%").Insert(args0Value.Length, "%")}";
+                        return $"({left}) LIKE ('%'||cast({args0Value} as varchar(8000))||'%')";
+                    case "ToLower": return $"lower({left})";
+                    case "ToUpper": return $"upper({left})";
+                    case "Substring":
+                        var substrArgs1 = getExp(exp.Arguments[0]);
+                        if (long.TryParse(substrArgs1, out var testtrylng1)) substrArgs1 = (testtrylng1 + 1).ToString();
+                        else substrArgs1 += "+1";
+                        if (exp.Arguments.Count == 1) return $"substring({left} from {substrArgs1})";
+                        return $"substring({left} from {substrArgs1} for {getExp(exp.Arguments[1])})";
+                    case "IndexOf":
+                        var indexOfFindStr = getExp(exp.Arguments[0]);
+                        if (exp.Arguments.Count > 1 && exp.Arguments[1].Type.FullName == "System.Int32")
+                        {
+                            var locateArgs1 = getExp(exp.Arguments[1]);
+                            if (long.TryParse(locateArgs1, out var testtrylng2)) locateArgs1 = (testtrylng2 + 1).ToString();
+                            else locateArgs1 += "+1";
+                            return $"(instr({indexOfFindStr}, {left}, {locateArgs1})-1)";
+                        }
+                        return $"(instr({indexOfFindStr}, {left})-1)";
+                    case "PadLeft":
+                        if (exp.Arguments.Count == 1) return $"lpad({left}, {getExp(exp.Arguments[0])})";
+                        return $"lpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "PadRight":
+                        if (exp.Arguments.Count == 1) return $"rpad({left}, {getExp(exp.Arguments[0])})";
+                        return $"rpad({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "Trim":
+                    case "TrimStart":
+                    case "TrimEnd":
+                        if (exp.Arguments.Count == 0)
+                        {
+                            if (exp.Method.Name == "Trim") return $"trim({left})";
+                            if (exp.Method.Name == "TrimStart") return $"trim(leading from {left})";
+                            if (exp.Method.Name == "TrimEnd") return $"trim(trailing from {left})";
+                        }
+                        foreach (var argsTrim02 in exp.Arguments)
+                        {
+                            var argsTrim01s = new[] { argsTrim02 };
+                            if (argsTrim02.NodeType == ExpressionType.NewArrayInit)
+                            {
+                                var arritem = argsTrim02 as NewArrayExpression;
+                                argsTrim01s = arritem.Expressions.ToArray();
+                            }
+                            foreach (var argsTrim01 in argsTrim01s)
+                            {
+                                if (exp.Method.Name == "Trim") left = $"trim({getExp(argsTrim01)} from {left})";
+                                if (exp.Method.Name == "TrimStart") left = $"trim(leading {getExp(argsTrim01)} from {left})";
+                                if (exp.Method.Name == "TrimEnd") left = $"trim(trailing {getExp(argsTrim01)} from {left})";
+                            }
+                        }
+                        return left;
+                    case "Replace": return $"replace({left}, {getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    case "CompareTo": return $"case when {left} = {getExp(exp.Arguments[0])} then 0 when {left} > {getExp(exp.Arguments[0])} then 1 else -1 end";
+                    case "Equals": return $"({left} = {getExp(exp.Arguments[0])})";
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            switch (exp.Method.Name)
+            {
+                case "Abs": return $"abs({getExp(exp.Arguments[0])})";
+                case "Sign": return $"sign({getExp(exp.Arguments[0])})";
+                case "Floor": return $"floor({getExp(exp.Arguments[0])})";
+                case "Ceiling": return $"ceil({getExp(exp.Arguments[0])})";
+                case "Round":
+                    if (exp.Arguments.Count > 1 && exp.Arguments[1].Type.FullName == "System.Int32") return $"round({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                    return $"round({getExp(exp.Arguments[0])})";
+                case "Exp": return $"exp({getExp(exp.Arguments[0])})";
+                case "Log": return $"log({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                case "Log10": return $"log10({getExp(exp.Arguments[0])})";
+                case "Pow": return $"power({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                case "Sqrt": return $"sqrt({getExp(exp.Arguments[0])})";
+                case "Cos": return $"cos({getExp(exp.Arguments[0])})";
+                case "Sin": return $"sin({getExp(exp.Arguments[0])})";
+                case "Tan": return $"tan({getExp(exp.Arguments[0])})";
+                case "Acos": return $"acos({getExp(exp.Arguments[0])})";
+                case "Asin": return $"asin({getExp(exp.Arguments[0])})";
+                case "Atan": return $"atan({getExp(exp.Arguments[0])})";
+                case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
+                case "Truncate": return $"trunc({getExp(exp.Arguments[0])}, 0)";
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "Compare": return $"({getExp(exp.Arguments[0])} - ({getExp(exp.Arguments[1])}))";
+                    case "DaysInMonth": return $"cast(to_char(last_day(to_date(({getExp(exp.Arguments[0])})||'-'||({getExp(exp.Arguments[1])})||'-01','yyyy-mm-dd')),'DD') as int)";
+                    case "Equals": return $"({getExp(exp.Arguments[0])} = {getExp(exp.Arguments[1])})";
+
+                    case "IsLeapYear":
+                        var isLeapYearArgs1 = getExp(exp.Arguments[0]);
+                        return $"mod({isLeapYearArgs1},4)=0 AND mod({isLeapYearArgs1},100)<>0 OR mod({isLeapYearArgs1},400)=0";
+
+                    case "Parse": return $"to_date({getExp(exp.Arguments[0])})";
+                    case "ParseExact":
+                    case "TryParse":
+                    case "TryParseExact": return $"to_date({getExp(exp.Arguments[0])})";
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                var args1 = exp.Arguments.Count == 0 ? null : getExp(exp.Arguments[0]);
+                switch (exp.Method.Name)
+                {
+                    case "Add": return $"({left} + ({args1}))";
+                    case "AddDays": return $"({left} + ({args1}) units day)";
+                    case "AddHours": return $"({left} + ({args1}) units hour)";
+                    case "AddMilliseconds": return $"({left} + ({args1})/1000 units fraction)";
+                    case "AddMinutes": return $"({left} + ({args1}) units minute)";
+                    case "AddMonths": return $"({left} + ({args1}) units month)";
+                    case "AddSeconds": return $"({left} + ({args1}) units second)";
+                    case "AddTicks": return $"({left} + ({args1})/10000000 units fraction)";
+                    case "AddYears": return $"({left} + ({args1}) units year)";
+                    case "Subtract":
+                        switch ((exp.Arguments[0].Type.IsNullableType() ? exp.Arguments[0].Type.GetGenericArguments().FirstOrDefault() : exp.Arguments[0].Type).FullName)
+                        {
+                            case "System.DateTime": return $"({left} - {args1})";
+                            case "System.TimeSpan": return $"({left} - {args1})";
+                        }
+                        break;
+                    case "Equals": return $"({left} = {args1})";
+                    case "CompareTo": return $"({left} - {args1})";
+                    case "ToString":
+                        var defaultFmt = "'YYYY-MM-DD HH24:MI:SS'";
+                        if (left.StartsWith("'") || left.EndsWith("'"))
+                        {
+                            var precision = left.LastIndexOf('.');
+                            if (precision != -1)
+                            {
+                                precision = left.Substring(precision).Length - 2;
+                                if (precision > 0) defaultFmt = $"'YYYY-MM-DD HH24:MI:SS.FF{precision}'";
+                            }
+                            left = $"to_date({left},{defaultFmt})";
+                        }
+                        if (exp.Arguments.Count == 0) return $"to_char({left},{defaultFmt})";
+                        switch (args1)
+                        {
+                            case "'yyyy-MM-dd HH:mm:ss'": return $"to_char({left},'YYYY-MM-DD HH24:MI:SS')";
+                            case "'yyyy-MM-dd HH:mm'": return $"to_char({left},'YYYY-MM-DD HH24:MI')";
+                            case "'yyyy-MM-dd HH'": return $"to_char({left},'YYYY-MM-DD HH24')";
+                            case "'yyyy-MM-dd'": return $"to_char({left},'YYYY-MM-DD')";
+                            case "'yyyy-MM'": return $"to_char({left},'YYYY-MM')";
+                            case "'yyyyMMddHHmmss'": return $"to_char({left},'YYYYMMDDHH24MISS')";
+                            case "'yyyyMMddHHmm'": return $"to_char({left},'YYYYMMDDHH24MI')";
+                            case "'yyyyMMddHH'": return $"to_char({left},'YYYYMMDDHH24')";
+                            case "'yyyyMMdd'": return $"to_char({left},'YYYYMMDD')";
+                            case "'yyyyMM'": return $"to_char({left},'YYYYMM')";
+                            case "'yyyy'": return $"to_char({left},'YYYY')";
+                            case "'HH:mm:ss'": return $"to_char({left},'HH24:MI:SS')";
+                        }
+                        args1 = Regex.Replace(args1, "(yyyy|yy|MM|dd|HH|hh|mm|ss|tt)", m =>
+                        {
+                            switch (m.Groups[1].Value)
+                            {
+                                case "yyyy": return $"YYYY";
+                                case "yy": return $"YY";
+                                case "MM": return $"%_a1";
+                                case "dd": return $"%_a2";
+                                case "HH": return $"%_a3";
+                                case "hh": return $"%_a4";
+                                case "mm": return $"%_a5";
+                                case "ss": return $"SS";
+                                case "tt": return $"%_a6";
+                            }
+                            return m.Groups[0].Value;
+                        });
+                        var argsFinds = new[] { "YYYY", "YY", "%_a1", "%_a2", "%_a3", "%_a4", "%_a5", "SS", "%_a6" };
+                        var argsSpts = Regex.Split(args1, "(M|d|H|h|m|s|t)");
+                        for (var a = 0; a < argsSpts.Length; a++)
+                        {
+                            switch (argsSpts[a])
+                            {
+                                case "M": argsSpts[a] = $"ltrim(to_char({left},'MM'),'0')"; break;
+                                case "d": argsSpts[a] = $"case when substr(to_char({left},'DD'),1,1) = '0' then substr(to_char({left},'DD'),2,1) else to_char({left},'DD') end"; break;
+                                case "H": argsSpts[a] = $"case when substr(to_char({left},'HH24'),1,1) = '0' then substr(to_char({left},'HH24'),2,1) else to_char({left},'HH24') end"; break;
+                                case "h": argsSpts[a] = $"case when substr(to_char({left},'HH12'),1,1) = '0' then substr(to_char({left},'HH12'),2,1) else to_char({left},'HH12') end"; break;
+                                case "m": argsSpts[a] = $"case when substr(to_char({left},'MI'),1,1) = '0' then substr(to_char({left},'MI'),2,1) else to_char({left},'MI') end"; break;
+                                case "s": argsSpts[a] = $"case when substr(to_char({left},'SS'),1,1) = '0' then substr(to_char({left},'SS'),2,1) else to_char({left},'SS') end"; break;
+                                case "t": argsSpts[a] = $"rtrim(to_char({left},'AM'),'M')"; break;
+                                default:
+                                    var argsSptsA = argsSpts[a];
+                                    if (argsSptsA.StartsWith("'")) argsSptsA = argsSptsA.Substring(1);
+                                    if (argsSptsA.EndsWith("'")) argsSptsA = argsSptsA.Remove(argsSptsA.Length - 1);
+                                    argsSpts[a] = argsFinds.Any(m => argsSptsA.Contains(m)) ? $"to_char({left},'{argsSptsA}')" : $"'{argsSptsA}'";
+                                    break;
+                            }
+                        }
+                        if (argsSpts.Length > 0) args1 = $"({string.Join(" || ", argsSpts.Where(a => a != "''"))})";
+                        return args1.Replace("%_a1", "MM").Replace("%_a2", "DD").Replace("%_a3", "HH24").Replace("%_a4", "HH12").Replace("%_a5", "MI").Replace("%_a6", "AM");
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "Compare": return $"({getExp(exp.Arguments[0])} - ({getExp(exp.Arguments[1])}))";
+                    case "Equals": return $"({getExp(exp.Arguments[0])} = {getExp(exp.Arguments[1])})";
+                    case "FromDays": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])}) units day)";
+                    case "FromHours": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])}) units hour)";
+                    case "FromMilliseconds": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])})/1000 units fraction)";
+                    case "FromMinutes": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])}) units minute)";
+                    case "FromSeconds": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])}) units second)";
+                    case "FromTicks": return $"(interval(0) day(9) to fraction + ({getExp(exp.Arguments[0])})/10000000 units fraction)";
+                    case "Parse": return $"cast({getExp(exp.Arguments[0])} as interval day(9) to fraction)";
+                    case "ParseExact":
+                    case "TryParse":
+                    case "TryParseExact": return $"cast({getExp(exp.Arguments[0])} as interval day(9) to fraction)";
+                }
+            }
+            else
+            {
+                var left = getExp(exp.Object);
+                var args1 = exp.Arguments.Count == 0 ? null : getExp(exp.Arguments[0]);
+                switch (exp.Method.Name)
+                {
+                    case "Add": return $"({left} + {args1})";
+                    case "Subtract": return $"({left} - ({args1}))";
+                    case "Equals": return $"({left} = {args1})";
+                    case "CompareTo": return $"({left} - ({args1}))";
+                    case "ToString": return $"cast({left} as varchar(50))";
+                }
+            }
+            return null;
+        }
+        public override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, ExpTSC tsc)
+        {
+            Func<Expression, string> getExp = exparg => ExpressionLambdaToSql(exparg, tsc);
+            if (exp.Object == null)
+            {
+                switch (exp.Method.Name)
+                {
+                    case "ToBoolean": return $"({getExp(exp.Arguments[0])} not in ('0','false'))";
+                    case "ToByte": return $"cast({getExp(exp.Arguments[0])} as smallint)";
+                    case "ToChar": return $"substring(cast({getExp(exp.Arguments[0])} as varchar(10)) from 1 for 1)";
+                    case "ToDateTime": return $"to_date({getExp(exp.Arguments[0])})";
+                    case "ToDecimal": return $"cast({getExp(exp.Arguments[0])} as decimal(18,6))";
+                    case "ToDouble": return $"cast({getExp(exp.Arguments[0])} as decimal(18,10))";
+                    case "ToInt16": return $"cast({getExp(exp.Arguments[0])} as smallint)";
+                    case "ToInt32": return $"cast({getExp(exp.Arguments[0])} as integer)";
+                    case "ToInt64": return $"cast({getExp(exp.Arguments[0])} as bigint)";
+                    case "ToSByte": return $"cast({getExp(exp.Arguments[0])} as smallint)";
+                    case "ToSingle": return $"cast({getExp(exp.Arguments[0])} as decimal(14,7))";
+                    case "ToString": return $"cast({getExp(exp.Arguments[0])} as varchar(8000))";
+                    case "ToUInt16": return $"cast({getExp(exp.Arguments[0])} as integer)";
+                    case "ToUInt32": return $"cast({getExp(exp.Arguments[0])} as bigint)";
+                    case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as decimal(18,0))";
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/GBaseExtensions.cs b/Providers/FreeSql.Provider.GBase/GBaseExtensions.cs
new file mode 100644
index 00000000..0b91729e
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseExtensions.cs
@@ -0,0 +1,15 @@
+using FreeSql;
+using FreeSql.GBase.Curd;
+using System;
+
+public static partial class FreeSqlGBaseGlobalExtensions
+{
+    /// <summary>
+    /// 特殊处理类似 string.Format 的使用方法，防止注入，以及 IS NULL 转换
+    /// </summary>
+    /// <param name="that"></param>
+    /// <param name="args"></param>
+    /// <returns></returns>
+    public static string FormatGBase(this string that, params object[] args) => _gbaseAdo.Addslashes(that, args);
+    static FreeSql.GBase.GBaseAdo _gbaseAdo = new FreeSql.GBase.GBaseAdo();
+}
diff --git a/Providers/FreeSql.Provider.GBase/GBaseProvider.cs b/Providers/FreeSql.Provider.GBase/GBaseProvider.cs
new file mode 100644
index 00000000..e2feb933
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseProvider.cs
@@ -0,0 +1,150 @@
+using FreeSql.GBase.Curd;
+using FreeSql.Internal.CommonProvider;
+using System;
+using System.Data;
+using System.Data.Common;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace FreeSql.GBase
+{
+
+    public class GBaseProvider<TMark> : BaseDbProvider, IFreeSql<TMark>
+    {
+        public override ISelect<T1> CreateSelectProvider<T1>(object dywhere) => new GBaseSelect<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IInsert<T1> CreateInsertProvider<T1>() => new GBaseInsert<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression);
+        public override IUpdate<T1> CreateUpdateProvider<T1>(object dywhere) => new GBaseUpdate<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere) => new GBaseDelete<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
+        public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>() => new GBaseInsertOrUpdate<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression);
+
+        public GBaseProvider(string masterConnectionString, string[] slaveConnectionString, Func<DbConnection> connectionFactory = null)
+        {
+            this.InternalCommonUtils = new GBaseUtils(this);
+            this.InternalCommonExpression = new GBaseExpression(this.InternalCommonUtils);
+
+            this.Ado = new GBaseAdo(this.InternalCommonUtils, masterConnectionString, slaveConnectionString, connectionFactory);
+            this.Aop = new AopProvider();
+
+            this.DbFirst = new GBaseDbFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
+            this.CodeFirst = new GBaseCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
+
+            this.Aop.CommandBefore += (_, e) =>
+            {
+                if (e.Command.CommandType == CommandType.StoredProcedure)
+                {
+                    if (e.Command.CommandText.Trim().StartsWith("{call ", StringComparison.OrdinalIgnoreCase) == false)
+                    {
+                        var args = string.Join(", ", Enumerable.Range(0, e.Command.Parameters.Count)
+                            .Select(a => "?"));
+                        var cmdText = $"{{call {e.Command.CommandText}({args})}}";
+
+                        foreach (DbParameter parameter in e.Command.Parameters)
+                        {
+                            if (parameter.DbType == DbType.String && parameter.Size <= 0)
+                                parameter.Size = 255;
+                        }
+                        e.Command.CommandText = cmdText;
+                    }
+                }
+            };
+
+            this.Aop.AuditDataReader += (_, e) =>
+            {
+                var dbtype = e.DataReader.GetDataTypeName(e.Index);
+                switch (dbtype)
+                {
+                    case "CHAR":
+                    case "VARCHAR":
+                    case "BOOLEAN":
+                    case "SMALLINT":
+                    case "INTEGER":
+                    case "DECIMAL":
+                    case "FLOAT":
+                    case "SMALLFLOAT":
+                        return;
+                    case "BIGINT":
+                        //Unkonw SQL type -- 114.
+                        try
+                        {
+                            e.Value = e.DataReader.GetInt64(e.Index);
+                            return;
+                        }
+                        catch
+                        {
+                            e.Value = e.DataReader.GetValue(e.Index);
+                            if (e.Value == DBNull.Value) e.Value = null;
+                            return;
+                        }
+                    case "BLOB":
+                        //Unkonw SQL type -- 102.
+                        Stream stm = null;
+                        try
+                        {
+                            stm = e.DataReader.GetStream(e.Index);
+                        }
+                        catch
+                        {
+                            e.Value = e.DataReader.GetValue(e.Index);
+                            if (e.Value == DBNull.Value) e.Value = null;
+                            return;
+                        }
+
+                        using (var ms = new MemoryStream())
+                        {
+                            var stmbuf = new byte[1];
+                            while (true)
+                            {
+                                if (stm.Read(stmbuf, 0, 1) <= 0) break;
+                                ms.Write(stmbuf, 0, 1);
+                            }
+                            e.Value = ms.ToArray();
+                            ms.Close();
+                        }
+                        return;
+                }
+                if (dbtype.StartsWith("INTERVAL DAY"))
+                {
+                    //INTERVAL DAY(3) TO FRACTION(3)
+                    //异常：Unknown SQL type - 110.
+                    var tsv = "";
+                    try
+                    {
+                        tsv = e.DataReader.GetString(e.Index)?.Trim().Replace(' ', ':');
+                    }
+                    catch
+                    {
+                        e.Value = e.DataReader.GetValue(e.Index);
+                        if (e.Value == DBNull.Value) e.Value = null;
+                        return;
+                    }
+                    e.Value = TimeSpan.Parse(tsv);
+                    return;
+                }
+            };
+        }
+
+        ~GBaseProvider() => this.Dispose();
+        int _disposeCounter;
+        public override void Dispose()
+        {
+            if (Interlocked.Increment(ref _disposeCounter) != 1) return;
+            (this.Ado as AdoProvider)?.Dispose();
+        }
+    }
+}
+
+
+//--== GBase 8s Information for this install ==--
+//$GBASEDBTSERVER : gbase01
+//$GBASEDBTDIR    : /opt/gbase
+//USER HOME       : /home/gbase
+//DBSPACE DIR     : /data/gbase
+//IP ADDRESS      : 192.168.164.134 127.0.0.1 
+//PORT NUMBER     : 9088
+//$DB_LOCALE      : zh_CN.utf8
+//$CLIENT_LOCALE  : zh_CN.utf8
+//JDBC URL        : jdbc:gbasedbt-sqli://IPADDR:9088/testdb:GBASEDBTSERVER=gbase01;DB_LOCALE=zh_CN.utf8;CLIENT_LOCALE=zh_CN.utf8;IFX_LOCK_MODE_WAIT=10
+//JDBC USERNAME   : gbasedbt
+//JDBC PASSWORD   : GBase123
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.GBase/GBaseUtils.cs b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs
new file mode 100644
index 00000000..79f1e9d7
--- /dev/null
+++ b/Providers/FreeSql.Provider.GBase/GBaseUtils.cs
@@ -0,0 +1,118 @@
+using FreeSql.Internal;
+using FreeSql.Internal.Model;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Data.Odbc;
+using System.Globalization;
+
+namespace FreeSql.GBase
+{
+
+    class GBaseUtils : CommonUtils
+    {
+        public GBaseUtils(IFreeSql orm) : base(orm)
+        {
+        }
+
+        public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
+        {
+            if (string.IsNullOrEmpty(parameterName)) parameterName = "?";
+            var ret = new OdbcParameter { ParameterName = "?", Value = value };
+            var dbtype = (OdbcType?)_orm.CodeFirst.GetDbInfo(type)?.type;
+            if (col != null)
+            {
+                var dbtype2 = (OdbcType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
+                switch (dbtype2)
+                {
+                    case OdbcType.VarBinary:
+                        break;
+                    default:
+                        dbtype = dbtype2;
+                        //if (col.DbSize != 0) ret.Size = col.DbSize;
+                        if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;
+                        if (col.DbScale != 0) ret.Scale = col.DbScale;
+                        break;
+                }
+            }
+            ret.OdbcType = dbtype ?? default;
+            _params?.Add(ret);
+            return ret;
+        }
+
+        public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
+            Utils.GetDbParamtersByObject<DbParameter>("*", obj, "?", (name, type, value) =>
+            {
+                var ret = new OdbcParameter { ParameterName = $"{name}" };
+                var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
+                if (tp != null) ret.OdbcType = (OdbcType)tp.Value;
+                else
+                {
+                    ret.OdbcType = OdbcType.VarChar;
+                    ret.Size = 8000;
+                }
+                ret.Value = value;
+                return ret;
+            });
+
+        public override string FormatSql(string sql, params object[] args) => sql?.FormatGBase(args);
+        public override string QuoteSqlName(params string[] name)
+        {
+            if (name.Length == 1)
+            {
+                var nametrim = name[0].Trim();
+                if (nametrim.StartsWith("(") && nametrim.EndsWith(")"))
+                    return nametrim; //原生SQL
+                return nametrim;
+            }
+            return string.Join(":", name);
+        }
+        public override string TrimQuoteSqlName(string name)
+        {
+            var nametrim = name.Trim();
+            if (nametrim.StartsWith("(") && nametrim.EndsWith(")"))
+                return nametrim; //原生SQL
+            return nametrim;
+        }
+        public override string[] SplitTableName(string name) => name?.Split(new char[] { ':' }, 1);
+        public override string QuoteParamterName(string name) => $"?{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
+        public override string IsNull(string sql, object value) => $"nvl({sql}, {value})";
+        public override string StringConcat(string[] objs, Type[] types) => $"{string.Join(" || ", objs)}";
+        public override string Mod(string left, string right, Type leftType, Type rightType) => $"mod({left},{right})";
+        public override string Div(string left, string right, Type leftType, Type rightType) => $"trunc({left}/{right})";
+        public override string Now => "current";
+        public override string NowUtc => "current";
+
+        public override string QuoteWriteParamterAdapter(Type type, string paramterName) => paramterName;
+        protected override string QuoteReadColumnAdapter(Type type, Type mapType, string columnName) => columnName;
+
+        public override string GetNoneParamaterSqlValue(List<DbParameter> specialParams, string specialParamFlag, ColumnInfo col, Type type, object value)
+        {
+            if (value == null) return "NULL";
+            if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value);
+            if (type == typeof(byte[]))
+            {
+                var pam = AppendParamter(specialParams, "", null, type, value);
+                return pam.ParameterName;
+            }
+            if (type == typeof(TimeSpan) || type == typeof(TimeSpan?))
+            {
+                var ts = (TimeSpan)value;
+                return $"interval({ts.Days} {ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}) day(9) to fraction";
+            }
+            if (type == typeof(DateTime) || type == typeof(DateTime?))
+            {
+                if (col?.DbPrecision > 0)
+                    return string.Concat("'", ((DateTime)value).ToString($"yyyy-MM-dd HH:mm:ss.{"f".PadRight(col.DbPrecision, 'f')}"), "'");
+                return string.Concat("'", ((DateTime)value).ToString("yyyy-MM-dd HH:mm:ss"), "'");
+            }
+            if (type == typeof(string) && ((string)value)?.Length > 8000)
+            {
+                var pam = AppendParamter(specialParams, "", null, type, value);
+                ((OdbcParameter)pam).OdbcType = OdbcType.Text;
+                return pam.ParameterName;
+            }
+            return FormatSql("{0}", value, 1);
+        }
+    }
+}
diff --git a/Providers/FreeSql.Provider.GBase/key.snk b/Providers/FreeSql.Provider.GBase/key.snk
new file mode 100644
index 00000000..be114935
Binary files /dev/null and b/Providers/FreeSql.Provider.GBase/key.snk differ
diff --git a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
index 11c8e10e..3df6da95 100644
--- a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
+++ b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 人大金仓数据库 Ado.Net (Kdbndp)</Description>
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs
index 44e2b2e9..f5dec5c9 100644
--- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs
+++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs
@@ -74,6 +74,7 @@ namespace FreeSql.KingbaseES
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
index bf079acd..630d4649 100644
--- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
+++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESDbFirst.cs
@@ -29,10 +29,10 @@ namespace FreeSql.KingbaseES
         KdbndpDbType GetSqlDbType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             var ret = KdbndpDbType.Unknown;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "tinyint": ret = KdbndpDbType.Smallint; break;
                 case "int2": ret = KdbndpDbType.Smallint; break;
@@ -306,7 +306,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
@@ -349,14 +349,14 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")
                     var inkey = string.Concat(row[7]).Split(' ');
                     var attnum = int.Parse(string.Concat(row[8]));
                     attnum = int.Parse(inkey[attnum - 1]);
-                    foreach (string tc in loc3[object_id].Keys)
-                    {
-                        if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
-                        {
-                            column = tc;
-                            break;
-                        }
-                    }
+                    //foreach (string tc in loc3[object_id].Keys)
+                    //{
+                    //    if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
+                    //    {
+                    //        column = tc;
+                    //        break;
+                    //    }
+                    //}
                     if (loc3.ContainsKey(object_id) == false || loc3[object_id].ContainsKey(column) == false) continue;
                     var loc9 = loc3[object_id][column];
                     if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
index 1514da29..4acc5c81 100644
--- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
+++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
@@ -146,10 +146,10 @@ namespace FreeSql.KingbaseES
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                                //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                                tsc.SetDbParamsReturnOld(oldDbParams);
+                                //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";
diff --git a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
index db2c1d91..d27899a4 100644
--- a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
+++ b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库 Ms Access 实现</Description>
diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
index e27ac4af..0c019330 100644
--- a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
+++ b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
@@ -57,6 +57,7 @@ namespace FreeSql.MsAccess
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         private string _connectionString;
         public string ConnectionString
diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs
index d8c1c426..f84d795f 100644
--- a/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs
+++ b/Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs
@@ -92,10 +92,10 @@ namespace FreeSql.MsAccess
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
index 371e2cc5..82285d30 100644
--- a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
+++ b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net452;net451;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySql.Data（Oracle官方）</Description>
diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
index bacef5e6..68fa8b2c 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
@@ -50,7 +50,7 @@ namespace FreeSql.MySql
             else if (param is char)
                 return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\").Replace('\0', ' '), "'");
             else if (param is Enum)
-                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'"); //((Enum)val).ToInt64();
+                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\").Replace(", ", ","), "'"); //((Enum)val).ToInt64();
             else if (decimal.TryParse(string.Concat(param), out var trydec))
                 return param;
             else if (param is DateTime || param is DateTime?)
diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
index 770194fe..f9a6b7a7 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
@@ -56,6 +56,7 @@ namespace FreeSql.MySql
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs
index 2591ac38..93212a82 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs
@@ -30,8 +30,8 @@ namespace FreeSql.MySql
         public int GetDbType(DbColumnInfo column) => (int)GetMySqlDbType(column);
         MySqlDbType GetMySqlDbType(DbColumnInfo column)
         {
-            var is_unsigned = column.DbTypeTextFull.ToLower().EndsWith(" unsigned");
-            switch (column.DbTypeText.ToLower())
+            var is_unsigned = column.DbTypeTextFull?.ToLower().EndsWith(" unsigned") == true;
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit": return MySqlDbType.Bit;
 
@@ -314,7 +314,7 @@ where {(ignoreCase ? "lower(a.table_schema)" : "a.table_schema")} in ({databaseI
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
index 297cc0e2..6e27d68d 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlExpression.cs
@@ -120,10 +120,10 @@ namespace FreeSql.MySql
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
index e63437e1..ed0b68e9 100644
--- a/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
+++ b/Providers/FreeSql.Provider.MySql/MySqlUtils.cs
@@ -23,7 +23,7 @@ namespace FreeSql.MySql
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
             var ret = new MySqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
-            var dbtype = (MySqlDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (MySqlDbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             if (col != null)
             {
                 var dbtype2 = (MySqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
@@ -46,7 +46,7 @@ namespace FreeSql.MySql
                 if (value != null) ret.Value = (value as MygisGeometry).AsText();
             }
             else
-                ret.MySqlDbType = dbtype;
+                ret.MySqlDbType = dbtype ?? default;
             _params?.Add(ret);
             return ret;
         }
diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
index 6a3111cc..b4d6cc5e 100644
--- a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
+++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;net45;netstandard2.1;netcoreapp2.1;netcoreapp3.1;</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySqlConnector</Description>
diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs b/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs
index 3a43ed35..2c4f3bd7 100644
--- a/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs
+++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs
@@ -50,10 +50,11 @@ public static class FreeSqlMySqlConnectorGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
-                {
-                    writeToServer(new MySqlBulkCopy(conn.Value as MySqlConnection));
-                }
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    writeToServer(new MySqlBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as MySqlConnection, insert._orm.Ado?.TransactionCurrentThread as MySqlTransaction));
+                else
+                    using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
+                        writeToServer(new MySqlBulkCopy(conn.Value as MySqlConnection));
             }
             else if (insert.InternalTransaction != null)
             {
@@ -109,10 +110,11 @@ public static class FreeSqlMySqlConnectorGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
-                {
-                    await writeToServer(new MySqlBulkCopy(conn.Value as MySqlConnection));
-                }
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    await writeToServer(new MySqlBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as MySqlConnection, insert._orm.Ado?.TransactionCurrentThread as MySqlTransaction));
+                else
+                    using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
+                        await writeToServer(new MySqlBulkCopy(conn.Value as MySqlConnection));
             }
             else if (insert.InternalTransaction != null)
             {
diff --git a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
index 34a1abb3..a242f2d7 100644
--- a/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
+++ b/Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
@@ -20,7 +20,7 @@ namespace FreeSql.MySql
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
             var ret = new MySqlParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
-            var dbtype = (MySqlDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (MySqlDbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             if (col != null)
             {
                 var dbtype2 = (MySqlDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText, DbTypeTextFull = col.Attribute.DbType, MaxLength = col.DbSize });
@@ -44,7 +44,7 @@ namespace FreeSql.MySql
             }
             else
             {
-                ret.MySqlDbType = dbtype;
+                ret.MySqlDbType = dbtype ?? default;
                 if (ret.MySqlDbType == MySqlDbType.Enum && value != null)
                     ret.Value = EnumValueToMySql(value);
             }
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs
index 61ac9b87..76c2a573 100644
--- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs
@@ -74,6 +74,7 @@ namespace FreeSql.Odbc.Dameng
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
index 844a5b0a..f4384911 100644
--- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengDbFirst.cs
@@ -27,7 +27,7 @@ namespace FreeSql.Odbc.Dameng
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         OdbcType GetSqlDbType(DbColumnInfo column)
         {
-            var dbfull = column.DbTypeTextFull.ToLower();
+            var dbfull = column.DbTypeTextFull?.ToLower();
             switch (dbfull)
             {
                 case "number(1)": return OdbcType.Bit;
@@ -55,7 +55,7 @@ namespace FreeSql.Odbc.Dameng
 
                 case "char(36)": return OdbcType.Char;
             }
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit":
                     _dicDbToCs.TryAdd(dbfull, _dicDbToCs["number(1)"]);
@@ -157,7 +157,7 @@ namespace FreeSql.Odbc.Dameng
                     return OdbcType.Double;
                 case "rowid":
                 default:
-                    _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
+                    if (dbfull != null) _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
                     return OdbcType.NVarChar;
             }
             throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
@@ -406,7 +406,7 @@ where {(ignoreCase ? "lower(a.owner)" : "a.owner")} in ({databaseIn}) and {loc8}
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs
index 66e01850..dcefdd6b 100644
--- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Odbc.Dameng
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs
index 7ed7ba65..a1c95f01 100644
--- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs
+++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengUtils.cs
@@ -18,7 +18,7 @@ namespace FreeSql.Odbc.Dameng
         public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
-            var dbtype = (OdbcType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (OdbcType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             switch (dbtype)
             {
                 case OdbcType.Bit:
@@ -36,7 +36,7 @@ namespace FreeSql.Odbc.Dameng
                     value = string.Concat(value);
                     break;
             }
-            var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), OdbcType = dbtype, Value = value };
+            var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), OdbcType = dbtype ?? default, Value = value };
             _params?.Add(ret);
             return ret;
         }
@@ -44,7 +44,7 @@ namespace FreeSql.Odbc.Dameng
         public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
             Utils.GetDbParamtersByObject<OdbcParameter>(sql, obj, null, (name, type, value) =>
             {
-                var dbtype = (OdbcType)_orm.CodeFirst.GetDbInfo(type)?.type;
+                var dbtype = (OdbcType?)_orm.CodeFirst.GetDbInfo(type)?.type;
                 switch (dbtype)
                 {
                     case OdbcType.Bit:
@@ -62,7 +62,7 @@ namespace FreeSql.Odbc.Dameng
                         value = string.Concat(value);
                         break;
                 }
-                var ret = new OdbcParameter { ParameterName = $":{name}", OdbcType = dbtype, Value = value };
+                var ret = new OdbcParameter { ParameterName = $":{name}", OdbcType = dbtype ?? default, Value = value };
                 return ret;
             });
 
diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs
index 3379c7b0..783b2db9 100644
--- a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs
@@ -57,6 +57,7 @@ namespace FreeSql.Odbc.Default
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs
index bac703c1..98dda2a9 100644
--- a/Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Odbc.Default
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
index 9ff98b3a..bed76d50 100644
--- a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
+++ b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库 Odbc 实现，基于 {Oracle}、{SQL Server}、{MySQL ODBC 8.0 Unicode Driver}、{PostgreSQL Unicode(x64)}、{DM8 ODBC Driver} 专用访问实现，以及通用 Odbc 访问所有数据库</Description>
diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs
index a7d5f273..60010ae2 100644
--- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs
@@ -74,6 +74,7 @@ namespace FreeSql.Odbc.KingbaseES
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESDbFirst.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESDbFirst.cs
index 006d7f34..2c91e65b 100644
--- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESDbFirst.cs
@@ -29,10 +29,10 @@ namespace FreeSql.Odbc.KingbaseES
         OdbcType GetSqlDbType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             var ret = OdbcType.VarChar;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "tinyint": ret = OdbcType.TinyInt; break;
                 case "int2": ret = OdbcType.SmallInt; break;
@@ -307,7 +307,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
@@ -350,14 +350,14 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")
                     var inkey = string.Concat(row[7]).Split(' ');
                     var attnum = int.Parse(string.Concat(row[8]));
                     attnum = int.Parse(inkey[attnum - 1]);
-                    foreach (string tc in loc3[object_id].Keys)
-                    {
-                        if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
-                        {
-                            column = tc;
-                            break;
-                        }
-                    }
+                    //foreach (string tc in loc3[object_id].Keys)
+                    //{
+                    //    if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
+                    //    {
+                    //        column = tc;
+                    //        break;
+                    //    }
+                    //}
                     if (loc3.ContainsKey(object_id) == false || loc3[object_id].ContainsKey(column) == false) continue;
                     var loc9 = loc3[object_id][column];
                     if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs
index 47adfaba..12901b30 100644
--- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs
@@ -146,10 +146,10 @@ namespace FreeSql.Odbc.KingbaseES
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                                //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                                tsc.SetDbParamsReturnOld(oldDbParams);
+                                //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs
index 33c32a63..3d017af9 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs
@@ -46,7 +46,7 @@ namespace FreeSql.Odbc.MySql
             else if (param is char)
                 return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\").Replace('\0', ' '), "'");
             else if (param is Enum)
-                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\"), "'"); //((Enum)val).ToInt64();
+                return string.Concat("'", param.ToString().Replace("'", "''").Replace("\\", "\\\\").Replace(", ", ","), "'"); //((Enum)val).ToInt64();
             else if (decimal.TryParse(string.Concat(param), out var trydec))
                 return param;
             else if (param is DateTime || param is DateTime?)
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs
index 361de661..df2e22c7 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs
@@ -52,6 +52,7 @@ namespace FreeSql.Odbc.MySql
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs
index e3996d91..ff271ba2 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs
@@ -26,8 +26,8 @@ namespace FreeSql.Odbc.MySql
         public int GetDbType(DbColumnInfo column) => (int)GetOdbcType(column);
         OdbcType GetOdbcType(DbColumnInfo column)
         {
-            var is_unsigned = column.DbTypeTextFull.ToLower().EndsWith(" unsigned");
-            switch (column.DbTypeText.ToLower())
+            var is_unsigned = column.DbTypeTextFull?.ToLower().EndsWith(" unsigned") == true;
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit": return OdbcType.Bit;
 
@@ -280,7 +280,7 @@ where {(ignoreCase ? "lower(a.table_schema)" : "a.table_schema")} in ({databaseI
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
index 906bae29..e9b5e4a9 100644
--- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs
@@ -118,10 +118,10 @@ namespace FreeSql.Odbc.MySql
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
index cf65c0a4..0da4b66a 100644
--- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
@@ -74,6 +74,7 @@ namespace FreeSql.Odbc.Oracle
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleDbFirst.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleDbFirst.cs
index c77317cf..1d8f3275 100644
--- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleDbFirst.cs
@@ -27,7 +27,7 @@ namespace FreeSql.Odbc.Oracle
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         OdbcType GetSqlDbType(DbColumnInfo column)
         {
-            var dbfull = column.DbTypeTextFull.ToLower();
+            var dbfull = column.DbTypeTextFull?.ToLower();
             switch (dbfull)
             {
                 case "number(1)": return OdbcType.Bit;
@@ -55,7 +55,7 @@ namespace FreeSql.Odbc.Oracle
 
                 case "char(36 char)": return OdbcType.Char;
             }
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "number":
                     _dicDbToCs.TryAdd(dbfull, _dicDbToCs["number(10,2)"]);
@@ -110,7 +110,7 @@ namespace FreeSql.Odbc.Oracle
                     return OdbcType.Double;
                 case "rowid":
                 default:
-                    _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
+                    if (dbfull != null) _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
                     return OdbcType.NVarChar;
             }
             throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
@@ -379,7 +379,7 @@ where {(ignoreCase ? "lower(a.owner)" : "a.owner")} in ({databaseIn}) and {loc8}
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs
index 6f8ef8c1..9db90126 100644
--- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Odbc.Oracle
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs
index e8c9d76c..7ee2273d 100644
--- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs
+++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleUtils.cs
@@ -18,7 +18,7 @@ namespace FreeSql.Odbc.Oracle
         public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
-            var dbtype = (OdbcType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (OdbcType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             switch (dbtype)
             {
                 case OdbcType.Bit:
@@ -36,7 +36,7 @@ namespace FreeSql.Odbc.Oracle
                     value = string.Concat(value);
                     break;
             }
-            var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), OdbcType = dbtype, Value = value };
+            var ret = new OdbcParameter { ParameterName = QuoteParamterName(parameterName), OdbcType = dbtype ?? default, Value = value };
             _params?.Add(ret);
             return ret;
         }
@@ -44,7 +44,7 @@ namespace FreeSql.Odbc.Oracle
         public override DbParameter[] GetDbParamtersByObject(string sql, object obj) =>
             Utils.GetDbParamtersByObject<OdbcParameter>(sql, obj, null, (name, type, value) =>
             {
-                var dbtype = (OdbcType)_orm.CodeFirst.GetDbInfo(type)?.type;
+                var dbtype = (OdbcType?)_orm.CodeFirst.GetDbInfo(type)?.type;
                 switch (dbtype)
                 {
                     case OdbcType.Bit:
@@ -62,7 +62,7 @@ namespace FreeSql.Odbc.Oracle
                         value = string.Concat(value);
                         break;
                 }
-                var ret = new OdbcParameter { ParameterName = $":{name}", OdbcType = dbtype, Value = value };
+                var ret = new OdbcParameter { ParameterName = $":{name}", OdbcType = dbtype ?? default, Value = value };
                 return ret;
             });
 
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs
index 4b4b0634..a6fb1096 100644
--- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs
@@ -64,6 +64,7 @@ namespace FreeSql.Odbc.PostgreSQL
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs
index ef6fc7bf..26df9605 100644
--- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs
@@ -49,10 +49,10 @@ namespace FreeSql.Odbc.PostgreSQL
         OdbcType GetOdbcType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             OdbcType ret = OdbcType.VarChar;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "int2": ret = OdbcType.SmallInt; break;
                 case "int4": ret = OdbcType.Int; break;
@@ -322,7 +322,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
@@ -365,14 +365,14 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")
                     var inkey = string.Concat(row[7]).Split(' ');
                     var attnum = int.Parse(string.Concat(row[8]));
                     attnum = int.Parse(inkey[attnum - 1]);
-                    foreach (string tc in loc3[object_id].Keys)
-                    {
-                        if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
-                        {
-                            column = tc;
-                            break;
-                        }
-                    }
+                    //foreach (string tc in loc3[object_id].Keys)
+                    //{
+                    //    if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
+                    //    {
+                    //        column = tc;
+                    //        break;
+                    //    }
+                    //}
                     if (loc3.ContainsKey(object_id) == false || loc3[object_id].ContainsKey(column) == false) continue;
                     var loc9 = loc3[object_id][column];
                     if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
index be0a6e73..4a20a567 100644
--- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
@@ -146,10 +146,10 @@ namespace FreeSql.Odbc.PostgreSQL
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                                //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                                tsc.SetDbParamsReturnOld(oldDbParams);
+                                //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs
index a66af427..70906e5a 100644
--- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs
@@ -57,6 +57,7 @@ namespace FreeSql.Odbc.SqlServer
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs
index 7c95ad8e..e9f7a1d4 100644
--- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs
+++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs
@@ -25,7 +25,7 @@ namespace FreeSql.Odbc.SqlServer
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         OdbcType GetSqlDbType(DbColumnInfo column)
         {
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit": return OdbcType.Bit;
                 case "tinyint": return OdbcType.TinyInt;
@@ -329,7 +329,7 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs
index d930bdfc..e19d4fa5 100644
--- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs
+++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs
@@ -128,10 +128,10 @@ namespace FreeSql.Odbc.SqlServer
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
index ac62f4de..f731aba0 100644
--- a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
+++ b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Oracle 11</Description>
diff --git a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs
index 3dc769fd..3af56509 100644
--- a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs
@@ -74,6 +74,7 @@ namespace FreeSql.Oracle
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.Oracle/OracleDbFirst.cs b/Providers/FreeSql.Provider.Oracle/OracleDbFirst.cs
index e44f30f4..cec07b03 100644
--- a/Providers/FreeSql.Provider.Oracle/OracleDbFirst.cs
+++ b/Providers/FreeSql.Provider.Oracle/OracleDbFirst.cs
@@ -27,7 +27,7 @@ namespace FreeSql.Oracle
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         OracleDbType GetSqlDbType(DbColumnInfo column)
         {
-            var dbfull = column.DbTypeTextFull.ToLower();
+            var dbfull = column.DbTypeTextFull?.ToLower();
             switch (dbfull)
             {
                 case "number(1)": return OracleDbType.Boolean;
@@ -55,7 +55,7 @@ namespace FreeSql.Oracle
 
                 case "char(36 char)": return OracleDbType.Char;
             }
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "number":
                     _dicDbToCs.TryAdd(dbfull, _dicDbToCs["number(10,2)"]);
@@ -110,7 +110,7 @@ namespace FreeSql.Oracle
                     return OracleDbType.BinaryDouble;
                 case "rowid":
                 default:
-                    _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
+                    if (dbfull != null) _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
                     return OracleDbType.NVarchar2;
             }
             throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
@@ -379,7 +379,7 @@ where {(ignoreCase ? "lower(a.owner)" : "a.owner")} in ({databaseIn}) and {loc8}
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = ++position
                 });
diff --git a/Providers/FreeSql.Provider.Oracle/OracleExpression.cs b/Providers/FreeSql.Provider.Oracle/OracleExpression.cs
index fa25991c..751eb5f4 100644
--- a/Providers/FreeSql.Provider.Oracle/OracleExpression.cs
+++ b/Providers/FreeSql.Provider.Oracle/OracleExpression.cs
@@ -122,10 +122,10 @@ namespace FreeSql.Oracle
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.Oracle/OracleExtensions.cs b/Providers/FreeSql.Provider.Oracle/OracleExtensions.cs
index dff0b1c9..2a216ce4 100644
--- a/Providers/FreeSql.Provider.Oracle/OracleExtensions.cs
+++ b/Providers/FreeSql.Provider.Oracle/OracleExtensions.cs
@@ -48,15 +48,19 @@ public static partial class FreeSqlOracleGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
-                {
-                    using (var bulkCopy = copyOptions == OracleBulkCopyOptions.Default ?
-                        new OracleBulkCopy(conn.Value as OracleConnection) :
-                        new OracleBulkCopy(conn.Value as OracleConnection, copyOptions))
-                    {
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    using (var bulkCopy = new OracleBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as OracleConnection, copyOptions))
                         writeToServer(bulkCopy);
+                else
+                    using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
+                    {
+                        using (var bulkCopy = copyOptions == OracleBulkCopyOptions.Default ?
+                            new OracleBulkCopy(conn.Value as OracleConnection) :
+                            new OracleBulkCopy(conn.Value as OracleConnection, copyOptions))
+                        {
+                            writeToServer(bulkCopy);
+                        }
                     }
-                }
             }
             else if (insert.InternalTransaction != null)
             {
diff --git a/Providers/FreeSql.Provider.Oracle/OracleUtils.cs b/Providers/FreeSql.Provider.Oracle/OracleUtils.cs
index 4dc706ab..728a6740 100644
--- a/Providers/FreeSql.Provider.Oracle/OracleUtils.cs
+++ b/Providers/FreeSql.Provider.Oracle/OracleUtils.cs
@@ -18,17 +18,18 @@ namespace FreeSql.Oracle
         public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
-            var dbtype = (OracleDbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (OracleDbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             if (dbtype == OracleDbType.Boolean)
             {
                 if (value == null) value = null;
                 else value = (bool)value == true ? 1 : 0;
                 dbtype = OracleDbType.Int16;
             }
-            var ret = new OracleParameter { ParameterName = QuoteParamterName(parameterName), OracleDbType = dbtype, Value = value };
+            var ret = new OracleParameter { ParameterName = QuoteParamterName(parameterName), Value = value };
+            if (dbtype != null) ret.OracleDbType = dbtype.Value;
             if (col != null)
             {
-                var dbtype2 = (OracleDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeTextFull = col.Attribute.DbType.Replace("NOT NULL", "").Replace(" NULL", "").Trim(), DbTypeText = col.DbTypeText });
+                var dbtype2 = (OracleDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeTextFull = col.Attribute.DbType?.Replace("NOT NULL", "").Replace(" NULL", "").Trim(), DbTypeText = col.DbTypeText });
                 switch (dbtype2)
                 {
                     case OracleDbType.Char:
diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
index ad0d786d..23e0f418 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
+++ b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net461;net452;net451;net45</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 PostgreSQL 9.5</Description>
@@ -30,8 +30,8 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="Npgsql.LegacyPostgis" Version="5.0.10" />
-		<PackageReference Include="Npgsql.NetTopologySuite" Version="5.0.10" />
+		<PackageReference Include="Npgsql.LegacyPostgis" Version="5.0.11" />
+		<PackageReference Include="Npgsql.NetTopologySuite" Version="5.0.11" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
 		<PackageReference Include="Npgsql.LegacyPostgis" Version="4.1.7" />
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs
index d6d6f29f..cce2e648 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs
+++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs
@@ -64,6 +64,7 @@ namespace FreeSql.PostgreSQL
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs
index 96ebf9bb..b6ef1fba 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs
+++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs
@@ -55,10 +55,10 @@ namespace FreeSql.PostgreSQL
         NpgsqlDbType GetNpgsqlDbType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             NpgsqlDbType ret = NpgsqlDbType.Unknown;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "int2": ret = NpgsqlDbType.Smallint; break;
                 case "int4": ret = NpgsqlDbType.Integer; break;
@@ -432,7 +432,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
@@ -475,14 +475,14 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")
                     var inkey = string.Concat(row[7]).Split(' ');
                     var attnum = int.Parse(string.Concat(row[8]));
                     attnum = int.Parse(inkey[attnum - 1]);
-                    foreach (string tc in loc3[object_id].Keys)
-                    {
-                        if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
-                        {
-                            column = tc;
-                            break;
-                        }
-                    }
+                    //foreach (string tc in loc3[object_id].Keys) //bug: https://github.com/2881099/FreeSql.Wiki.VuePress/issues/9
+                    //{
+                    //    if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
+                    //    {
+                    //        column = tc;
+                    //        break;
+                    //    }
+                    //}
                     if (loc3.ContainsKey(object_id) == false || loc3[object_id].ContainsKey(column) == false) continue;
                     var loc9 = loc3[object_id][column];
                     if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
index d536881e..2cd6d007 100644
--- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
+++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
@@ -177,10 +177,10 @@ namespace FreeSql.PostgreSQL
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                                //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                                tsc.SetDbParamsReturnOld(oldDbParams);
+                                //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";
diff --git a/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj b/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
index 9dfbd3c8..864ff672 100644
--- a/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
+++ b/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 神舟通用数据库 7.0.8</Description>
@@ -34,7 +34,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="Oscar.Data.SqlClient" Version="1.0.8.2" />
+		<PackageReference Include="Oscar.Data.SqlClient" Version="4.0.5" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
 		<Reference Include="System.Data.OscarClient">
diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs
index 43c1766b..a375a4f7 100644
--- a/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs
+++ b/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs
@@ -62,6 +62,7 @@ namespace FreeSql.ShenTong
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongDbFirst.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongDbFirst.cs
index 0f9ce722..a537b8f9 100644
--- a/Providers/FreeSql.Provider.ShenTong/ShenTongDbFirst.cs
+++ b/Providers/FreeSql.Provider.ShenTong/ShenTongDbFirst.cs
@@ -30,10 +30,10 @@ namespace FreeSql.ShenTong
         OscarDbType GetOscarDbType(DbColumnInfo column)
         {
             var dbtype = column.DbTypeText;
-            var isarray = dbtype.EndsWith("[]");
+            var isarray = dbtype?.EndsWith("[]") == true;
             if (isarray) dbtype = dbtype.Remove(dbtype.Length - 2);
             OscarDbType ret = OscarDbType.Oidvector;
-            switch (dbtype.ToLower().TrimStart('_'))
+            switch (dbtype?.ToLower().TrimStart('_'))
             {
                 case "int2": ret = OscarDbType.SmallInt; break;
                 case "int4": ret = OscarDbType.Integer; break;
@@ -325,7 +325,7 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || c.relname")
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
@@ -369,14 +369,14 @@ where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")
                     var inkey = string.Concat(row[7]).Split(' ');
                     var attnum = int.Parse(string.Concat(row[8]));
                     attnum = int.Parse(inkey[attnum - 1]);
-                    foreach (string tc in loc3[object_id].Keys)
-                    {
-                        if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
-                        {
-                            column = tc;
-                            break;
-                        }
-                    }
+                    //foreach (string tc in loc3[object_id].Keys)
+                    //{
+                    //    if (loc3[object_id][tc].DbTypeText.EndsWith("[]"))
+                    //    {
+                    //        column = tc;
+                    //        break;
+                    //    }
+                    //}
                     if (loc3.ContainsKey(object_id) == false || loc3[object_id].ContainsKey(column) == false) continue;
                     var loc9 = loc3[object_id][column];
                     if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
index 81fc8592..d1bd1916 100644
--- a/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
+++ b/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
@@ -128,10 +128,10 @@ namespace FreeSql.ShenTong
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                                //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                                tsc.SetDbParamsReturnOld(oldDbParams);
+                                //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";
diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
index dac6330c..ea2824a4 100644
--- a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
+++ b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;net451;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>
@@ -29,7 +29,7 @@
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net60' or '$(TargetFramework)' == 'net50'">
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -42,5 +42,8 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
 		<DefineConstants>net40</DefineConstants>
 	</PropertyGroup>
-
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net60'">
+		<DefineConstants>net60;microsoft</DefineConstants>
+	</PropertyGroup>
+	
 </Project>
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
index 40423ef5..dd318808 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
@@ -72,6 +72,15 @@ namespace FreeSql.SqlServer
                 if (param.Equals(DateTimeOffset.MinValue) == true) param = new DateTimeOffset(new DateTime(1970, 1, 1), TimeSpan.Zero);
                 return string.Concat("'", ((DateTimeOffset)param).ToString("yyyy-MM-dd HH:mm:ss.fff zzzz"), "'");
             }
+#if net60
+            else if (param is DateOnly || param is DateOnly?)
+            {
+                if (param.Equals(DateOnly.MinValue) == true) param = new DateOnly(1970, 1, 1);
+                return string.Concat("'", ((DateOnly)param).ToString("yyyy-MM-dd"), "'");
+            }
+            else if (param is TimeOnly || param is TimeOnly?)
+                return ((TimeOnly)param).ToTimeSpan().TotalSeconds;
+#endif
             else if (param is TimeSpan || param is TimeSpan?)
                 return ((TimeSpan)param).TotalSeconds;
             else if (param is byte[])
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
index 4ab167c7..32b12918 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
@@ -61,6 +61,7 @@ namespace FreeSql.SqlServer
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
         private string _connectionString;
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs
index 08771868..9a8d6358 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerCodeFirst.cs
@@ -37,6 +37,9 @@ namespace FreeSql.SqlServer
                 { typeof(TimeSpan).FullName, CsToDb.New(SqlDbType.Time, "time","time NOT NULL", false, false, 0) },{ typeof(TimeSpan?).FullName, CsToDb.New(SqlDbType.Time, "time", "time",false, true, null) },
                 { typeof(DateTime).FullName, CsToDb.New(SqlDbType.DateTime, "datetime", "datetime NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateTime?).FullName, CsToDb.New(SqlDbType.DateTime, "datetime", "datetime", false, true, null) },
                 { typeof(DateTimeOffset).FullName, CsToDb.New(SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset NOT NULL", false, false, new DateTimeOffset(new DateTime(1970,1,1), TimeSpan.Zero)) },{ typeof(DateTimeOffset?).FullName, CsToDb.New(SqlDbType.DateTimeOffset, "datetimeoffset", "datetimeoffset", false, true, null) },
+#if net60
+                { typeof(DateOnly).FullName, CsToDb.New(SqlDbType.Date, "date", "date NOT NULL", false, false, new DateTime(1970,1,1)) },{ typeof(DateOnly?).FullName, CsToDb.New(SqlDbType.Date, "date", "date", false, true, null) },
+#endif
 
                 { typeof(byte[]).FullName, CsToDb.New(SqlDbType.VarBinary, "varbinary", "varbinary(255)", false, null, new byte[0]) },
                 { typeof(string).FullName, CsToDb.New(SqlDbType.NVarChar, "nvarchar", "nvarchar(255)", false, null, "") },
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs
index 828214f4..571dc09f 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs
@@ -24,7 +24,7 @@ namespace FreeSql.SqlServer
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         SqlDbType GetSqlDbType(DbColumnInfo column)
         {
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "bit": return SqlDbType.Bit;
                 case "tinyint": return SqlDbType.TinyInt;
@@ -332,7 +332,7 @@ from sys.parameters", loc88.ToString().Replace("a.table_name", "a.object_id"), "
                         DbTypeText = type,
                         DbTypeTextFull = sqlType,
                         Table = loc2[object_id],
-                        Coment = comment,
+                        Comment = comment,
                         DefaultValue = defaultValue,
                         Position = ++position
                     });
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs
index f38b8fe2..790d2edd 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs
@@ -127,10 +127,10 @@ namespace FreeSql.SqlServer
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs
index b96e4b42..afca4c55 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerExtensions.cs
@@ -92,15 +92,19 @@ public static partial class FreeSqlSqlServerGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
-                {
-                    using (var bulkCopy = copyOptions == SqlBulkCopyOptions.Default ?
-                        new SqlBulkCopy(conn.Value as SqlConnection) :
-                        new SqlBulkCopy(conn.Value as SqlConnection, copyOptions, null))
-                    {
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    using (var bulkCopy = new SqlBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as SqlConnection, copyOptions, insert._orm.Ado.TransactionCurrentThread as SqlTransaction))
                         writeToServer(bulkCopy);
+                else
+                    using (var conn = insert.InternalOrm.Ado.MasterPool.Get())
+                    {
+                        using (var bulkCopy = copyOptions == SqlBulkCopyOptions.Default ?
+                            new SqlBulkCopy(conn.Value as SqlConnection) :
+                            new SqlBulkCopy(conn.Value as SqlConnection, copyOptions, null))
+                        {
+                            writeToServer(bulkCopy);
+                        }
                     }
-                }
             }
             else if (insert.InternalTransaction != null)
             {
@@ -167,15 +171,19 @@ public static partial class FreeSqlSqlServerGlobalExtensions
         {
             if (insert.InternalConnection == null && insert.InternalTransaction == null)
             {
-                using (var conn = await insert.InternalOrm.Ado.MasterPool.GetAsync())
-                {
-                    using (var bulkCopy = copyOptions == SqlBulkCopyOptions.Default ?
-                        new SqlBulkCopy(conn.Value as SqlConnection) :
-                        new SqlBulkCopy(conn.Value as SqlConnection, copyOptions, null))
-                    {
+                if (insert._orm.Ado?.TransactionCurrentThread != null)
+                    using (var bulkCopy = new SqlBulkCopy(insert._orm.Ado.TransactionCurrentThread.Connection as SqlConnection, copyOptions, insert._orm.Ado.TransactionCurrentThread as SqlTransaction))
                         await writeToServerAsync(bulkCopy);
+                else
+                    using (var conn = await insert.InternalOrm.Ado.MasterPool.GetAsync())
+                    {
+                        using (var bulkCopy = copyOptions == SqlBulkCopyOptions.Default ?
+                            new SqlBulkCopy(conn.Value as SqlConnection) :
+                            new SqlBulkCopy(conn.Value as SqlConnection, copyOptions, null))
+                        {
+                            await writeToServerAsync(bulkCopy);
+                        }
                     }
-                }
             }
             else if (insert.InternalTransaction != null)
             {
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs
index 19005777..5a692876 100644
--- a/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs
+++ b/Providers/FreeSql.Provider.SqlServer/SqlServerUtils.cs
@@ -113,6 +113,13 @@ namespace FreeSql.SqlServer
                 var ts = (TimeSpan)value;
                 value = $"{ts.Hours}:{ts.Minutes}:{ts.Seconds}.{ts.Milliseconds}";
             }
+#if net60
+            if (type == typeof(TimeOnly) || type == typeof(TimeOnly?))
+            {
+                var ts = (TimeOnly)value;
+                value = $"{ts.Hour}:{ts.Minute}:{ts.Second}.{ts.Millisecond}";
+            }
+#endif
             return string.Format(CultureInfo.InvariantCulture, "{0}", (_orm.Ado as AdoProvider).AddslashesProcessParam(value, type, col));
         }
     }
diff --git a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
index 8dba7ca1..249c5673 100644
--- a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
+++ b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net60;net50;net451;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 System.Data.SqlClient + SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>
@@ -40,5 +40,8 @@
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
 		<DefineConstants>net40</DefineConstants>
 	</PropertyGroup>
-
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net60'">
+		<DefineConstants>net60</DefineConstants>
+	</PropertyGroup>
+	
 </Project>
diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
index c0ab502c..12632da8 100644
--- a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
+++ b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
-		<Version>2.6.100</Version>
+		<Version>3.2.300</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>FreeSql;ncc;YeXiangQin</Authors>
 		<Description>FreeSql 数据库实现，基于 Sqlite 3.0，支持 .NetCore、.NetFramework、Xamarin</Description>
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs
index a573432f..f3294901 100644
--- a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs
+++ b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs
@@ -5,7 +5,11 @@ using System;
 using System.Collections;
 using System.Data;
 using System.Data.Common;
+#if MicrosoftData
+using Microsoft.Data.Sqlite;
+#else
 using System.Data.SQLite;
+#endif
 using System.Text;
 using System.Threading;
 
@@ -72,7 +76,12 @@ namespace FreeSql.Sqlite
                 cmd.Connection = null;
                 return cmd;
             }
-            return new SQLiteCommand();
+#if MicrosoftData
+                return new SqliteCommand();
+#else
+                return new SQLiteCommand();
+#endif
+
         }
 
         public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
index 2ed75b19..7ed19d00 100644
--- a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
+++ b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
@@ -4,7 +4,11 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+#if MicrosoftData
+using Microsoft.Data.Sqlite;
+#else
 using System.Data.SQLite;
+#endif
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -34,7 +38,11 @@ namespace FreeSql.Sqlite
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
         {
+#if MicrosoftData
+            if (exception != null && exception is SqliteException)
+#else
             if (exception != null && exception is SQLiteException)
+#endif
             {
                 try { if (obj.Value.Ping() == false) obj.Value.OpenAndAttach(policy.Attaches); } catch { base.SetUnavailable(exception); }
             }
@@ -56,6 +64,7 @@ namespace FreeSql.Sqlite
         public bool IsThrowGetTimeoutException { get; set; } = true;
         public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
+        public int Weight { get; set; } = 1;
         public string[] Attaches = new string[0];
 
         private string _connectionString;
@@ -128,7 +137,11 @@ namespace FreeSql.Sqlite
 
         public DbConnection OnCreate()
         {
+#if MicrosoftData
+            var conn = new SqliteConnection(_connectionString);
+#else
             var conn = new SQLiteConnection(_connectionString);
+#endif
             return conn;
         }
 
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteDbFirst.cs b/Providers/FreeSql.Provider.Sqlite/SqliteDbFirst.cs
index 2faf4291..e304a213 100644
--- a/Providers/FreeSql.Provider.Sqlite/SqliteDbFirst.cs
+++ b/Providers/FreeSql.Provider.Sqlite/SqliteDbFirst.cs
@@ -26,7 +26,7 @@ namespace FreeSql.Sqlite
         public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
         DbType GetSqlDbType(DbColumnInfo column)
         {
-            var dbfull = column.DbTypeTextFull.ToLower();
+            var dbfull = column.DbTypeTextFull?.ToLower();
             switch (dbfull)
             {
                 case "boolean": return DbType.Boolean;
@@ -50,7 +50,7 @@ namespace FreeSql.Sqlite
 
                 case "character(36)": return DbType.AnsiString;
             }
-            switch (column.DbTypeText.ToLower())
+            switch (column.DbTypeText?.ToLower())
             {
                 case "int":
                     _dicDbToCs.TryAdd(dbfull, _dicDbToCs["integer"]);
@@ -99,7 +99,7 @@ namespace FreeSql.Sqlite
                     return DbType.String;
 
                 default:
-                    _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar(255)"]);
+                    if (dbfull != null) _dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar(255)"]);
                     return DbType.String;
             }
             throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
@@ -204,7 +204,7 @@ namespace FreeSql.Sqlite
                     DbTypeText = type,
                     DbTypeTextFull = sqlType,
                     Table = loc2[table_id],
-                    Coment = comment,
+                    Comment = comment,
                     DefaultValue = defaultValue,
                     Position = position
                 });
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs b/Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs
index adbe381a..7561a490 100644
--- a/Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs
+++ b/Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs
@@ -118,10 +118,10 @@ namespace FreeSql.Sqlite
                         tsc.SetMapColumnTmp(null);
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
-                        var oldDbParams = tsc.SetDbParamsReturnOld(null);
+                        //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
                         var left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
-                        tsc.SetDbParamsReturnOld(oldDbParams);
+                        //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":
@@ -366,8 +366,21 @@ namespace FreeSql.Sqlite
             {
                 case "Abs": return $"abs({getExp(exp.Arguments[0])})";
                 case "Sign": return $"sign({getExp(exp.Arguments[0])})";
+#if MicrosoftData
+                case "Floor":
+                    {
+                        var funExp = getExp(exp.Arguments[0]);
+                        return $"cast({funExp} as int) - ({funExp} < cast({funExp} as int))";
+                    };
+                case "Ceiling":
+                    {
+                        var funExp = getExp(exp.Arguments[0]);
+                        return $"cast ({funExp} as int ) + ({funExp} > cast ({funExp} as int ))";
+                    };
+#else
                 case "Floor": return $"floor({getExp(exp.Arguments[0])})";
                 case "Ceiling": return $"ceiling({getExp(exp.Arguments[0])})";
+#endif
                 case "Round":
                     if (exp.Arguments.Count > 1 && exp.Arguments[1].Type.FullName == "System.Int32") return $"round({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})";
                     return $"round({getExp(exp.Arguments[0])})";
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs b/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs
index cf01e04e..3cd4c2d9 100644
--- a/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs
+++ b/Providers/FreeSql.Provider.Sqlite/SqliteUtils.cs
@@ -4,7 +4,11 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+#if MicrosoftData
+using Microsoft.Data.Sqlite;
+#else
 using System.Data.SQLite;
+#endif
 using System.Globalization;
 
 namespace FreeSql.Sqlite
@@ -19,7 +23,7 @@ namespace FreeSql.Sqlite
         public override DbParameter AppendParamter(List<DbParameter> _params, string parameterName, ColumnInfo col, Type type, object value)
         {
             if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}";
-            var dbtype = (DbType)_orm.CodeFirst.GetDbInfo(type)?.type;
+            var dbtype = (DbType?)_orm.CodeFirst.GetDbInfo(type)?.type;
             switch (dbtype)
             {
                 case DbType.Guid:
@@ -33,9 +37,13 @@ namespace FreeSql.Sqlite
                     dbtype = DbType.Int64;
                     break;
             }
+#if MicrosoftData
+            var ret = new SqliteParameter();
+#else
             var ret = new SQLiteParameter();
+#endif
             ret.ParameterName = QuoteParamterName(parameterName);
-            ret.DbType = dbtype;
+            ret.DbType = dbtype ?? default;
             ret.Value = value;
             _params?.Add(ret);
             return ret;
@@ -62,7 +70,11 @@ namespace FreeSql.Sqlite
                             break;
                     }
                 }
+#if MicrosoftData
+                var ret = new SqliteParameter();
+#else
                 var ret = new SQLiteParameter();
+#endif
                 ret.ParameterName = $"@{name}";
                 if (dbtype != null) ret.DbType = dbtype.Value;
                 ret.Value = value;
diff --git a/Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj b/Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
new file mode 100644
index 00000000..1c875ed9
--- /dev/null
+++ b/Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+        <Version>3.2.300</Version>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Authors>FreeSql;ncc;YeXiangQin</Authors>
+        <Description>FreeSql 数据库实现，基于 Microsoft.Data.Sqlite.Core、Sqlite 3.0，支持 .netstandard2.0、.net6.0</Description>
+        <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageTags>FreeSql;ORM;sqlite</PackageTags>
+        <PackageId>$(AssemblyName)</PackageId>
+        <PackageIcon>logo.png</PackageIcon>
+        <Title>$(AssemblyName)</Title>
+        <IsPackable>true</IsPackable>
+        <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>false</DelaySign>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="../../logo.png" Pack="true" PackagePath="\" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="../FreeSql.Provider.Sqlite/**/*.cs" Exclude="../FreeSql.Provider.Sqlite/obj/**/*" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
+    </ItemGroup>
+    <PropertyGroup>
+        <DefineConstants>MicrosoftData</DefineConstants>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Providers/FreeSql.Provider.SqliteCore/key.snk b/Providers/FreeSql.Provider.SqliteCore/key.snk
new file mode 100644
index 00000000..53501ad1
Binary files /dev/null and b/Providers/FreeSql.Provider.SqliteCore/key.snk differ
diff --git a/README.md b/README.md
index 151bba49..608dbe2c 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ FreeSql is a powerful O/RM component, supports .NET Core 2.1+, .NET Framework 4.
 - 🌲 Support expression functions, and customizable analysis.
 - 🏁 Support one-to-many and many-to-many navigation properties, include and lazy loading.
 - 📃 Support Read/Write separation, Splitting Table/Database, Global filters, Optimistic and pessimistic locker.
-- 🌳 Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/南大通用/翰高/MsAccess, etc.
+- 🌳 Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/南大通用/翰高/ClickHouse/MsAccess, etc.
 
 QQ Groups：4336577(full)、8578575(full)、**52508226(available)**
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index df179657..3775865d 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -20,7 +20,7 @@ FreeSql 是一款功能强大的对象关系映射（O/RM）组件，支持 .NET
 - ✒ 支持 丰富的表达式函数，以及灵活的自定义解析；
 - 🏁 支持 导航属性一对多、多对多贪婪加载，以及延时加载；
 - 📃 支持 读写分离、分表分库、过滤器、乐观锁、悲观锁；
-- 🌳 支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/南大通用/翰高/Access 等数据库；
+- 🌳 支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/南大通用/翰高/ClickHouse/Access 等数据库；
 
 QQ群：4336577(已满)、8578575(已满)、52508226(在线)