v3.2.687 (下架 v3.2.686) #1382 #1390 #1389 #1393 #1383 #1386 #1385 #1393 #1403

2881099 · 2881099 · commit f68f7d827719 · 2023-01-24T11:15:00.000+08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 	-->
 	
diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs
@@ -398,6 +398,27 @@ private static IFreeSql CreateInstance(string connectString, DataType type)
             return client;
         }
 
+        class TJson01
+        {
+            public Guid id { get; set; }
+            [JsonMap]
+            public DJson02 Json02 { get; set; }
+            [JsonMap]
+            public DJson02 Json03 { get; set; }
+        }
+        class TJson02
+        {
+            public Guid id { get; set; }
+            [JsonMap]
+            public DJson02 Json02 { get; set; }
+        }
+        public class DJson02
+        {
+            public string code { get; set; }
+            public string parentcode { get; set; }
+            public string name { get; set; }
+        }
+
         static void Main(string[] args)
         {
             var pams = new Dictionary<string, string>();
@@ -452,7 +473,7 @@ static void Main(string[] args)
 
 
                 .UseConnectionString(FreeSql.DataType.Firebird, @"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5")
-                .UseQuoteSqlName(false)
+                //.UseQuoteSqlName(false)
 
                 //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=2")
 
@@ -483,13 +504,30 @@ static void Main(string[] args)
                 .UseMonitorCommand(cmd =>
                 {
                     Console.WriteLine(cmd.CommandText + "\r\n");
-                    cmd.CommandText = null; //不执行
+                    //cmd.CommandText = null; //不执行
                 })
                 .UseLazyLoading(true)
                 //.UseGenerateCommandParameterWithLambda(true)
                 .Build();
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
+            fsql.UseJsonMap();
+
+            fsql.Delete<TJson01>().Where(a => true).ExecuteAffrows();
+            fsql.Insert(new TJson01
+            {
+                Json02 = new DJson02 { code = "002", name = "name002", parentcode = "002_parent" },
+                Json03 = new DJson02 { code = "003", name = "name003", parentcode = "003_parent" },
+            }).NoneParameter(false).ExecuteAffrows();
+            var tjson01 = fsql.Select<TJson01>().First();
+
+            fsql.Delete<TJson02>().Where(a => true).ExecuteAffrows();
+            fsql.Insert(new TJson02
+            {
+                Json02 = new DJson02 { code = "0022", name = "name0022", parentcode = "0022_parent" },
+            }).NoneParameter(false).ExecuteAffrows();
+            var tjson02 = fsql.Select<TJson02>().First();
+
 
             var sqlv01 = fsql.Select<BaseDataEntity>().AsType(typeof(GoodsData))
                 .ToSql(v => new GoodsDataDTO()
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs b/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs
@@ -53,7 +53,8 @@ public static void UseJsonMap(this IFreeSql that, JsonSerializerSettings setting
             var isJsonMap = e.Property.GetCustomAttributes(typeof(JsonMapAttribute), false).Any() || _dicJsonMapFluentApi.TryGetValue(e.EntityType, out var tryjmfu) && tryjmfu.ContainsKey(e.Property.Name);
             if (isJsonMap)
             {
-                if (FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))
+                if (_dicTypes.ContainsKey(e.Property.PropertyType) == false &&
+                    FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))
                     return; //基础类型使用 JsonMap 无效
 
                 e.ModifyResult.MapType = typeof(string);
diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/FreeSql.All/FreeSql.All.csproj b/FreeSql.All/FreeSql.All.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs
@@ -166,6 +166,10 @@ public void Jsonb()
             var sql18 = select.Where(a => a.testFieldJArray.Count > 0).Limit(10).ToList();
 
             var sql19 = select.First(a => a.testFieldJToken["a"]);
+            var sql20 = select.Where(a => a.testFieldJToken["a"].ToString().Equals("1")).ToList();
+            var sql21 = select.Where(a => a.testFieldJToken["a"].ToString() == "1").ToList();
+            var sql23 = select.Where(a => int.Parse(a.testFieldJToken["a"].ToString()) > 0).ToList();
+
         }
 
         [Fact]
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj b/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
@@ -19,7 +19,7 @@
 		<SignAssembly>False</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj b/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Firebird/Curd/FirebirdInsert.cs b/Providers/FreeSql.Provider.Firebird/Curd/FirebirdInsert.cs
@@ -21,12 +21,12 @@ public FirebirdInsert(IFreeSql orm, CommonUtils commonUtils, CommonExpression co
 
         public override int ExecuteAffrows()
         {
-            base.NoneParameter(_source?.Count > 1);
+            if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
             return base.SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
         }
         public override long ExecuteIdentity()
         {
-            base.NoneParameter(_source?.Count > 1);
+            if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
             return base.SplitExecuteIdentity(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
         }
         public override List<T1> ExecuteInserted() => base.SplitExecuteInserted(1, 999);
@@ -126,12 +126,12 @@ protected override List<T1> RawExecuteInserted()
 #else
         public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
         {
-            base.NoneParameter(_source?.Count > 1);
+            if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
             return base.SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
         }
         public override Task<long> ExecuteIdentityAsync(CancellationToken cancellationToken = default)
         {
-            base.NoneParameter(_source?.Count > 1);
+            if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
             return 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);
diff --git a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj b/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj b/Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj b/Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj b/Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
@@ -18,7 +18,7 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
-		<Version>3.2.687-preview20230119</Version>
+		<Version>3.2.687</Version>
     </PropertyGroup>
 
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ public static void UseJsonMap(this IFreeSql that, JsonSerializerSettings setting`
`53`	`53`	`var isJsonMap = e.Property.GetCustomAttributes(typeof(JsonMapAttribute), false).Any() \|\| _dicJsonMapFluentApi.TryGetValue(e.EntityType, out var tryjmfu) && tryjmfu.ContainsKey(e.Property.Name);`
`54`	`54`	`if (isJsonMap)`
`55`	`55`	`{`
`56`		`- if (FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))`
	`56`	`+ if (_dicTypes.ContainsKey(e.Property.PropertyType) == false &&`
	`57`	`+ FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))`
`57`	`58`	`return; //基础类型使用 JsonMap 无效`
`58`	`59`
`59`	`60`	`e.ModifyResult.MapType = typeof(string);`