From 7e4d248dafb4a19de9cf727469966013596457a8 Mon Sep 17 00:00:00 2001 From: d4ilys <963922242@qq.com> Date: Thu, 16 Oct 2025 11:22:26 +0800 Subject: [PATCH] =?UTF-8?q?QuestDb=20=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Crud/QuestDbTestInsertAndUpdate.cs | 31 ++++++++++--------- .../Crud/QuestDbTestSelect.cs | 23 +++++++------- .../Crud/QuestDbTestUpdate.cs | 16 +++++----- .../FreeSql.Tests.Provider.QuestDb.csproj | 26 ++++++++++++++++ .../QuestDbCodeFirstTest.cs | 12 +++---- .../QuestDbDbFirstTest.cs | 4 +-- .../QuestDbIssue/QuestDbIssue.cs | 12 +++---- .../QuestDbTest.cs | 10 +++--- .../QuestDb_Model_SelectTest.cs | 0 .../QuestDbTestModel/QuestDb_Model_Test01.cs | 0 .../QuestDbTestModel/QuestDb_Model_Type01.cs | 0 .../Utils/OrderAttribute.cs | 0 .../Utils/TestOrders.cs | 0 13 files changed, 80 insertions(+), 54 deletions(-) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/Crud/QuestDbTestInsertAndUpdate.cs (89%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/Crud/QuestDbTestSelect.cs (88%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/Crud/QuestDbTestUpdate.cs (84%) create mode 100644 FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/FreeSql.Tests.Provider.QuestDb.csproj rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbCodeFirstTest.cs (70%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbDbFirstTest.cs (75%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbIssue/QuestDbIssue.cs (83%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbTest.cs (58%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbTestModel/QuestDb_Model_SelectTest.cs (100%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbTestModel/QuestDb_Model_Test01.cs (100%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/QuestDbTestModel/QuestDb_Model_Type01.cs (100%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/Utils/OrderAttribute.cs (100%) rename FreeSql.Tests/{FreeSql.Tests/QuestDb => FreeSql.Tests.Provider.QuestDb}/Utils/TestOrders.cs (100%) diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestInsertAndUpdate.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestInsertAndUpdate.cs similarity index 89% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestInsertAndUpdate.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestInsertAndUpdate.cs index 15cebad3e..42f8a014d 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestInsertAndUpdate.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestInsertAndUpdate.cs @@ -17,7 +17,7 @@ namespace FreeSql.Tests.QuestDb.Crud [Fact,Order(1)] public async Task TestInsertAsync() { - var result = await fsql.Insert(new QuestDb_Model_Test01() + var result = await Db.Insert(new QuestDb_Model_Test01() { Primarys = Guid.NewGuid().ToString(), CreateTime = DateTime.Now, @@ -66,7 +66,7 @@ namespace FreeSql.Tests.QuestDb.Crud NameUpdate = "NameUpdate" }, }; - var result = await fsql.Insert(list).ExecuteAffrowsAsync(); + var result = await Db.Insert(list).ExecuteAffrowsAsync(); Assert.True(result > 0); } @@ -106,14 +106,14 @@ namespace FreeSql.Tests.QuestDb.Crud NameUpdate = "NameUpdate" }, }; - var result = await fsql.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync(); + var result = await Db.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync(); Assert.True(result > 0); } [Fact] public async Task TestRestInsertAsync() { - var result = await restFsql.Insert(new QuestDb_Model_Test01() + var result = await RestApiDb.Insert(new QuestDb_Model_Test01() { Primarys = Guid.NewGuid().ToString(), CreateTime = DateTime.Now, @@ -162,7 +162,7 @@ namespace FreeSql.Tests.QuestDb.Crud NameUpdate = "NameUpdate" }, }; - var result = await restFsql.Insert(list).ExecuteAffrowsAsync(); + var result = await RestApiDb.Insert(list).ExecuteAffrowsAsync(); Assert.True(result > 0); } @@ -202,7 +202,7 @@ namespace FreeSql.Tests.QuestDb.Crud NameUpdate = "NameUpdate" }, }; - var result = await restFsql.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync(); + var result = await RestApiDb.Insert(list).IgnoreColumns(q => q.NameInsert).ExecuteAffrowsAsync(); Assert.True(result > 0); } @@ -224,7 +224,7 @@ namespace FreeSql.Tests.QuestDb.Crud }); } - var result = await restFsql.Insert(list).ExecuteQuestDbBulkCopyAsync(); + var result = await RestApiDb.Insert(list).ExecuteQuestDbBulkCopyAsync(); Assert.True(result > 0); } @@ -233,7 +233,7 @@ namespace FreeSql.Tests.QuestDb.Crud public void TestNormalUpdate() { var updateTime = DateTime.Now; - var updateObj = fsql.Update() + var updateObj = Db.Update() .Set(q => q.NameUpdate, "UpdateNow") // .Set(q => q.CreateTime, DateTime.Now) 分表的时间不可以随便改 .Where(q => q.Id == "1"); @@ -253,7 +253,7 @@ WHERE (""Id"" = '1')"; { var primary = Guid.NewGuid().ToString(); //先插入 - fsql.Insert(new QuestDb_Model_Test01() + Db.Insert(new QuestDb_Model_Test01() { Primarys = primary, CreateTime = DateTime.Now, @@ -269,11 +269,11 @@ WHERE (""Id"" = '1')"; Id = primary, Activos = 12.65, }; - var updateObj = fsql.Update().SetSourceIgnore(updateModel, o => o == null); + var updateObj = Db.Update().SetSourceIgnore(updateModel, o => o == null); var sql = updateObj.ToSql(); Debug.WriteLine(sql); var result = updateObj.ExecuteAffrows(); - var resultAsync = fsql.Update().SetSourceIgnore(updateModel, o => o == null) + var resultAsync = Db.Update().SetSourceIgnore(updateModel, o => o == null) .ExecuteAffrows(); Assert.True(result > 0); Assert.True(resultAsync > 0); @@ -288,7 +288,7 @@ WHERE (""Id"" = '{primary}')", sql); var primary = Guid.NewGuid().ToString(); var updateTime = DateTime.Now; //先插入 - fsql.Insert(new QuestDb_Model_Test01() + Db.Insert(new QuestDb_Model_Test01() { Primarys = primary, CreateTime = DateTime.Now, @@ -298,6 +298,7 @@ WHERE (""Id"" = '{primary}')", sql); NameInsert = "NameInsert", NameUpdate = "NameUpdate" }).ExecuteAffrows(); + var updateModel = new QuestDb_Model_Test01 { Id = primary, @@ -305,12 +306,12 @@ WHERE (""Id"" = '{primary}')", sql); IsCompra = true, CreateTime = DateTime.Now }; - var updateObj = fsql.Update().SetSource(updateModel) + var updateObj = Db.Update().SetSource(updateModel) .IgnoreColumns(q => new { q.Id, q.CreateTime }); var sql = updateObj.ToSql(); Debug.WriteLine(sql); var result = updateObj.ExecuteAffrows(); - var resultAsync = await fsql.Update().SetSource(updateModel) + var resultAsync = await Db.Update().SetSource(updateModel) .IgnoreColumns(q => new { q.Id, q.CreateTime }).ExecuteAffrowsAsync(); Assert.True(result > 0); Assert.True(resultAsync > 0); @@ -323,7 +324,7 @@ WHERE (""Id"" = '{primary}')", sql); public async Task TestUpdateToUpdateAsync() { //官网demo有问题，暂时放弃此功能 - var result = await fsql.Select().Where(q => q.Id == "IdAsync" && q.NameInsert == null) + var result = await Db.Select().Where(q => q.Id == "IdAsync" && q.NameInsert == null) .ToUpdate() .Set(q => q.UpdateTime, DateTime.Now) .ExecuteAffrowsAsync(); diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestSelect.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestSelect.cs similarity index 88% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestSelect.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestSelect.cs index 62a627f3f..013b988fa 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestSelect.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestSelect.cs @@ -6,7 +6,6 @@ using System.Text; using System.Threading.Tasks; using FreeSql.DataAnnotations; using FreeSql.Tests.QuestDb.QuestDbTestModel; -using NetTopologySuite.Operation.Valid; using Xunit; using static FreeSql.Tests.QuestDb.QuestDbTest; @@ -17,13 +16,13 @@ namespace FreeSql.Tests.QuestDb.Crud [Fact] public void TestNormal() { - var sql = fsql.Select().ToSql(); + var sql = Db.Select().ToSql(); Debug.WriteLine(sql); Assert.Equal( @"SELECT a.""Primarys"", a.""Id"", a.""NameUpdate"", a.""NameInsert"", a.""Activos"", a.""CreateTime"", a.""UpdateTime"", a.""IsCompra"" FROM ""QuestDb_Model_Test01"" a", sql); - var sqlWhere = fsql.Select().Where(q => + var sqlWhere = Db.Select().Where(q => q.UpdateTime.Value.BetweenEnd(DateTime.Parse("2023-02-17 09:35:00"), DateTime.Parse("2023-02-17 10:20:00"))).ToSql(); Debug.WriteLine(sqlWhere); @@ -41,7 +40,7 @@ WHERE (a.""UpdateTime"" >= '2023-02-17 09:35:00.000000' and a.""UpdateTime"" < ' public void TestPageAndCount(int page) { var pageSize = 5; - var select = fsql.Select().Count(out var total).Page(page, pageSize); + var select = Db.Select().Count(out var total).Page(page, pageSize); var sql = select.ToSql(); Debug.WriteLine(sql); switch (page) @@ -70,7 +69,7 @@ limit 10,15", sql); [Fact] public void TestNavigation() { - var select = fsql.Select() + var select = Db.Select() .LeftJoin(a => a.Category.Id == a.CategoryId) .LeftJoin(a => a.Category.Parent.Id == a.Category.ParentId) .Where(a => a.Category.Parent.Id > 0); @@ -88,7 +87,7 @@ WHERE (a__Category__Parent.""Id"" > 0)", sql); [Fact] public void TestComplexJoin() { - var select = fsql.Select() + var select = Db.Select() .LeftJoin(w => w.t1.CategoryId == w.t2.Id) .LeftJoin(w => w.t2.ParentId == w.t3.Id) .Where(w => w.t3.Id > 0); @@ -106,10 +105,10 @@ WHERE (c.""Id"" > 0)", sql); [Fact] public void TestUnionAll() { - var select = fsql.Select().Where(a => a.IsCompra == true) + var select = Db.Select().Where(a => a.IsCompra == true) .UnionAll( - fsql.Select().Where(a => a.IsCompra == true), - fsql.Select().Where(a => a.IsCompra == true) + Db.Select().Where(a => a.IsCompra == true), + Db.Select().Where(a => a.IsCompra == true) ) .Where(a => a.IsCompra == true); var sql = select.ToSql(); @@ -134,7 +133,7 @@ WHERE (a.""IsCompra"" = True)", sql); [Fact] public void TestSampleBy() { - var selectSql = fsql.Select() + var selectSql = Db.Select() .SampleBy(1, SampleUnit.day) .WithTempQuery(q => new { q.Id, q.Activos, count = SqlExt.Count(q.Id).ToValue() }) .Where(q => q.Id != "1") @@ -153,7 +152,7 @@ WHERE (a.""Id"" <> '1')"; [Fact] public void TestLatestOn() { - var selectSql = fsql.Select() + var selectSql = Db.Select() .LatestOn(q => q.CreateTime, q => new { q.Id, q.NameUpdate }) .ToSql(); Debug.WriteLine(selectSql); @@ -168,7 +167,7 @@ LATEST ON CreateTime PARTITION BY Id,NameUpdate "; public void TestGroup() { //QUEDTDB的GroupBy PostgrSql有所不同 - var selectSql = fsql.Select() + var selectSql = Db.Select() .WithTempQuery(q => new { q.Id, q.Activos, count = SqlExt.Count(q.Id).ToValue() }) .Where(q => q.Id != "1" && q.count > 1) .ToSql(); diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestUpdate.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestUpdate.cs similarity index 84% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestUpdate.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestUpdate.cs index edb56d55f..82e7abc4a 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/Crud/QuestDbTestUpdate.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Crud/QuestDbTestUpdate.cs @@ -18,7 +18,7 @@ namespace FreeSql.Tests.QuestDb.Crud public void TestNormalRestUpdate() { var updateTime = DateTime.Now; - var updateObj = restFsql.Update() + var updateObj = RestApiDb.Update() .Set(q => q.NameUpdate, "UpdateNow") // .Set(q => q.CreateTime, DateTime.Now) 分表的时间不可以随便改 .Where(q => q.Id == "1"); @@ -38,7 +38,7 @@ WHERE (""Id"" = '1')"; { var primary = Guid.NewGuid().ToString(); //先插入 - restFsql.Insert(new QuestDb_Model_Test01() + RestApiDb.Insert(new QuestDb_Model_Test01() { Primarys = primary, CreateTime = DateTime.Now, @@ -54,11 +54,11 @@ WHERE (""Id"" = '1')"; Id = primary, Activos = 12.65, }; - var updateObj = restFsql.Update().SetSourceIgnore(updateModel, o => o == null); + var updateObj = RestApiDb.Update().SetSourceIgnore(updateModel, o => o == null); var sql = updateObj.ToSql(); Debug.WriteLine(sql); var result = updateObj.ExecuteAffrows(); - var resultAsync = restFsql.Update().SetSourceIgnore(updateModel, o => o == null) + var resultAsync = RestApiDb.Update().SetSourceIgnore(updateModel, o => o == null) .ExecuteAffrows(); Assert.True(result > 0); Assert.True(resultAsync > 0); @@ -73,7 +73,7 @@ WHERE (""Id"" = '{primary}')", sql); var primary = Guid.NewGuid().ToString(); var updateTime = DateTime.Now; //先插入 - restFsql.Insert(new QuestDb_Model_Test01() + RestApiDb.Insert(new QuestDb_Model_Test01() { Primarys = primary, CreateTime = DateTime.Now, @@ -90,12 +90,12 @@ WHERE (""Id"" = '{primary}')", sql); IsCompra = true, CreateTime = DateTime.Now }; - var updateObj = restFsql.Update().SetSource(updateModel) + var updateObj = RestApiDb.Update().SetSource(updateModel) .IgnoreColumns(q => new { q.Id, q.CreateTime }); var sql = updateObj.ToSql(); Debug.WriteLine(sql); var result = updateObj.ExecuteAffrows(); - var resultAsync = await restFsql.Update().SetSource(updateModel) + var resultAsync = await RestApiDb.Update().SetSource(updateModel) .IgnoreColumns(q => new { q.Id, q.CreateTime }).ExecuteAffrowsAsync(); Assert.True(result > 0); Assert.True(resultAsync > 0); @@ -108,7 +108,7 @@ WHERE (""Id"" = '{primary}')", sql); public async Task TestUpdateToUpdateAsync() { //官网demo有问题，暂时放弃此功能 - var result = await restFsql.Select().Where(q => q.Id == "IdAsync" && q.NameInsert == null) + var result = await RestApiDb.Select().Where(q => q.Id == "IdAsync" && q.NameInsert == null) .ToUpdate() .Set(q => q.UpdateTime, DateTime.Now) .ExecuteAffrowsAsync(); diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/FreeSql.Tests.Provider.QuestDb.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/FreeSql.Tests.Provider.QuestDb.csproj new file mode 100644 index 000000000..ae8191fe3 --- /dev/null +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/FreeSql.Tests.Provider.QuestDb.csproj @@ -0,0 +1,26 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbCodeFirstTest.cs similarity index 70% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbCodeFirstTest.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbCodeFirstTest.cs index 56e63072c..f0687c29f 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbCodeFirstTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbCodeFirstTest.cs @@ -16,17 +16,17 @@ namespace FreeSql.Tests.QuestDb [Fact] public void Test_SyncStructure() { - fsql.CodeFirst.SyncStructure(); - fsql.CodeFirst.SyncStructure(typeof(Topic)); - fsql.CodeFirst.SyncStructure(typeof(Category)); - fsql.CodeFirst.SyncStructure(typeof(CategoryType)); + Db.CodeFirst.SyncStructure(); + Db.CodeFirst.SyncStructure(typeof(Topic)); + Db.CodeFirst.SyncStructure(typeof(Category)); + Db.CodeFirst.SyncStructure(typeof(CategoryType)); } [Fact] public void Test_SyncStructure_Type() { - fsql.CodeFirst.SyncStructure(); - var result = fsql.Insert(new QuestDb_Model_Type01() + Db.CodeFirst.SyncStructure(); + var result = Db.Insert(new QuestDb_Model_Type01() { TestBool = false, TestDecimal = (decimal?)153.02, diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbDbFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbDbFirstTest.cs similarity index 75% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbDbFirstTest.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbDbFirstTest.cs index 7e2bb11ea..68cc12425 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbDbFirstTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbDbFirstTest.cs @@ -14,13 +14,13 @@ namespace FreeSql.Tests.QuestDb [Fact] public void Test_ExistsTable() { - var existsTable = QuestDbTest.fsql.DbFirst.ExistsTable(nameof(QuestDb_Model_Test01)); + var existsTable = QuestDbTest.Db.DbFirst.ExistsTable(nameof(QuestDb_Model_Test01)); } [Fact] public void Test_GetTablesByDatabase() { - var tablesByDatabase = QuestDbTest.fsql.DbFirst.GetTablesByDatabase(""); + var tablesByDatabase = QuestDbTest.Db.DbFirst.GetTablesByDatabase(""); tablesByDatabase.ForEach(d => { Debug.WriteLine(d.Name); diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbIssue/QuestDbIssue.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbIssue/QuestDbIssue.cs similarity index 83% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbIssue/QuestDbIssue.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbIssue/QuestDbIssue.cs index 68a0ba0aa..ba56a5ad3 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbIssue/QuestDbIssue.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbIssue/QuestDbIssue.cs @@ -12,8 +12,8 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue [Fact] public void Issue1757() { - restFsql.CodeFirst.SyncStructure(); - var count = fsql.Insert(new List() + RestApiDb.CodeFirst.SyncStructure(); + var count = Db.Insert(new List() { new() { @@ -26,15 +26,15 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue Assert.True(count > 0); - var list = fsql.Select().ToList(); + var list = Db.Select().ToList(); } [Fact] public void Issue1757Many() { - restFsql.CodeFirst.SyncStructure(); - var count = fsql.Insert(new List() + RestApiDb.CodeFirst.SyncStructure(); + var count = Db.Insert(new List() { new() { @@ -61,7 +61,7 @@ namespace FreeSql.Tests.QuestDb.QuestDbIssue Assert.True(count > 0); - var list = fsql.Select().ToList(); + var list = Db.Select().ToList(); } } diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTest.cs similarity index 58% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTest.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTest.cs index 287cdda5f..64b6dcd73 100644 --- a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTest.cs @@ -10,18 +10,18 @@ namespace FreeSql.Tests.QuestDb { public class QuestDbTest { - public static IFreeSql fsql = new FreeSql.FreeSqlBuilder() + public static IFreeSql Db = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.QuestDb, - @"host=192.168.1.114;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;") + @"host=localhost;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;") .UseMonitorCommand(cmd => Debug.WriteLine($"Sql：{cmd.CommandText}")) //监听SQL语句 .UseNoneCommandParameter(true) .Build(); - public static IFreeSql restFsql = new FreeSql.FreeSqlBuilder() + public static IFreeSql RestApiDb = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.QuestDb, - @"host=192.168.1.114;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;") + @"host=localhost;port=8812;username=admin;password=quest;database=qdb;ServerCompatibilityMode=NoTypeLoading;") .UseMonitorCommand(cmd => Debug.WriteLine($"Sql：{cmd.CommandText}")) //监听SQL语句 - .UseQuestDbRestAPI("192.168.1.114:9000") + .UseQuestDbRestAPI("localhost:9000") .Build(); } diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_SelectTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_SelectTest.cs similarity index 100% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_SelectTest.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_SelectTest.cs diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_Test01.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_Test01.cs similarity index 100% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_Test01.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_Test01.cs diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_Type01.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_Type01.cs similarity index 100% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/QuestDbTestModel/QuestDb_Model_Type01.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/QuestDbTestModel/QuestDb_Model_Type01.cs diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/Utils/OrderAttribute.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Utils/OrderAttribute.cs similarity index 100% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/Utils/OrderAttribute.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Utils/OrderAttribute.cs diff --git a/FreeSql.Tests/FreeSql.Tests/QuestDb/Utils/TestOrders.cs b/FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Utils/TestOrders.cs similarity index 100% rename from FreeSql.Tests/FreeSql.Tests/QuestDb/Utils/TestOrders.cs rename to FreeSql.Tests/FreeSql.Tests.Provider.QuestDb/Utils/TestOrders.cs