diff --git a/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs b/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs index d47224c0..096174ca 100644 --- a/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs +++ b/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs @@ -46,7 +46,7 @@ namespace FreeSql.QuestDb.Curd { if (execAsync.Contains("401")) { - throw new Exception("请确认QuestDb设置的RestAPI账号是否正确."); + throw new Exception("请确认new FreeSqlBuilder().UseQuestDbRestAPI()中设置的用户名密码是否正确."); } } var ddl = resultHash["ddl"]?.ToString(); diff --git a/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs b/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs index 66a56a6b..e5958390 100644 --- a/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs +++ b/Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs @@ -33,7 +33,6 @@ namespace FreeSql.QuestDb.Curd private int InternelExecuteAffrows() { - //如果设置了RestAPI的Url则走HTTP var sql = ToSql(); var execAsync = RestAPIExtension.ExecAsync(sql).GetAwaiter().GetResult(); var resultHash = new Hashtable(); @@ -45,7 +44,7 @@ namespace FreeSql.QuestDb.Curd { if (execAsync.Contains("401")) { - throw new Exception("请确认QuestDb设置的RestAPI账号是否正确."); + throw new Exception("请确认new FreeSqlBuilder().UseQuestDbRestAPI()中设置的用户名密码是否正确."); } } var ddl = resultHash["ddl"]?.ToString(); @@ -55,6 +54,7 @@ namespace FreeSql.QuestDb.Curd public override int ExecuteAffrows() { + //如果设置了RestAPI中Url则走HTTP if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl)) { return base.SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 500, diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs index 003c0b3b..fb678d72 100644 --- a/Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs +++ b/Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs @@ -7,8 +7,9 @@ namespace FreeSql.Provider.QuestDb { internal class QuestDbContainer { + //作用于HttpClientFatory private static IServiceCollection Services; - public static IServiceProvider ServiceProvider { get; private set; } + internal static IServiceProvider ServiceProvider { get; private set; } internal static void Initialize(Action service) { diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs index f53eb886..617963c9 100644 --- a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs +++ b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs @@ -55,8 +55,6 @@ public static partial class QuestDbGlobalExtensions lines.Add(line); line = sr.ReadLine(); } - - ; } } @@ -71,6 +69,10 @@ public static partial class QuestDbGlobalExtensions /// public static async Task ExecuteBulkCopyAsync(this IInsert that) where T : class { + if (string.IsNullOrWhiteSpace(RestAPIExtension.BaseUrl)) + { + throw new Exception("BulkCopy功能需要启用RestAPI,启用方式:new FreeSqlBuilder().UseQuestDbRestAPI(\"localhost:9000\", \"username\", \"password\")"); + } var result = 0; var fileName = $"{Guid.NewGuid()}.csv"; var filePath = Path.Combine(AppContext.BaseDirectory, fileName); @@ -89,7 +91,7 @@ public static partial class QuestDbGlobalExtensions { { "name", d.Name }, { "type", d.DbTypeText }, - { "pattern", "yyyy/M/dd HH:mm:ss" } + { "pattern", "yyyy/M/d H:mm:ss" } }); } else @@ -136,14 +138,13 @@ public static partial class QuestDbGlobalExtensions } catch (Exception e) { - Console.WriteLine(e); - throw; + throw e; } finally { try { - File.Delete(filePath); + // File.Delete(filePath); } catch {