- 优化 GlobalFilter 过滤器表达式 bool 解析；

28810 · 28810 · commit fe7b7e50127e · 2019-12-16T12:12:55.000+08:00
diff --git a/FreeSql.Tests.VB/UnitTest1.vb b/FreeSql.Tests.VB/UnitTest1.vb
@@ -13,11 +13,14 @@ Namespace FreeSql.Tests.VB
 
             Dim List4 = g.sqlserver.Select(Of Testvb).ToList(Function(a) New With {a, a.Id, a.Title})
 
+            Dim List5 = g.sqlserver.Select(Of Testvb).Where(Function(a) a.IsDeleted).ToList()
+
         End Sub
     End Class
 End Namespace
 
 Class Testvb
     Property Id As Integer
     Property Title As String
+    Property IsDeleted As Boolean
 End Class
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorExpression/OtherTest.cs
@@ -41,6 +41,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengExpression/OtherTest.cs
@@ -39,6 +39,7 @@ public void Boolean()
             var t3 = select.Where(a => a.Bool == false).ToList();
             var t4 = select.Where(a => !a.Bool).ToList();
             var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.BoolNullable == true).ToList();
             var t22 = select.Where(a => a.BoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcExpression/OtherTest.cs
@@ -35,6 +35,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlExpression/OtherTest.cs
@@ -41,6 +41,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleExpression/OtherTest.cs
@@ -39,6 +39,7 @@ public void Boolean()
             var t3 = select.Where(a => a.Bool == false).ToList();
             var t4 = select.Where(a => !a.Bool).ToList();
             var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.BoolNullable == true).ToList();
             var t22 = select.Where(a => a.BoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLExpression/OtherTest.cs
@@ -44,6 +44,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerExpression/OtherTest.cs
@@ -36,6 +36,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlExpression/OtherTest.cs
@@ -41,6 +41,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleExpression/OtherTest.cs
@@ -39,6 +39,7 @@ public void Boolean()
             var t3 = select.Where(a => a.Bool == false).ToList();
             var t4 = select.Where(a => !a.Bool).ToList();
             var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).ToList();
 
             var t11 = select.Where(a => a.BoolNullable == true).ToList();
             var t22 = select.Where(a => a.BoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs
@@ -48,6 +48,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).Limit(10).ToList();
             var t4 = select.Where(a => !a.testFieldBool).Limit(10).ToList();
             var t5 = select.Where(a => a.testFieldBool).Limit(10).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).Limit(10).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).Limit(10).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerExpression/OtherTest.cs
@@ -44,6 +44,7 @@ public void Boolean()
             var t3 = select.Where(a => a.testFieldBool == false).ToList();
             var t4 = select.Where(a => !a.testFieldBool).ToList();
             var t5 = select.Where(a => a.testFieldBool).ToList();
+            var t51 = select.WhereCascade(a => a.testFieldBool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.testFieldBoolNullable == true).ToList();
             var t22 = select.Where(a => a.testFieldBoolNullable != true).ToList();
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
@@ -39,6 +39,7 @@ public void Boolean()
             var t3 = select.Where(a => a.Bool == false).ToList();
             var t4 = select.Where(a => !a.Bool).ToList();
             var t5 = select.Where(a => a.Bool).ToList();
+            var t51 = select.WhereCascade(a => a.Bool).Limit(10).ToList();
 
             var t11 = select.Where(a => a.BoolNullable == true).ToList();
             var t22 = select.Where(a => a.BoolNullable != true).ToList();
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -342,37 +342,24 @@ public string[] ExpressionSelectColumns_MemberAccess_New_NewArrayInit(List<Selec
             { ExpressionType.Modulo, "%" },
             { ExpressionType.Equal, "=" },
         };
+
         public string ExpressionWhereLambdaNoneForeignObject(List<SelectTableInfo> _tables, TableInfo table, List<SelectColumnInfo> _selectColumnMap, Expression exp, Func<Expression[], string> getSelectGroupingMapString, List<DbParameter> dbParams)
         {
             var sql = ExpressionLambdaToSql(exp, new ExpTSC { _tables = _tables, _selectColumnMap = _selectColumnMap, getSelectGroupingMapString = getSelectGroupingMapString, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = false, style = ExpressionStyle.Where, currentTable = table, dbParams = dbParams });
-            var isBool = exp.Type.NullableTypeOrThis() == typeof(bool);
-            if (exp.NodeType == ExpressionType.MemberAccess && isBool && sql.Contains(" IS ") == false && sql.Contains(" = ") == false)
-                return $"{sql} = {formatSql(true, null, null, null)}";
-            if (isBool)
-                return GetBoolString(sql);
-            return sql;
+            return GetBoolString(exp, sql);
         }
 
         public string ExpressionWhereLambda(List<SelectTableInfo> _tables, Expression exp, Func<Expression[], string> getSelectGroupingMapString, List<LambdaExpression> whereCascadeExpression, List<DbParameter> dbParams)
         {
             var sql = ExpressionLambdaToSql(exp, new ExpTSC { _tables = _tables, getSelectGroupingMapString = getSelectGroupingMapString, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = false, style = ExpressionStyle.Where, whereCascadeExpression = whereCascadeExpression, dbParams = dbParams });
-            var isBool = exp.Type.NullableTypeOrThis() == typeof(bool);
-            if (exp.NodeType == ExpressionType.MemberAccess && isBool && sql.Contains(" IS ") == false && sql.Contains(" = ") == false)
-                return $"{sql} = {formatSql(true, null, null, null)}";
-            if (isBool)
-                return GetBoolString(sql);
-            return sql;
+            return GetBoolString(exp, sql);
         }
         static ConcurrentDictionary<string, Regex> dicRegexAlias = new ConcurrentDictionary<string, Regex>();
         public void ExpressionJoinLambda(List<SelectTableInfo> _tables, SelectTableInfoType tbtype, Expression exp, Func<Expression[], string> getSelectGroupingMapString, List<LambdaExpression> whereCascadeExpression)
         {
             var tbidx = _tables.Count;
             var sql = ExpressionLambdaToSql(exp, new ExpTSC { _tables = _tables, getSelectGroupingMapString = getSelectGroupingMapString, tbtype = tbtype, isQuoteName = true, isDisableDiyParse = false, style = ExpressionStyle.Where, whereCascadeExpression = whereCascadeExpression });
-            var isBool = exp.Type.NullableTypeOrThis() == typeof(bool);
-            if (exp.NodeType == ExpressionType.MemberAccess && isBool && sql.Contains(" IS ") == false && sql.Contains(" = ") == false)
-                sql = $"{sql} = {formatSql(true, null, null, null)}";
-            if (isBool)
-                sql = GetBoolString(sql);
+            sql = GetBoolString(exp, sql);
 
             if (_tables.Count > tbidx)
             {
@@ -404,6 +391,15 @@ public void ExpressionJoinLambda(List<SelectTableInfo> _tables, SelectTableInfoT
         static MethodInfo MethodDateTimeSubtractTimeSpan = typeof(DateTime).GetMethod("Subtract", new Type[] { typeof(TimeSpan) });
         static MethodInfo MethodMathFloor = typeof(Math).GetMethod("Floor", new Type[] { typeof(double) });
 
+        public string GetBoolString(Expression exp, string sql)
+        {
+            var isBool = exp.Type.NullableTypeOrThis() == typeof(bool);
+            if (exp.NodeType == ExpressionType.MemberAccess && isBool && sql.Contains(" IS ") == false && sql.Contains(" = ") == false)
+                return $"{sql} = {formatSql(true, null, null, null)}";
+            if (isBool)
+                return GetBoolString(sql);
+            return sql;
+        }
         static string GetBoolString(string sql)
         {
             switch (sql)
@@ -1340,7 +1336,8 @@ public string GetWhereCascadeSql(SelectTableInfo tb, List<LambdaExpression> _whe
                             new ReplaceVisitor().Modify(fl.Body, newParameter),
                             newParameter
                         );
-                        var whereSql = ExpressionLambdaToSql(expExp, new ExpTSC { _tables = null, _selectColumnMap = null, getSelectGroupingMapString = null, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = false, style = ExpressionStyle.Where, currentTable = tb.Table, alias001 = tb.Alias });
+                        var whereSql = ExpressionLambdaToSql(expExp.Body, new ExpTSC { _tables = null, _selectColumnMap = null, getSelectGroupingMapString = null, tbtype = SelectTableInfoType.From, isQuoteName = true, isDisableDiyParse = false, style = ExpressionStyle.Where, currentTable = tb.Table, alias001 = tb.Alias });
+                        whereSql = GetBoolString(expExp.Body, whereSql);
                         if (isEmpty == false)
                             sb.Append(" AND ");
                         else
