From 3907c5f87ec162a548d95653d6da116299156201 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Sat, 26 Apr 2025 21:48:22 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20ZeroDbContext=20Includ?= =?UTF-8?q?eAll=20=E6=AD=BB=E5=BE=AA=E7=8E=AF=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/zero_entity/Program.cs | 5 ++++- Examples/zero_entity/zero_entity.csproj | 1 + .../ZeroDbContext.SelectImpl.cs | 6 +++--- FreeSql-ZeroEntity.sln | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Examples/zero_entity/Program.cs b/Examples/zero_entity/Program.cs index bdbd92886..23ca62547 100644 --- a/Examples/zero_entity/Program.cs +++ b/Examples/zero_entity/Program.cs @@ -10,7 +10,8 @@ using System.Text.Json; using (var fsql = new FreeSqlBuilder() .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) .UseMonitorCommand(cmd => Console.WriteLine(cmd.CommandText + "\r\n")) .Build()) @@ -19,6 +20,8 @@ using (var fsql = new FreeSqlBuilder() var schemas = JsonConvert.DeserializeObject(File.ReadAllText(@"C:\Users\28810\Downloads\schema.json")); var context = new ZeroDbContext(fsql); 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()); diff --git a/Examples/zero_entity/zero_entity.csproj b/Examples/zero_entity/zero_entity.csproj index 36cc0761d..1d572fb81 100644 --- a/Examples/zero_entity/zero_entity.csproj +++ b/Examples/zero_entity/zero_entity.csproj @@ -13,6 +13,7 @@ + diff --git a/Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs b/Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs index db73d1986..3170c0106 100644 --- a/Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs +++ b/Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs @@ -296,12 +296,12 @@ namespace FreeSql.Extensions.ZeroEntity { if (list?.Any() != true) return; if (flagIndexs == null) flagIndexs = new List(); - flagIndexs.Add(alias.Table.CsName); 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 subSelect = new SelectImpl(_dbcontext, subTable.CsName); diff --git a/FreeSql-ZeroEntity.sln b/FreeSql-ZeroEntity.sln index 836b4b971..b27ad41b0 100644 --- a/FreeSql-ZeroEntity.sln +++ b/FreeSql-ZeroEntity.sln @@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.Sqlite", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zero_entity", "Examples\zero_entity\zero_entity.csproj", "{97E60B48-06AC-42F3-90A8-DFC5FD386582}" 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 Global 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}.Release|Any CPU.ActiveCfg = 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 - {3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EDA83F1-0F47-D363-9FD7-6A68B81E93C8}.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}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8533877A-F032-44E3-8FE2-3EA2970D3D71}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE