Skip to content

Commit 9dd85f3

Browse files
2881028810
28810
authored and
28810
committed
## v0.5.3
- 增加 ISelect.ToList(true) 自动贪婪加载 LeftJoin/InnerJoin/RightJoin 导航数据；#35 - 增加 IAdo.Query<T1, T2 ...> 多结果集查询； - 增加 IAdo.ExecuteDataSet 多结果集查询； - 优化 未设置实体属性 set 的将被自动过滤 IsIgnore；
1 parent 58e8771 commit 9dd85f3

File tree

23 files changed

+169
-94
lines changed

23 files changed

+169
-94
lines changed

‎FreeSql.Tests/FreeSql.Tests.csproj‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55

6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11+
<PackageReference Include="xunit" Version="2.4.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13+
<PackageReference Include="FreeSql.DbContext" Version="0.5.3" />
14+
</ItemGroup>
1415

15-
<ItemGroup>
16-
<ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext\FreeSql.DbContext.csproj" />
17-
<ProjectReference Include="..\FreeSql\FreeSql.csproj" />
18-
</ItemGroup>
16+
<ItemGroup>
17+
<ProjectReference Include="..\FreeSql\FreeSql.csproj" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<Folder Include="DataAnnotations\MySql\" />
22+
<Folder Include="DataAnnotations\SqlServer\" />
23+
<Folder Include="DataContext\MySql\" />
24+
</ItemGroup>
1925

20-
<ItemGroup>
21-
<Folder Include="DataAnnotations\MySql\" />
22-
<Folder Include="DataAnnotations\SqlServer\" />
23-
<Folder Include="DataContext\MySql\" />
24-
</ItemGroup>
25-
2626
</Project>

‎FreeSql.Tests/MySql/Curd/MySqlSelectTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ public void ToList() {
239239
g.mysql.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
240240
var testGuidId5 = g.mysql.Select<TestGuidIdToList>().ToList();
241241
var testGuidId6 = g.mysql.Select<TestGuidIdToList>().ToList(a => a.id);
242+
243+
var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
244+
var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
242245
}
243246
class TestGuidIdToList {
244247
public Guid id { get; set; }

‎FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public void Query() {
4040
var t5 = g.mysql.Ado.Query<dynamic>("select * from song");
4141
}
4242

43+
[Fact]
44+
public void QueryMultipline() {
45+
var t3 = g.mysql.Ado.Query<xxx, (int, string, string), dynamic>("select * from song; select * from song; select * from song");
46+
}
47+
4348
class xxx {
4449
public int Id { get; set; }
4550
public string Path { get; set; }

‎FreeSql.Tests/Oracle/Curd/OracleSelectTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ public void ToList() {
149149
g.oracle.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
150150
var testGuidId5 = g.oracle.Select<TestGuidIdToList>().ToList();
151151
var testGuidId6 = g.oracle.Select<TestGuidIdToList>().ToList(a => a.id);
152+
153+
var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
154+
var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
152155
}
153156
class TestGuidIdToList {
154157
public Guid id { get; set; }

‎FreeSql.Tests/Oracle/OracleAdo/OracleAdoTest.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ public void Query() {
4141
var t5 = g.oracle.Ado.Query<dynamic>("select * from \"TB_TOPIC\"");
4242
}
4343

44+
[Fact]
45+
public void QueryMultipline() {
46+
//var t3 = g.oracle.Ado.Query<xxx, (int, string, string), dynamic>("select * from \"TB_TOPIC\"; select * from \"TB_TOPIC\"; select * from \"TB_TOPIC\"");
47+
}
48+
4449
class xxx {
4550
public int Id { get; set; }
4651
public string Path { get; set; }

‎FreeSql.Tests/PostgreSQL/Curd/PostgreSQLSelectTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ public void ToList() {
219219
g.pgsql.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
220220
var testGuidId5 = g.pgsql.Select<TestGuidIdToList>().ToList();
221221
var testGuidId6 = g.pgsql.Select<TestGuidIdToList>().ToList(a => a.id);
222+
223+
var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
224+
var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
222225
}
223226
class TestGuidIdToList {
224227
public Guid id { get; set; }

‎FreeSql.Tests/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ public void Query() {
4242
var t5 = g.pgsql.Ado.Query<dynamic>("select * from xxx");
4343
}
4444

45+
[Fact]
46+
public void QueryMultipline() {
47+
g.pgsql.CodeFirst.SyncStructure<xxx>();
48+
var t3 = g.pgsql.Ado.Query<xxx, (int, string, string), dynamic>("select * from xxx; select * from xxx; select * from xxx");
49+
}
50+
4551
class xxx {
4652
public int Id { get; set; }
4753
public string Path { get; set; }

‎FreeSql.Tests/SqlServer/Curd/SqlServerSelectTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ public void ToList() {
151151
_sqlserverFixture.SqlServer.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
152152
var testGuidId5 = _sqlserverFixture.SqlServer.Select<TestGuidIdToList>().ToList();
153153
var testGuidId6 = _sqlserverFixture.SqlServer.Select<TestGuidIdToList>().ToList(a => a.id);
154+
155+
var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
156+
var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
154157
}
155158
class TestGuidIdToList {
156159
public Guid id { get; set; }

‎FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ public void Query() {
7474
new System.Data.SqlClient.SqlParameter("Id", 1));
7575
}
7676

77+
[Fact]
78+
public void QueryMultipline() {
79+
var tnsql1 = _sqlserverFixture.SqlServer.Select<xxx>().Where(a => a.Id > 0).Where(b => b.Title != null).Page(1, 3).ToSql(a => a.Id);
80+
81+
var t3 = _sqlserverFixture.SqlServer.Ado.Query<xxx, (int, string, string), dynamic>("select * from xxx; select * from xxx; select * from xxx");
82+
}
83+
7784
class xxx {
7885
public int Id { get; set; }
7986
public int ParentId { get; set; }

‎FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ public void ToList() {
160160
g.sqlite.Insert<TestGuidIdToList>().AppendData(new TestGuidIdToList()).ExecuteAffrows();
161161
var testGuidId5 = g.sqlite.Select<TestGuidIdToList>().ToList();
162162
var testGuidId6 = g.sqlite.Select<TestGuidIdToList>().ToList(a => a.id);
163+
164+
var t11 = select.Where(a => a.Type.Name.Length > 0).ToList(true);
165+
var t21 = select.Where(a => a.Type.Parent.Name.Length > 0).ToList(true);
163166
}
164167
class TestGuidIdToList {
165168
public Guid id { get; set; }

0 commit comments

Comments
 (0)