tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.650-preview20220526 #1116 #1115 #243

Browse Source
This commit is contained in:
2881099 2022-05-24 15:46:12 +08:00
parent 3a7533246e
commit 0ea5c5d966
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Version>3.2.650-preview20220525</Version> <Version>3.2.650-preview20220526</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -786,14 +786,5 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </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> </members>
</doc> </doc>

10
FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteExpression/OtherTest.cs
View File

@ -34,7 +34,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
}.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql(); }.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql();
Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click"" Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a 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[] { var aa03 = new[] {
new ArrayAny02 { Name1 = "name01", Click1 = 1 }, new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -42,7 +42,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name
var t3 = fsql.Select<ArrayAny01>().Where(a => aa03.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql(); 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"" Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a 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[] { var aa04 = new[] {
new ArrayAny02 { Name1 = "name01", Click1 = 1 }, new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -51,7 +51,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
var t4 = fsql.Select<ArrayAny01>().Where(a => aa04.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql(); 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"" Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a 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 // List
@ -61,7 +61,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10) OR ('name
var t5 = fsql.Select<ArrayAny01>().Where(a => aa05.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql(); 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"" Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a 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> { var aa06 = new List<ArrayAny02> {
new ArrayAny02 { Name1 = "name01", Click1 = 1 }, new ArrayAny02 { Name1 = "name01", Click1 = 1 },
@ -70,7 +70,7 @@ WHERE (('name01' = a.""Name"" AND 1 = a.""Click"" OR a.""Click"" > 10))", t1);
var t6 = fsql.Select<ArrayAny01>().Where(a => aa06.Any(b => b.Name1 == a.Name && b.Click1 == a.Click || a.Click > 10)).ToSql(); 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"" Assert.Equal(@"SELECT a.""Id"", a.""Name"", a.""Click""
FROM ""ArrayAny01"" a 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 class ArrayAny01
{ {