Skip to content

Commit ec748c4

Browse files
28810992881099
committed
v3.5.209 #2045 
1 parent cf870c0 commit ec748c4

File tree

36 files changed

+73
-60
lines changed

36 files changed

+73
-60
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!--
1313
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
1414
<PropertyGroup>
15-
<Version>3.5.208</Version>
15+
<Version>3.5.209</Version>
1616
</PropertyGroup>
1717
-->
1818

‎Examples/base_entity/Program.cs

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ static void Main(string[] args)
581581

582582
.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
583583

584-
//.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
584+
.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
585585
//.UseAdoConnectionPool(false)
586586
//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
587587
////.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
@@ -622,8 +622,36 @@ static void Main(string[] args)
622622
#endregion
623623

624624

625+
fsql.Delete<BaseDistrict>().Where("1=1").ExecuteAffrows();
626+
var repoxx = fsql.GetRepository<VM_District_Child>();
627+
repoxx.DbContextOptions.EnableCascadeSave = true;
628+
repoxx.DbContextOptions.NoneParameter = true;
629+
repoxx.Insert(new VM_District_Child
630+
{
631+
Code = "100000",
632+
Name = "中国",
633+
Childs = new List<VM_District_Child>(new[] {
634+
new VM_District_Child
635+
{
636+
Code = "110000",
637+
Name = "北京",
638+
Childs = new List<VM_District_Child>(new[] {
639+
new VM_District_Child{ Code="110100", Name = "北京市" },
640+
new VM_District_Child{ Code="110101", Name = "东城区" },
641+
})
642+
}
643+
})
644+
});
645+
var ttre1 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国")
646+
.AsTreeCte(pathSelector: a => $"[{a.Name}]{a.Code}", pathSeparator: "=>")
647+
.OrderBy(a => a.Code).ToTreeList();
648+
fsql.Select<VM_District_Child>().Where(a => a.Name == "中国")
649+
.AsTreeCte(pathSelector: a => $"[{a.Name}]{a.Code}", pathSeparator: "=>")
650+
.OrderBy(a => a.Code).InsertInto("VM_District_Child_Copy", a => new VM_District_Child { Code = a.Code, Name = a.Name });
651+
625652
var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>();
626653
usergroupRepository.Delete(a => true);
654+
usergroupRepository.Orm.Delete<User1>().Where(a => true).ExecuteAffrows();
627655
usergroupRepository.Insert(new[]{
628656
new UserGroup
629657
{
@@ -649,9 +677,18 @@ static void Main(string[] args)
649677
new User1 { Nickname = "nickname21", Username = "username21", Description = "desc21" },
650678
new User1 { Nickname = "nickname22", Username = "username22", Description = "desc22" },
651679
new User1 { Nickname = "nickname23", Username = "username23", Description = "desc23" },
680+
new User1 { Nickname = "nickname24", Username = "username24", Description = "desc24" },
652681
}
653682
},
654683
});
684+
Task.Run(async () =>
685+
{
686+
await foreach (var xxs1 in fsql.Select<User1>().WithTempQuery(a => new { a.Nickname, a.Username }).ToChunkAsyncEnumerable(2))
687+
{
688+
foreach (var item in xxs1)
689+
Console.WriteLine(item.Nickname);
690+
}
691+
}).Wait();
655692
var ugroupFirst = usergroupRepository.Select.First();
656693
ugroupFirst.Sort++;
657694
usergroupRepository.Update(ugroupFirst);
@@ -955,30 +992,6 @@ static void Main(string[] args)
955992

956993

957994

958-
fsql.Delete<BaseDistrict>().Where("1=1").ExecuteAffrows();
959-
var repoxx = fsql.GetRepository<VM_District_Child>();
960-
repoxx.DbContextOptions.EnableCascadeSave = true;
961-
repoxx.DbContextOptions.NoneParameter = true;
962-
repoxx.Insert(new VM_District_Child
963-
{
964-
Code = "100000",
965-
Name = "中国",
966-
Childs = new List<VM_District_Child>(new[] {
967-
new VM_District_Child
968-
{
969-
Code = "110000",
970-
Name = "北京",
971-
Childs = new List<VM_District_Child>(new[] {
972-
new VM_District_Child{ Code="110100", Name = "北京市" },
973-
new VM_District_Child{ Code="110101", Name = "东城区" },
974-
})
975-
}
976-
})
977-
});
978-
var ttre1 = fsql.Select<VM_District_Child>().Where(a => a.Name == "中国")
979-
.AsTreeCte(pathSelector: a => $"[{a.Name}]{a.Code}", pathSeparator: "=>")
980-
.OrderBy(a => a.Code).ToTreeList(); ;
981-
982995
var list111222 = fsql.Select<OrderLine, Product>()
983996
.InnerJoin((l, p) => l.ProductId == p.ID)
984997
.GroupBy((l, p) => new { p.ID, ShopType = l.ShopType ?? 0 })

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.208</Version>
21+
<Version>3.5.209</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.5.208</Version>
22+
<Version>3.5.209</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

‎Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.208</Version>
21+
<Version>3.5.209</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.208</Version>
21+
<Version>3.5.209</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.5.208</Version>
18+
<Version>3.5.209</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.208</Version>
21+
<Version>3.5.209</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.208</Version>
21+
<Version>3.5.209</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Generator/FreeSql.Generator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
16-
<Version>3.5.208</Version>
16+
<Version>3.5.209</Version>
1717
<PackageReadmeFile>readme.md</PackageReadmeFile>
1818
</PropertyGroup>
1919

0 commit comments

Comments
 (0)