- 修复 IN 查询区分 varchar/nvarchar；

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -786,5 +786,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>

FreeSql/Internal/CommonExpression.cs

@@ -1753,6 +1753,7 @@ namespace FreeSql.Internal
             public Type mapType { get; set; }
             public Type mapTypeTmp { get; set; }
             public ColumnInfo mapColumnTmp { get; set; }
+            public bool isNotSetMapColumnTmp { get; set; }
             public TableInfo currentTable { get; set; }
             public List<GlobalFilter.Item> whereGlobalFilter { get; set; }
             public List<DbParameter> dbParams { get; set; }
@@ -1760,6 +1761,7 @@ namespace FreeSql.Internal
 
             public ExpTSC SetMapColumnTmp(ColumnInfo col)
             {
+                if (isNotSetMapColumnTmp) return this;
                 if (col == null)
                 {
                     this.mapTypeTmp = null;

Providers/FreeSql.Provider.ClickHouse/ClickHouseExpression.cs

@@ -121,7 +121,9 @@ namespace FreeSql.ClickHouse
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Custom/CustomExpression.cs

@@ -123,7 +123,9 @@ namespace FreeSql.Custom
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Dameng/DamengExpression.cs

@@ -123,7 +123,9 @@ namespace FreeSql.Dameng
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Firebird/FirebirdExpression.cs

@@ -110,7 +110,9 @@ namespace FreeSql.Firebird
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.GBase/GBaseExpression.cs

@@ -110,7 +110,9 @@ namespace FreeSql.GBase
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.KingbaseES/KingbaseESExpression.cs

@@ -147,7 +147,9 @@ namespace FreeSql.KingbaseES
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                                 //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                                tsc.isNotSetMapColumnTmp = true;
                                 left = objExp == null ? null : getExp(objExp);
+                                tsc.isNotSetMapColumnTmp = false;
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                                 //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array

Providers/FreeSql.Provider.MsAccess/MsAccessExpression.cs

@@ -93,7 +93,9 @@ namespace FreeSql.MsAccess
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.MySql/MySqlExpression.cs

@@ -121,7 +121,9 @@ namespace FreeSql.MySql
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengExpression.cs

@@ -123,7 +123,9 @@ namespace FreeSql.Odbc.Dameng
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

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

@@ -123,7 +123,9 @@ namespace FreeSql.Odbc.Default
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESExpression.cs

@@ -147,7 +147,9 @@ namespace FreeSql.Odbc.KingbaseES
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                                 //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                                tsc.isNotSetMapColumnTmp = true;
                                 left = objExp == null ? null : getExp(objExp);
+                                tsc.isNotSetMapColumnTmp = false;
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                                 //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array

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

@@ -119,7 +119,9 @@ namespace FreeSql.Odbc.MySql
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

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

@@ -123,7 +123,9 @@ namespace FreeSql.Odbc.Oracle
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

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

@@ -147,7 +147,9 @@ namespace FreeSql.Odbc.PostgreSQL
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                                 //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                                tsc.isNotSetMapColumnTmp = true;
                                 left = objExp == null ? null : getExp(objExp);
+                                tsc.isNotSetMapColumnTmp = false;
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                                 //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array

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

@@ -129,7 +129,9 @@ namespace FreeSql.Odbc.SqlServer
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Oracle/OracleExpression.cs

@@ -123,7 +123,9 @@ namespace FreeSql.Oracle
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExpression.cs

@@ -178,7 +178,9 @@ namespace FreeSql.PostgreSQL
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                                 //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                                tsc.isNotSetMapColumnTmp = true;
                                 left = objExp == null ? null : getExp(objExp);
+                                tsc.isNotSetMapColumnTmp = false;
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                                 //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array

Providers/FreeSql.Provider.ShenTong/ShenTongExpression.cs

@@ -129,7 +129,9 @@ namespace FreeSql.ShenTong
                                 var args1 = getExp(callExp.Arguments[argIndex]);
                                 var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                                 //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                                tsc.isNotSetMapColumnTmp = true;
                                 left = objExp == null ? null : getExp(objExp);
+                                tsc.isNotSetMapColumnTmp = false;
                                 tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                                 //tsc.SetDbParamsReturnOld(oldDbParams);
                                 //判断 in 或 array @> array

Providers/FreeSql.Provider.SqlServer/SqlServerExpression.cs

@@ -128,7 +128,9 @@ namespace FreeSql.SqlServer
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)

Providers/FreeSql.Provider.Sqlite/SqliteExpression.cs

@@ -119,7 +119,9 @@ namespace FreeSql.Sqlite
                         var args1 = getExp(callExp.Arguments[argIndex]);
                         var oldMapType = tsc.SetMapTypeReturnOld(tsc.mapTypeTmp);
                         //var oldDbParams = tsc.SetDbParamsReturnOld(null); #900 UseGenerateCommandParameterWithLambda(true) 子查询 bug
+                        tsc.isNotSetMapColumnTmp = true;
                         var left = objExp == null ? null : getExp(objExp);
+                        tsc.isNotSetMapColumnTmp = false;
                         tsc.SetMapColumnTmp(null).SetMapTypeReturnOld(oldMapType);
                         //tsc.SetDbParamsReturnOld(oldDbParams);
                         switch (callExp.Method.Name)