v3.2.650-preview20220526 #1116 #1115 #243

dotnetcore · May 24, 2022 · 0ea5c5d · 0ea5c5d
1 parent 3a75332
commit 0ea5c5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>3.2.650-preview20220525</Version>
+		<Version>3.2.650-preview20220526</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
@@ -34,15 +34,15 @@ public void ArrayAny()
             }.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
             Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" 
 FROM ""ArrayAny01"" a 
-WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t1);
+WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t2);
 
             var aa03 = new[] {
                 new ArrayAny02 { Name1 = "name01", Click1 = 1 },
             };
             var t3 = fsql.Select<ArrayAny01>().Where(a => aa03.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
             Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" 
 FROM ""ArrayAny01"" a 
-WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
+WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t3);
 
             var aa04 = new[] {
                 new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@@ -51,7 +51,7 @@ public void ArrayAny()
             var t4 = fsql.Select<ArrayAny01>().Where(a => aa04.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
             Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" 
 FROM ""ArrayAny01"" a 
-WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t1);
+WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t4);
 
             // List
 
@@ -61,7 +61,7 @@ public void ArrayAny()
             var t5 = fsql.Select<ArrayAny01>().Where(a => aa05.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
             Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" 
 FROM ""ArrayAny01"" a 
-WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
+WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t5);
 
             var aa06 = new List<ArrayAny02> {
                 new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@@ -70,7 +70,7 @@ public void ArrayAny()
             var t6 = fsql.Select<ArrayAny01>().Where(a => aa06.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
             Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" 
 FROM ""ArrayAny01"" a 
-WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t1);
+WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name02' = a.""Name"" AND 2 = a.""Click"" OR a.""Click"" > 10))", t6);
         }
         class ArrayAny01
         {