weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-09 09:50:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 ZeroDbContext IncludeAll 死循环 bug；

Browse Source
This commit is contained in:
2881099
2025-04-26 21:48:22 +08:00
parent c61e3f789d
commit 3907c5f87e
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Examples/zero_entity/Program.cs
View File

@@ -10,7 +10,8 @@ using System.Text.Json;
using (var fsql = new FreeSqlBuilder() using (var fsql = new FreeSqlBuilder()
.UseConnectionString(DataType.Sqlite, "data source=111.db") .UseConnectionString(DataType.Sqlite, "data source=111.db")
.UseAutoSyncStructure(true) .UseConnectionString(DataType.MySql, "Server=47.108.219.26;Port=3306;Database=sample;Uid=root;Pwd=xdhl123Qwe;")
.UseAutoSyncStructure(true)
.UseNoneCommandParameter(true) .UseNoneCommandParameter(true)
.UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n")) .UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n"))
.Build()) .Build())
@@ -19,6 +20,8 @@ using (var fsql = new FreeSqlBuilder()
var schemas = JsonConvert.DeserializeObject<TableDescriptor[]>(File.ReadAllText(@"C:\Users\28810\Downloads\schema.json")); var schemas = JsonConvert.DeserializeObject<TableDescriptor[]>(File.ReadAllText(@"C:\Users\28810\Downloads\schema.json"));
var context = new ZeroDbContext(fsql); var context = new ZeroDbContext(fsql);
context.LoadSchemasAndNavigates("Student", tableName => schemas.First(c => c.Name == tableName)); context.LoadSchemasAndNavigates("Student", tableName => schemas.First(c => c.Name == tableName));
//context.SyncStructure();
var stu = context.Select.Where("id", 38).First();
var json = JsonConvert.SerializeObject(Helper.GetTestDesc()); var json = JsonConvert.SerializeObject(Helper.GetTestDesc());

1
Examples/zero_entity/zero_entity.csproj
View File

@@ -13,6 +13,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Extensions\FreeSql.Extensions.ZeroEntity\FreeSql.Extensions.ZeroEntity.csproj" /> <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.ZeroEntity\FreeSql.Extensions.ZeroEntity.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.MySql\FreeSql.Provider.MySql.csproj" />
<ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" /> <ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
</ItemGroup> </ItemGroup>

6
Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs
View File

@@ -296,12 +296,12 @@ namespace FreeSql.Extensions.ZeroEntity
{ {
if (list?.Any() != true) return; if (list?.Any() != true) return;
if (flagIndexs == null) flagIndexs = new List<string>(); if (flagIndexs == null) flagIndexs = new List<string>();
flagIndexs.Add(alias.Table.CsName);
var nav = alias.Table.Navigates[navMany.Item1]; var nav = alias.Table.Navigates[navMany.Item1];
if (_includeAll && flagIndexs.Contains(nav.RefTable.CsName)) return; if (_includeAll && flagIndexs.Contains(nav.RefTable.CsName)) return;
flagIndexs.Add(nav.RefTable.CsName);
if (nav.RefType == TableRefType.OneToMany) if (nav.RefType == TableRefType.OneToMany)
{ {
var subTable = nav.RefTable; var subTable = nav.RefTable;
var subSelect = new SelectImpl(_dbcontext, subTable.CsName); var subSelect = new SelectImpl(_dbcontext, subTable.CsName);

10
FreeSql-ZeroEntity.sln
View File

@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.Sqlite", "
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zero_entity", "Examples\zero_entity\zero_entity.csproj", "{97E60B48-06AC-42F3-90A8-DFC5FD386582}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zero_entity", "Examples\zero_entity\zero_entity.csproj", "{97E60B48-06AC-42F3-90A8-DFC5FD386582}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Provider.Oracle", "Providers\FreeSql.Provider.Oracle\FreeSql.Provider.Oracle.csproj", "{3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.MySql", "Providers\FreeSql.Provider.MySql\FreeSql.Provider.MySql.csproj", "{8533877A-F032-44E3-8FE2-3EA2970D3D71}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
{97E60B48-06AC-42F3-90A8-DFC5FD386582}.Debug|Any CPU.Build.0 = Debug|Any CPU {97E60B48-06AC-42F3-90A8-DFC5FD386582}.Debug|Any CPU.Build.0 = Debug|Any CPU
{97E60B48-06AC-42F3-90A8-DFC5FD386582}.Release|Any CPU.ActiveCfg = Release|Any CPU {97E60B48-06AC-42F3-90A8-DFC5FD386582}.Release|Any CPU.ActiveCfg = Release|Any CPU
{97E60B48-06AC-42F3-90A8-DFC5FD386582}.Release|Any CPU.Build.0 = Release|Any CPU {97E60B48-06AC-42F3-90A8-DFC5FD386582}.Release|Any CPU.Build.0 = Release|Any CPU
{3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.Release|Any CPU.Build.0 = Release|Any CPU {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE