From f6c70f254c5c0e2b7cc7af7e2685552ea52b5963 Mon Sep 17 00:00:00 2001
From: dailyccc <963922242@qq.com>
Date: Wed, 22 Feb 2023 09:16:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8DBulkCopy=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
index f53eb886..e8104237 100644
--- a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
+++ b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
@@ -71,6 +71,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 +93,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
@@ -143,7 +147,7 @@ public static partial class QuestDbGlobalExtensions
{
try
{
- File.Delete(filePath);
+ // File.Delete(filePath);
}
catch
{
From cefa96a090fd3c900c042ac21fb602fc34aa80f5 Mon Sep 17 00:00:00 2001
From: dailyccc <963922242@qq.com>
Date: Wed, 22 Feb 2023 13:14:33 +0800
Subject: [PATCH 2/5] =?UTF-8?q?-=20=E8=A7=A3=E5=86=B3boundary=E5=B8=A6?=
=?UTF-8?q?=E5=8F=8C=E5=BC=95=E5=8F=B7=20=E5=8F=AF=E8=83=BD=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=94=99=E8=AF=AF=E6=83=85?=
=?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs b/Providers/FreeSql.Provider.QuestDb/QuestDbGlobalExtensions.cs
index e8104237..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();
}
-
- ;
}
}
@@ -140,8 +138,7 @@ public static partial class QuestDbGlobalExtensions
}
catch (Exception e)
{
- Console.WriteLine(e);
- throw;
+ throw e;
}
finally
{
From 0574e794a8d969ffde0f474516965f9a03d0870b Mon Sep 17 00:00:00 2001
From: dailyccc <963922242@qq.com>
Date: Wed, 22 Feb 2023 13:16:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9IServiceProvider?=
=?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Providers/FreeSql.Provider.QuestDb/QuestDbContainer.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)
{
From c201864de035b598afb4d848f3cb8576c217decc Mon Sep 17 00:00:00 2001
From: dailyccc <963922242@qq.com>
Date: Wed, 22 Feb 2023 13:21:34 +0800
Subject: [PATCH 4/5] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96QuestDb-RestAPI?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Providers/FreeSql.Provider.QuestDb/Curd/QuestDbUpdate.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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,
From 82be70f48335bbda7e2b9bb9d0e9a5c3f6b41882 Mon Sep 17 00:00:00 2001
From: dailyccc <963922242@qq.com>
Date: Wed, 22 Feb 2023 13:21:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96QuestDb-RestAPI?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Providers/FreeSql.Provider.QuestDb/Curd/QuestDbInsert.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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();