- 修复 Where(a => bool && id > 0) bool 未解析正确的 bug;

> (之前大多数类似的表达都能解析,这次是一个特殊情况)
This commit is contained in:
28810
2019-11-17 21:01:49 +08:00
parent 1cb8bb92f0
commit 769c1f020c
12 changed files with 256 additions and 21 deletions

View File

@ -47,6 +47,30 @@ namespace FreeSql.Tests.Odbc.MySqlExpression
var t33 = select.Where(a => a.testFieldBoolNullable == false).ToList();
var t44 = select.Where(a => !a.testFieldBoolNullable.Value).ToList();
var t55 = select.Where(a => a.testFieldBoolNullable.Value).ToList();
var t111 = select.Where(a => a.testFieldBool == true && a.Id > 0).ToList();
var t222 = select.Where(a => a.testFieldBool != true && a.Id > 0).ToList();
var t333 = select.Where(a => a.testFieldBool == false && a.Id > 0).ToList();
var t444 = select.Where(a => !a.testFieldBool && a.Id > 0).ToList();
var t555 = select.Where(a => a.testFieldBool && a.Id > 0).ToList();
var t1111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0).ToList();
var t2222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0).ToList();
var t3333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0).ToList();
var t4444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t5555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t11111 = select.Where(a => a.testFieldBool == true && a.Id > 0 && a.testFieldBool == true).ToList();
var t22222 = select.Where(a => a.testFieldBool != true && a.Id > 0 && a.testFieldBool != true).ToList();
var t33333 = select.Where(a => a.testFieldBool == false && a.Id > 0 && a.testFieldBool == false).ToList();
var t44444 = select.Where(a => !a.testFieldBool && a.Id > 0 && !a.testFieldBool).ToList();
var t55555 = select.Where(a => a.testFieldBool && a.Id > 0 && a.testFieldBool).ToList();
var t111111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0 && a.testFieldBoolNullable == true).ToList();
var t222222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0 && a.testFieldBoolNullable != true).ToList();
var t333333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0 && a.testFieldBoolNullable == false).ToList();
var t444444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0 && !a.testFieldBoolNullable.Value).ToList();
var t555555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0 && a.testFieldBoolNullable.Value).ToList();
}
[Fact]

View File

@ -45,6 +45,30 @@ namespace FreeSql.Tests.Odbc.OracleExpression
var t33 = select.Where(a => a.BoolNullable == false).ToList();
var t44 = select.Where(a => !a.BoolNullable.Value).ToList();
var t55 = select.Where(a => a.BoolNullable.Value).ToList();
var t111 = select.Where(a => a.Bool == true && a.Id > 0).ToList();
var t222 = select.Where(a => a.Bool != true && a.Id > 0).ToList();
var t333 = select.Where(a => a.Bool == false && a.Id > 0).ToList();
var t444 = select.Where(a => !a.Bool && a.Id > 0).ToList();
var t555 = select.Where(a => a.Bool && a.Id > 0).ToList();
var t1111 = select.Where(a => a.BoolNullable == true && a.Id > 0).ToList();
var t2222 = select.Where(a => a.BoolNullable != true && a.Id > 0).ToList();
var t3333 = select.Where(a => a.BoolNullable == false && a.Id > 0).ToList();
var t4444 = select.Where(a => !a.BoolNullable.Value && a.Id > 0).ToList();
var t5555 = select.Where(a => a.BoolNullable.Value && a.Id > 0).ToList();
var t11111 = select.Where(a => a.Bool == true && a.Id > 0 && a.Bool == true).ToList();
var t22222 = select.Where(a => a.Bool != true && a.Id > 0 && a.Bool != true).ToList();
var t33333 = select.Where(a => a.Bool == false && a.Id > 0 && a.Bool == false).ToList();
var t44444 = select.Where(a => !a.Bool && a.Id > 0 && !a.Bool).ToList();
var t55555 = select.Where(a => a.Bool && a.Id > 0 && a.Bool).ToList();
var t111111 = select.Where(a => a.BoolNullable == true && a.Id > 0 && a.BoolNullable == true).ToList();
var t222222 = select.Where(a => a.BoolNullable != true && a.Id > 0 && a.BoolNullable != true).ToList();
var t333333 = select.Where(a => a.BoolNullable == false && a.Id > 0 && a.BoolNullable == false).ToList();
var t444444 = select.Where(a => !a.BoolNullable.Value && a.Id > 0 && !a.BoolNullable.Value).ToList();
var t555555 = select.Where(a => a.BoolNullable.Value && a.Id > 0 && a.BoolNullable.Value).ToList();
}
[Fact]

View File

@ -50,6 +50,30 @@ namespace FreeSql.Tests.Odbc.PostgreSQLExpression
var t33 = select.Where(a => a.testFieldBoolNullable == false).ToList();
var t44 = select.Where(a => !a.testFieldBoolNullable.Value).ToList();
var t55 = select.Where(a => a.testFieldBoolNullable.Value).ToList();
var t111 = select.Where(a => a.testFieldBool == true && a.Id > 0).ToList();
var t222 = select.Where(a => a.testFieldBool != true && a.Id > 0).ToList();
var t333 = select.Where(a => a.testFieldBool == false && a.Id > 0).ToList();
var t444 = select.Where(a => !a.testFieldBool && a.Id > 0).ToList();
var t555 = select.Where(a => a.testFieldBool && a.Id > 0).ToList();
var t1111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0).ToList();
var t2222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0).ToList();
var t3333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0).ToList();
var t4444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t5555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t11111 = select.Where(a => a.testFieldBool == true && a.Id > 0 && a.testFieldBool == true).ToList();
var t22222 = select.Where(a => a.testFieldBool != true && a.Id > 0 && a.testFieldBool != true).ToList();
var t33333 = select.Where(a => a.testFieldBool == false && a.Id > 0 && a.testFieldBool == false).ToList();
var t44444 = select.Where(a => !a.testFieldBool && a.Id > 0 && !a.testFieldBool).ToList();
var t55555 = select.Where(a => a.testFieldBool && a.Id > 0 && a.testFieldBool).ToList();
var t111111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0 && a.testFieldBoolNullable == true).ToList();
var t222222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0 && a.testFieldBoolNullable != true).ToList();
var t333333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0 && a.testFieldBoolNullable == false).ToList();
var t444444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0 && !a.testFieldBoolNullable.Value).ToList();
var t555555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0 && a.testFieldBoolNullable.Value).ToList();
}
[Fact]

View File

@ -42,6 +42,30 @@ namespace FreeSql.Tests.Odbc.SqlServerExpression
var t33 = select.Where(a => a.testFieldBoolNullable == false).ToList();
var t44 = select.Where(a => !a.testFieldBoolNullable.Value).ToList();
var t55 = select.Where(a => a.testFieldBoolNullable.Value).ToList();
var t111 = select.Where(a => a.testFieldBool == true && a.Id > 0).ToList();
var t222 = select.Where(a => a.testFieldBool != true && a.Id > 0).ToList();
var t333 = select.Where(a => a.testFieldBool == false && a.Id > 0).ToList();
var t444 = select.Where(a => !a.testFieldBool && a.Id > 0).ToList();
var t555 = select.Where(a => a.testFieldBool && a.Id > 0).ToList();
var t1111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0).ToList();
var t2222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0).ToList();
var t3333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0).ToList();
var t4444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t5555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0).ToList();
var t11111 = select.Where(a => a.testFieldBool == true && a.Id > 0 && a.testFieldBool == true).ToList();
var t22222 = select.Where(a => a.testFieldBool != true && a.Id > 0 && a.testFieldBool != true).ToList();
var t33333 = select.Where(a => a.testFieldBool == false && a.Id > 0 && a.testFieldBool == false).ToList();
var t44444 = select.Where(a => !a.testFieldBool && a.Id > 0 && !a.testFieldBool).ToList();
var t55555 = select.Where(a => a.testFieldBool && a.Id > 0 && a.testFieldBool).ToList();
var t111111 = select.Where(a => a.testFieldBoolNullable == true && a.Id > 0 && a.testFieldBoolNullable == true).ToList();
var t222222 = select.Where(a => a.testFieldBoolNullable != true && a.Id > 0 && a.testFieldBoolNullable != true).ToList();
var t333333 = select.Where(a => a.testFieldBoolNullable == false && a.Id > 0 && a.testFieldBoolNullable == false).ToList();
var t444444 = select.Where(a => !a.testFieldBoolNullable.Value && a.Id > 0 && !a.testFieldBoolNullable.Value).ToList();
var t555555 = select.Where(a => a.testFieldBoolNullable.Value && a.Id > 0 && a.testFieldBoolNullable.Value).ToList();
}
[Fact]