- 禁止 Contains 表达式元素参数化

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -110,13 +110,6 @@
             清空状态数据
             </summary>
         </member>
-        <member name="M:FreeSql.DbSet`1.RemoveAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
-            <summary>
-            根据 lambda 条件删除数据
-            </summary>
-            <param name="predicate"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSql.DbSet`1.Add(`0)">
             <summary>
             添加

FreeSql.Tests/FreeSql.Tests/UnitTest2.cs

@@ -348,6 +348,11 @@ namespace FreeSql.Tests
 
             g.sqlserver.Select<TestMySqlStringIsNullable>().Where(a => a.varchar == name).ToList();
             g.sqlserver.Select<TestMySqlStringIsNullable>().Where(a => a.varchar == name.SetDbParameter(10)).ToList();
+
+            var testarr = new string[] { "1", "2" };
+            var sdfsdgselect3 = g.sqlserver.Select<TestMySqlStringIsNullable>().Where(a => testarr.Contains(a.varchar));
+            g.sqlserver.Select<TestMySqlStringIsNullable>().Where(a => testarr.Contains(a.varchar)).ToList();
+
         }
     }
 

FreeSql/Internal/CommonExpression.cs

@@ -1225,6 +1225,12 @@ namespace FreeSql.Internal
                 this.mapType = newValue;
                 return old;
             }
+            public List<DbParameter> SetDbParamsReturnOld(List<DbParameter> newValue)
+            {
+                var old = this.dbParams;
+                this.dbParams = newValue;
+                return old;
+            }
 
             public ExpTSC CloneSetgetSelectGroupingMapStringAndgetSelectGroupingMapStringAndtbtype(List<SelectColumnInfo> v1, Func<Expression[], string> v2, SelectTableInfoType v3)
             {

Providers/FreeSql.Provider.MySql/MySqlExpression.cs

@@ -104,8 +104,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Odbc/Default/OdbcExpression.cs

@@ -111,8 +111,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlExpression.cs

@@ -104,8 +104,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleExpression.cs

@@ -104,8 +104,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLExpression.cs

@@ -133,8 +133,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);
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                                tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";

Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerExpression.cs

@@ -108,8 +108,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Oracle/OracleExpression.cs

@@ -104,8 +104,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs

@@ -163,8 +163,10 @@ namespace FreeSql.PostgreSQL
                                 tsc.SetMapColumnTmp(null);
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
+                                var oldDbParams = tsc.SetDbParamsReturnOld(null);
                                 left = objExp == null ? null : getExp(objExp);
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                                tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array
                                 if (left.StartsWith("array[") || left.EndsWith("]"))
                                     return $"({args1}) in ({left.Substring(6, left.Length - 7)})";

Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs

@@ -108,8 +108,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":

Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs

@@ -104,8 +104,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 left = objExp == null ? null : getExp(objExp);
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
+                        tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)
                         {
                             case "Contains":