QuestDb 单元测试验证

Author: d4ilys

FreeSql.sln

@@ -137,6 +137,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.TDen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.EFModel", "Extensions\FreeSql.Extensions.EFModel\FreeSql.Extensions.EFModel.csproj", "{4281AC48-6FE7-49C3-BE7B-D029058646BC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Tests.Provider.QuestDb", "FreeSql.Tests\FreeSql.Tests.Provider.QuestDb\FreeSql.Tests.Provider.QuestDb.csproj", "{5A59200F-9757-4E0B-B4CF-2E846F25A69A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -831,6 +833,18 @@ Global
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x64.Build.0 = Release|Any CPU
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x64.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Debug|x86.Build.0 = Debug|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x64.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x64.Build.0 = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x86.ActiveCfg = Release|Any CPU
+		{5A59200F-9757-4E0B-B4CF-2E846F25A69A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -877,8 +891,8 @@ Global
 		{4281AC48-6FE7-49C3-BE7B-D029058646BC} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
-		RESX_PrefixTranslations = True
 		RESX_NeutralResourcesLanguage = en-US
+		RESX_PrefixTranslations = True
+		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
 	EndGlobalSection
 EndGlobal

FreeSql/FreeSql.xml

@@ -1,16 +1,18 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using FreeSql.Provider.QuestDb;
 
 namespace FreeSql.QuestDb.Curd
 {
@@ -33,16 +35,16 @@ public QuestDbInsert(IFreeSql orm, CommonUtils commonUtils, CommonExpression com
         internal void InternalClearData() => ClearData();
         internal string InternalTableRuleInvoke() => TableRuleInvoke();
 
-        private int RestApiExecuteAffrows()
+        private async Task<int> RestApiExecuteAffrowsAsync()
         {
             //如果设置了RestAPI的Url则走HTTP
-            var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
+            var apiFeatures =  ServiceContainer.GetService<QuestResetApiFeatures>();
             var sql = ToSql();
-            var execAsync = apiFeatures.ExecAsync(sql).GetAwaiter().GetResult();
-            var resultHash = new Hashtable();
+            var execAsync = await apiFeatures.ExecAsync(sql);
+            var result = new RestApiExecResponseJsonBody();
             try
             {
-                resultHash = JsonConvert.DeserializeObject<Hashtable>(execAsync);
+                result = JsonConvert.DeserializeObject<RestApiExecResponseJsonBody>(execAsync);
             }
             catch
             {
@@ -52,20 +54,19 @@ private int RestApiExecuteAffrows()
                 }
             }
 
-            var ddl = resultHash["ddl"]?.ToString();
-            return ddl?.ToLower() == "ok" ? 1 : 0;
+            return result.IsSuccessful ? 1 : 0;
         }
 
         public override int ExecuteAffrows()
         {
             var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
-            if (apiFeatures != null && string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : 5000,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
             }
 
-            return RestApiExecuteAffrows();
+            return RestApiExecuteAffrowsAsync().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         public override long ExecuteIdentity() => base.SplitExecuteIdentity(
@@ -176,13 +177,13 @@ protected override List<T1> RawExecuteInserted()
         public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
         {
             var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
-            if (apiFeatures != null && string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 5000,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
             }
 
-            return Task.FromResult(RestApiExecuteAffrows());
+            return RestApiExecuteAffrowsAsync();
         }