QuestDb 单元测试验证

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

@@ -1097,6 +1097,93 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
+            <summary>
+            动态创建实体类型
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
+            <summary>
+            配置Class
+            </summary>
+            <param name="className">类名</param>
+            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
+            <returns></returns>
+        </member>
+        <member name="P:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.TypeBuilder">
+            <summary>
+            获取类型构建器，可作为要构建的Type来引用
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="defaultValue">属性默认值</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
+            <summary>
+            配置父类
+            </summary>
+            <param name="superClass">父类类型</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
+            <summary>
+            Override属性
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
+            <summary>
+            Emit动态创建出Class - Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.BuildJustType">
+            <summary>
+            Emit动态创建出Class - Type，不附带获取TableInfo
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
+            <summary>
+            首字母小写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
+            <summary>
+            首字母大写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 ""
@@ -5903,6 +5990,28 @@
             对象池
             </summary>
         </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
+            <summary>
+            动态构建Class Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            根据字典，创建 table 对应的实体对象
+            </summary>
+            <param name="table"></param>
+            <param name="dict"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
+            <summary>
+            根据实体对象，创建 table 对应的字典
+            </summary>
+            <param name="table"></param>
+            <param name="instance"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>
@@ -6510,126 +6619,3 @@
         </member>
     </members>
 </doc>
-<returns></returns>
-        </member>
-        <member name="M:IFreeSql.Insert``1(System.Collections.Generic.List{``0})">
-            <summary>
-            插入数据，传入实体集合
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Insert``1(System.Collections.Generic.IEnumerable{``0})">
-            <summary>
-            插入数据，传入实体集合
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="source"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.InsertOrUpdate``1">
-            <summary>
-            插入或更新数据，此功能依赖数据库特性（低版本可能不支持），参考如下：<para></para>
-            MySql 5.6+: on duplicate key update<para></para>
-            PostgreSQL 9.4+: on conflict do update<para></para>
-            SqlServer 2008+: merge into<para></para>
-            Oracle 11+: merge into<para></para>
-            Sqlite: replace into<para></para>
-            DuckDB: on conflict do update<para></para>
-            达梦: merge into<para></para>
-            人大金仓：on conflict do update<para></para>
-            神通：merge into<para></para>
-            MsAccess：不支持<para></para>
-            注意区别：FreeSql.Repository 仓储也有 InsertOrUpdate 方法（不依赖数据库特性）
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1">
-            <summary>
-            修改数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Update``1(System.Object)">
-            <summary>
-            修改数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1">
-            <summary>
-            查询数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Select``1(System.Object)">
-            <summary>
-            查询数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1">
-            <summary>
-            删除数据
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Delete``1(System.Object)">
-            <summary>
-            删除数据，传入动态条件，如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
-            </summary>
-            <typeparam name="T1"></typeparam>
-            <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
-            <returns></returns>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.Action)">
-            <summary>
-            开启事务（不支持异步）<para></para>
-            v1.5.0 关闭了线程事务超时自动提交的机制
-            </summary>
-            <param name="isolationLevel"></param>
-            <param name="handler">事务体 () => {}</param>
-        </member>
-        <member name="P:IFreeSql.Ado">
-            <summary>
-            数据库访问对象
-            </summary>
-        </member>
-        <member name="P:IFreeSql.Aop">
-            <summary>
-            所有拦截方法都在这里
-            </summary>
-        </member>
-        <member name="P:IFreeSql.CodeFirst">
-            <summary>
-            CodeFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.DbFirst">
-            <summary>
-            DbFirst 模式开发相关方法
-            </summary>
-        </member>
-        <member name="P:IFreeSql.GlobalFilter">
-            <summary>
-            全局过滤设置，可默认附加为 Select/Update/Delete 条件
-            </summary>
-        </member>
-    </members>
-</doc>

Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs

@@ -1,5 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections;
@@ -7,10 +9,10 @@ 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 @@ namespace FreeSql.QuestDb.Curd
         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 @@ namespace FreeSql.QuestDb.Curd
                 }
             }
 
-            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 @@ namespace FreeSql.QuestDb.Curd
         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();
         }
 
 

Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs

@@ -1,5 +1,7 @@
 using FreeSql.Internal;
 using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections;
@@ -10,7 +12,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using FreeSql.Provider.QuestDb;
 
 namespace FreeSql.QuestDb.Curd
 {
@@ -32,15 +33,16 @@ namespace FreeSql.QuestDb.Curd
 
         internal void InternalToSqlCaseWhenEnd(StringBuilder sb, ColumnInfo col) => ToSqlCaseWhenEnd(sb, col);
 
-        private int RestApiExecuteAffrows()
+        private async Task<int> RestApiExecuteAffrowsAsync()
         {
             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
             {
@@ -50,22 +52,20 @@ namespace FreeSql.QuestDb.Curd
                 }
             }
 
-            var ddl = resultHash["ddl"]?.ToString();
-            var updated = Convert.ToInt32(resultHash["updated"]);
-            return ddl?.ToLower() == "ok" ? updated : 0;
+            return result.IsSuccessful ? result.Updated : 0;
         }
 
         public override int ExecuteAffrows()
         {
             //如果设置了RestApi 则走HTTP执行Sql
             var apiFeatures = ServiceContainer.GetService<QuestResetApiFeatures>();
-            if (apiFeatures != null && string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
+            if (apiFeatures == null || string.IsNullOrWhiteSpace(apiFeatures.BaseAddress))
             {
                 return base.SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 500,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
             }
 
-            return RestApiExecuteAffrows();
+            return RestApiExecuteAffrowsAsync().ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
         protected override List<TReturn> ExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns) =>
@@ -187,13 +187,13 @@ namespace FreeSql.QuestDb.Curd
         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(_batchRowsLimit > 0 ? _batchRowsLimit : 500,
                     _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
             }
 
-            return Task.FromResult(RestApiExecuteAffrows());
+            return RestApiExecuteAffrowsAsync();
         }
 
 

Providers/FreeSql.Provider.QuestDb/Models/QuestResetApiFeatures.cs

@@ -0,0 +1,26 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace FreeSql.Provider.QuestDb.Models
+{
+    internal class QuestResetApiFeatures
+    {
+        internal string BaseAddress { get; set; }
+
+        internal string BasicToken { get; set; }
+
+        internal HttpClient HttpClient => ServiceContainer.GetService<IHttpClientFactory>().CreateClient("QuestDb");
+
+        internal async Task<string> ExecAsync(string sql)
+        {
+            //HTTP GET 执行SQL
+            var url = $"exec?query={HttpUtility.UrlEncode(sql)}";
+            if (!string.IsNullOrWhiteSpace(BasicToken))
+                HttpClient.DefaultRequestHeaders.Add("Authorization", BasicToken);
+            var httpResponseMessage = await HttpClient.GetAsync(url);
+            var result = await httpResponseMessage.Content.ReadAsStringAsync();
+            return result;
+        }
+    }
+}

Providers/FreeSql.Provider.QuestDb/Models/RestApiExecResponseJsonBody.cs

@@ -0,0 +1,21 @@
+using System;
+using Newtonsoft.Json;
+
+namespace FreeSql.Provider.QuestDb.Models
+{
+    internal class RestApiExecResponseJsonBody
+    {
+        [JsonProperty("ddl")]
+        public string Ddl { get; set; }
+
+        [JsonProperty("dml")]
+        public string Dml { get; set; }
+
+        [JsonProperty("updated")]
+        public int Updated { get; set; }
+
+        [JsonIgnore]
+        public bool IsSuccessful => string.Equals(Ddl, "ok", StringComparison.CurrentCultureIgnoreCase) ||
+                                    string.Equals(Dml, "ok", StringComparison.CurrentCultureIgnoreCase);
+    }
+}

Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs

@@ -1,15 +1,14 @@
 using CsvHelper;
 using FreeSql;
-using FreeSql.Internal.CommonProvider;
-using FreeSql.Internal.Model;
+using FreeSql.Provider.QuestDb;
+using FreeSql.Provider.QuestDb.Models;
 using FreeSql.QuestDb;
 using FreeSql.QuestDb.Curd;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using Npgsql;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -18,10 +17,6 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
-using FreeSql.Provider.QuestDb;
-using System.Net;
-using Microsoft.Extensions.DependencyInjection;
 
 public static partial class QuestDbGlobalExtensions
 {
@@ -50,7 +45,12 @@ public static partial class QuestDbGlobalExtensions
         //初始化容器，添加HttpClient
         ServiceContainer.Initialize(service =>
         {
-            service.AddHttpClient("QuestDb", client => client.BaseAddress = new Uri(host))
+            var apiFeatures = new QuestResetApiFeatures
+            {
+                BaseAddress = host.StartsWith("http") ? host : $"http://{host}"
+            };
+
+            service.AddHttpClient("QuestDb", client => client.BaseAddress = new Uri(apiFeatures.BaseAddress))
                 .ConfigurePrimaryHttpMessageHandler(handlerBuilder =>
                 {
                     //忽略SSL验证
@@ -62,18 +62,13 @@ public static partial class QuestDbGlobalExtensions
                     };
                 });
 
-            var description = new QuestResetApiFeatures()
-            {
-                BaseAddress = host
-            };
-
             if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
             {
                 var base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"));
-                description.BasicToken = $"Basic {base64}";
+                apiFeatures.BasicToken = $"Basic {base64}";
             }
 
-            service.AddSingleton(description);
+            service.AddSingleton(apiFeatures);
         });
 
         //RestApi需要无参数
@@ -349,24 +344,4 @@ static class LatestOnExtension
         var _partition = expressionVisitor.Fields();
         LatestOnString.Value = string.Format(latestOnTemple, _timestamp, _partition);
     }
-}
-
-internal class QuestResetApiFeatures
-{
-    internal string BaseAddress { get; set; }
-
-    internal string BasicToken { get; set; }
-
-    internal HttpClient HttpClient => ServiceContainer.GetService<IHttpClientFactory>().CreateClient("QuestDb");
-
-    internal async Task<string> ExecAsync(string sql)
-    {
-        //HTTP GET 执行SQL
-        var url = $"exec?query={HttpUtility.UrlEncode(sql)}";
-        if (!string.IsNullOrWhiteSpace(BasicToken))
-            HttpClient.DefaultRequestHeaders.Add("Authorization", BasicToken);
-        var httpResponseMessage = await HttpClient.GetAsync(url);
-        var result = await httpResponseMessage.Content.ReadAsStringAsync();
-        return result;
-    }
 }

Providers/FreeSql.Provider.QuestDb/ServiceContainer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
@@ -23,4 +24,5 @@ namespace FreeSql.Provider.QuestDb
             return _serviceProvider == null ? default : _serviceProvider.GetService<T>();
         }
     }
+
 }