- 修复 高版本编译器下 Pgsql 数组字段 Contains 解析问题；#2152

2881099 · 2881099 · commit e26bafdd05e3 · 2025-11-21T20:30:09.000+08:00
diff --git a/FreeSql/Extensions/LambadaExpressionExtensions.cs b/FreeSql/Extensions/LambadaExpressionExtensions.cs
@@ -248,6 +248,13 @@ public static ParameterExpression GetParameter(this Expression exp)
             return test.Result;
         }
 
+        public static bool IsReadonlySpanOp_Implicit(this Expression exp)
+        {
+            return exp.NodeType == ExpressionType.Call && 
+                exp is MethodCallExpression exp3 &&
+                exp3.Type.Name == "ReadOnlySpan`1" && exp3.Method.Name == "op_Implicit" && exp3.Arguments.Count == 1;
+        }
+
         static ConcurrentDictionary<Type, ConcurrentDictionary<string, MethodInfo>> _dicTypeMethod = new ConcurrentDictionary<Type, ConcurrentDictionary<string, MethodInfo>>();
         public static bool IsStringJoin(this MethodCallExpression exp, out Expression tolistObjectExpOut, out MethodInfo toListMethodOut, out LambdaExpression toListArgs0Out)
         {
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -1137,8 +1137,7 @@ public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)
                     }
                 case ExpressionType.Call:
                     var exp3 = exp as MethodCallExpression;
-                    if (exp3.Type.Name == "ReadOnlySpan`1" && exp3.Method.Name == "op_Implicit" && exp3.Arguments.Count == 1)
-                        return ExpressionLambdaToSql(exp3.Arguments[0], tsc);
+                    if (exp3.IsReadonlySpanOp_Implicit()) return ExpressionLambdaToSql(exp3.Arguments[0], tsc);
                     if (!tsc.isNotSetMapColumnTmp) tsc.mapType = null;
                     if (exp3.IsExpressionCall())
                     {
diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/CustomPostgreSQLExpression.cs
@@ -213,7 +213,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
                                 else args1 = $"array[{args1}]";
                                 if (objExp != null)
                                 {
-                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);
+                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(
+                                        objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :
+                                        objExp.Type);
                                     if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";
                                 }
                                 return $"({left} @> {args1})";
diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs
@@ -244,7 +244,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
                                 else args1 = $"array[{args1}]";
                                 if (objExp != null)
                                 {
-                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);
+                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(
+                                        objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :
+                                        objExp.Type);
                                     if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";
                                 }
                                 return $"({left} @> {args1})";
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs
@@ -213,7 +213,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
 								else args1 = $"array[{args1}]";
 								if (objExp != null)
                                 {
-                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);
+                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(
+                                        objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :
+                                        objExp.Type);
                                     if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";
                                 }
                                 return $"({left} @> {args1})";
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs
@@ -244,7 +244,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
 								else args1 = $"array[{args1}]";
 								if (objExp != null)
                                 {
-                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);
+                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(
+                                        objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type : 
+                                        objExp.Type);
                                     if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";
                                 }
                                 return $"({left} @> {args1})";
diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs
@@ -195,7 +195,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)
 								else args1 = $"array[{args1}]";
 								if (objExp != null)
                                 {
-                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);
+                                    var dbinfo = _common._orm.CodeFirst.GetDbInfo(
+                                        objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :
+                                        objExp.Type);
                                     if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";
                                 }
                                 return $"({left} @> {args1})";

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,13 @@ public static ParameterExpression GetParameter(this Expression exp)`
`248`	`248`	`return test.Result;`
`249`	`249`	`}`
`250`	`250`
	`251`	`+ public static bool IsReadonlySpanOp_Implicit(this Expression exp)`
	`252`	`+ {`
	`253`	`+ return exp.NodeType == ExpressionType.Call &&`
	`254`	`+ exp is MethodCallExpression exp3 &&`
	`255`	+ exp3.Type.Name == "ReadOnlySpan`1" && exp3.Method.Name == "op_Implicit" && exp3.Arguments.Count == 1;
	`256`	`+ }`
	`257`	`+`
`251`	`258`	`static ConcurrentDictionary<Type, ConcurrentDictionary<string, MethodInfo>> _dicTypeMethod = new ConcurrentDictionary<Type, ConcurrentDictionary<string, MethodInfo>>();`
`252`	`259`	`public static bool IsStringJoin(this MethodCallExpression exp, out Expression tolistObjectExpOut, out MethodInfo toListMethodOut, out LambdaExpression toListArgs0Out)`
`253`	`260`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1137,8 +1137,7 @@ public string ExpressionLambdaToSql(Expression exp, ExpTSC tsc)`
`1137`	`1137`	`}`
`1138`	`1138`	`case ExpressionType.Call:`
`1139`	`1139`	`var exp3 = exp as MethodCallExpression;`
`1140`		- if (exp3.Type.Name == "ReadOnlySpan`1" && exp3.Method.Name == "op_Implicit" && exp3.Arguments.Count == 1)
`1141`		`- return ExpressionLambdaToSql(exp3.Arguments[0], tsc);`
	`1140`	`+ if (exp3.IsReadonlySpanOp_Implicit()) return ExpressionLambdaToSql(exp3.Arguments[0], tsc);`
`1142`	`1141`	`if (!tsc.isNotSetMapColumnTmp) tsc.mapType = null;`
`1143`	`1142`	`if (exp3.IsExpressionCall())`
`1144`	`1143`	`{`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)`
`213`	`213`	`else args1 = $"array[{args1}]";`
`214`	`214`	`if (objExp != null)`
`215`	`215`	`{`
`216`		`- var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);`
	`216`	`+ var dbinfo = _common._orm.CodeFirst.GetDbInfo(`
	`217`	`+ objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :`
	`218`	`+ objExp.Type);`
`217`	`219`	`if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";`
`218`	`220`	`}`
`219`	`221`	`return $"({left} @> {args1})";`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)`
`244`	`244`	`else args1 = $"array[{args1}]";`
`245`	`245`	`if (objExp != null)`
`246`	`246`	`{`
`247`		`- var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);`
	`247`	`+ var dbinfo = _common._orm.CodeFirst.GetDbInfo(`
	`248`	`+ objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :`
	`249`	`+ objExp.Type);`
`248`	`250`	`if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";`
`249`	`251`	`}`
`250`	`252`	`return $"({left} @> {args1})";`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,9 @@ public override string ExpressionLambdaToSqlOther(Expression exp, ExpTSC tsc)`
`195`	`195`	`else args1 = $"array[{args1}]";`
`196`	`196`	`if (objExp != null)`
`197`	`197`	`{`
`198`		`- var dbinfo = _common._orm.CodeFirst.GetDbInfo(objExp.Type);`
	`198`	`+ var dbinfo = _common._orm.CodeFirst.GetDbInfo(`
	`199`	`+ objExp.IsReadonlySpanOp_Implicit() ? (objExp as MethodCallExpression).Arguments[0].Type :`
	`200`	`+ objExp.Type);`
`199`	`201`	`if (dbinfo != null) args1 = $"{args1}::{dbinfo.dbtype}";`
`200`	`202`	`}`
`201`	`203`	`return $"({left} @> {args1})";`