tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 PgCopy 处理 jsonb 类型的问题；#1532

Browse Source
This commit is contained in:
2881099
2023-06-15 19:34:56 +08:00
parent d1be9ec629
commit 17206e8ac9
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLExtensions.cs
View File

@ -3,6 +3,7 @@ using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using FreeSql.PostgreSQL.Curd;
using Npgsql;
using NpgsqlTypes;
using System;
using System.Collections.Generic;
using System.Data;
@ -173,7 +174,21 @@ public static partial class FreeSqlPostgreSQLGlobalExtensions
using (var writer = conn.BeginBinaryImport(copyFromCommand.ToString()))
{
foreach (DataRow item in dt.Rows)
writer.WriteRow(item.ItemArray);
{
writer.StartRow();
foreach (DataColumn col in dt.Columns)
{
NpgsqlDbType? npgsqlDbType = null;
var trycol = insert._table.Columns[col.ColumnName];
var tp = insert._orm.CodeFirst.GetDbInfo(trycol.Attribute.MapType)?.type;
if (tp != null) npgsqlDbType = (NpgsqlDbType)tp.Value;
if (npgsqlDbType.HasValue && npgsqlDbType != NpgsqlDbType.Unknown)
writer.Write(item[col.ColumnName], npgsqlDbType.Value);
else
writer.Write(item[col.ColumnName]);
}
//writer.WriteRow(item.ItemArray); #1532
}
writer.Complete();
}
copyFromCommand.Clear();
@ -258,8 +273,22 @@ public static partial class FreeSqlPostgreSQLGlobalExtensions
using (var writer = conn.BeginBinaryImport(copyFromCommand.ToString()))
{
foreach (DataRow item in dt.Rows)
await writer.WriteRowAsync(cancellationToken, item.ItemArray);
writer.Complete();
{
await writer.StartRowAsync(cancellationToken);
foreach (DataColumn col in dt.Columns)
{
NpgsqlDbType? npgsqlDbType = null;
var trycol = insert._table.Columns[col.ColumnName];
var tp = insert._orm.CodeFirst.GetDbInfo(trycol.Attribute.MapType)?.type;
if (tp != null) npgsqlDbType = (NpgsqlDbType)tp.Value;
if (npgsqlDbType.HasValue && npgsqlDbType != NpgsqlDbType.Unknown)
await writer.WriteAsync(item[col.ColumnName], npgsqlDbType.Value, cancellationToken);
else
await writer.WriteAsync(item[col.ColumnName], cancellationToken);
}
//await writer.WriteRowAsync(cancellationToken, item.ItemArray); #1532
}
await writer.CompleteAsync(cancellationToken);
}
copyFromCommand.Clear();
};