JsonMap

Examples/base_entity/Program.cs

@@ -579,7 +579,7 @@ static void Main(string[] args)
 
                 //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
 
-				.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
+				//.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
 				//.UseAdoConnectionPool(false)
 				//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
 				////.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
@@ -619,6 +619,9 @@ static void Main(string[] args)
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            fsql.UseJsonMap();
+
+            fsql.Select<Table11>().Where(a => a.Options.Value1 == 100 && a.Options.Value2 == "xx").ToList();
 
             var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>();
             usergroupRepository.Delete(a => true);
@@ -3311,4 +3314,16 @@ public override DateTimeOffset Deserialize(object value)
     {
         return DateTimeOffset.TryParse((string)value, out var dts) ? dts : DateTimeOffset.MinValue;
     }
+}
+class Table11
+{
+    public int Id { get; set; }
+
+    [JsonMap, Column(DbType = "json")]
+    public TableOptions Options { get; set; }
+}
+class TableOptions
+{
+    public int Value1 { get; set; }
+    public string Value2 { get; set; }
 }

Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs

@@ -93,11 +93,6 @@ public static void UseJsonMap(this IFreeSql fsql, JsonSerializerSettings setting
             case DataType.OdbcOracle:
             case DataType.CustomOracle:
             case DataType.Dameng:
-            case DataType.PostgreSQL:
-            case DataType.OdbcPostgreSQL:
-            case DataType.CustomPostgreSQL:
-            case DataType.KingbaseES:
-            case DataType.ShenTong:
                 fsql.Aop.ParseExpression += (_, e) =>
                 {
                     //if (e.Expression is MethodCallExpression callExp)
@@ -170,13 +165,7 @@ public static void UseJsonMap(this IFreeSql fsql, JsonSerializerSettings setting
                                             StyleJsonValue();
                                             return;
                                     }
-                                    while (parentMemExps.Any())
-                                    {
-                                        memExp = parentMemExps.Pop();
-                                        var opt = parentMemExps.Any() ? "->" : $"->>{(memExp.Type.IsArrayOrList() ? "/*json array*/" : "")}";
-                                        result = $"{result}{opt}'{memExp.Member.Name}'";
-                                    }
-                                    e.Result = result;
+                                    StylePgJson();
                                     return;
 
                                     void StyleJsonExtract()
@@ -197,6 +186,16 @@ void StyleJsonValue()
                                         }
                                         e.Result = $"json_value({result},'${jsonPath}')";
                                     }
+                                    void StylePgJson()
+                                    {
+                                        while (parentMemExps.Any())
+                                        {
+                                            memExp = parentMemExps.Pop();
+                                            var opt = parentMemExps.Any() ? "->" : $"->>{(memExp.Type.IsArrayOrList() ? "/*json array*/" : "")}";
+                                            result = $"{result}{opt}'{memExp.Member.Name}'";
+                                        }
+                                        e.Result = result;
+                                    }
                             }
                         }
                     }