tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 pgsql OnConflictDoUpdate 临时主键问题；#1393

Browse Source
This commit is contained in:
2881099 2023-01-05 16:53:25 +08:00
parent 4cd57a0afa
commit 3897da4f4f
7 changed files with 127 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/OnConflictDoUpdateTest.cs
View File

@ -1,7 +1,8 @@
using FreeSql.DataAnnotations; using FreeSql.DataAnnotations;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using Xunit; using Xunit;
namespace FreeSql.Tests.PostgreSQL namespace FreeSql.Tests.PostgreSQL
@ -16,6 +17,125 @@ namespace FreeSql.Tests.PostgreSQL
public DateTime? time { get; set; } public DateTime? time { get; set; }
} }
[Table(Name = "demo_class1"), Index("uk_demo1", "name", true)]
public class DemoClass1
{
[Column(Name = "id")]
public int Id { get; set; }
[Column(Name = "name", IsNullable = false)]
public string Name { get; set; }
[Column(Name = "desc")]
public string Description { get; set; }
#region 系统非业务基础字段
//更新操作忽略此字段 只在OnConflictDoUpdate的插入操作时生效
[Column(Name = "created_id", CanUpdate = false, InsertValueSql = "1")]
public virtual int CreatedId { get; set; }
//插入操作忽略此字段 只在OnConflictDoUpdate的更新操作时生效
[Column(Name = "modified_id", CanInsert = false, InsertValueSql = "1")]
[UpdateValueSql("1")]
public virtual int? ModifiedId { get; set; }
//更新操作忽略此字段 只在OnConflictDoUpdate的插入操作时生效
[Column(Name = "created_time", CanUpdate = false, ServerTime = DateTimeKind.Local)]
public virtual DateTime CreatedTime { get; set; }
//插入操作忽略此字段 只在OnConflictDoUpdate的更新操作时生效
[Column(Name = "modified_time", CanInsert = false, ServerTime = DateTimeKind.Local)]
public virtual DateTime? ModifiedTime { get; set; }
#endregion
}
[Table(Name = "demo_class2")]
public class DemoClass2
{
[Column(Name = "name", IsNullable = false)]
public string Name { get; set; }
[Column(Name = "desc")]
public string Description { get; set; }
#region 系统非业务基础字段
//更新操作忽略此字段 只在OnConflictDoUpdate的插入操作时生效
[Column(Name = "created_id", CanUpdate = false, InsertValueSql = "1")]
public virtual int CreatedId { get; set; }
//插入操作忽略此字段 只在OnConflictDoUpdate的更新操作时生效
[Column(Name = "modified_id", CanInsert = false, InsertValueSql = "1")]
[UpdateValueSql("1")]
public virtual int? ModifiedId { get; set; }
//更新操作忽略此字段 只在OnConflictDoUpdate的插入操作时生效
[Column(Name = "created_time", CanUpdate = false, ServerTime = DateTimeKind.Local)]
public virtual DateTime CreatedTime { get; set; }
//插入操作忽略此字段 只在OnConflictDoUpdate的更新操作时生效
[Column(Name = "modified_time", CanInsert = false, ServerTime = DateTimeKind.Local)]
public virtual DateTime? ModifiedTime { get; set; }
#endregion
}
class UpdateValueSqlAttribute : Attribute
{
public string Value { get; set; }
public UpdateValueSqlAttribute(string value) => Value = value;
}
[Fact]
public void Issues1393()
{
var fsql = g.pgsql;
//跟随 FreeSqlBuilder Build 之后初始化，批量设置实体类：
foreach (var entity in new[] { typeof(DemoClass1) })
{
var table = fsql.CodeFirst.GetTableByEntity(entity);
table.Properties.Values
.Select(a => new { Property = a, UpdateValueSql = a.GetCustomAttribute<UpdateValueSqlAttribute>()?.Value })
.Where(a => a.UpdateValueSql != null)
.ToList()
.ForEach(a =>
{
var col = table.ColumnsByCs[a.Property.Name];
col.GetType().GetProperty("DbUpdateValue").SetValue(col, a.UpdateValueSql);
});
}
var sql = fsql.Insert(Enumerable.Range(1, 5).Select(i => new DemoClass1 { Id = i, Name = $"Name{i}", Description = $"Description{i}" }))
.NoneParameter()
.OnConflictDoUpdate(a => new { a.Name })
.ToSql();
Assert.Equal(@"INSERT INTO ""demo_class1""(""id"", ""name"", ""desc"", ""created_id"", ""created_time"") VALUES(1, 'Name1', 'Description1', 1, current_timestamp), (2, 'Name2', 'Description2', 1, current_timestamp), (3, 'Name3', 'Description3', 1, current_timestamp), (4, 'Name4', 'Description4', 1, current_timestamp), (5, 'Name5', 'Description5', 1, current_timestamp)
ON CONFLICT(""name"") DO UPDATE SET
""name"" = EXCLUDED.""name"",
""desc"" = EXCLUDED.""desc"",
""modified_id"" = 1,
""modified_time"" = current_timestamp", sql);
sql = fsql.Insert(Enumerable.Range(1, 5).Select(i => new DemoClass2 { Name = $"Name{i}", Description = $"Description{i}", ModifiedId = 1 }))
.NoneParameter()
.OnConflictDoUpdate(a => new { a.Name })
.ToSql();
Assert.Equal(@"INSERT INTO ""demo_class2""(""name"", ""desc"", ""created_id"", ""created_time"") VALUES('Name1', 'Description1', 1, current_timestamp), ('Name2', 'Description2', 1, current_timestamp), ('Name3', 'Description3', 1, current_timestamp), ('Name4', 'Description4', 1, current_timestamp), ('Name5', 'Description5', 1, current_timestamp)
ON CONFLICT(""name"") DO UPDATE SET
""name"" = EXCLUDED.""name"",
""desc"" = EXCLUDED.""desc"",
""modified_id"" = CASE EXCLUDED.""name""
WHEN 'Name1' THEN 1
WHEN 'Name2' THEN 1
WHEN 'Name3' THEN 1
WHEN 'Name4' THEN 1
WHEN 'Name5' THEN 1 END::int4,
""modified_time"" = current_timestamp", sql);
//sql = g.pgsql.Insert(data)
// .NoneParameter()
// .OnConflictDoUpdate(a => new { a.Name })
// .UpdateColumns()
// .ToSql();
}
[Fact] [Fact]
public void ExecuteAffrows() public void ExecuteAffrows()
{ {

183
FreeSql/FreeSql.xml
View File

@ -3335,177 +3335,6 @@
<param name="parms"></param> <param name="parms"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IAdo.ExecuteConnectTestAsync(System.Int32,System.Threading.CancellationToken)">
<summary>
测试数据库是否连接正确，本方法执行如下命令：<para></para>
MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
Oracle: SELECT 1 FROM dual<para></para>
</summary>
<param name="commandTimeout">命令超时设置(秒)</param>
<param name="cancellationToken"></param>
<returns>true: 成功, false: 失败</returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="readerHander"></param>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > @age; select * from address", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression"> <member name="E:FreeSql.IAop.ParseExpression">
<summary> <summary>
可自定义解析表达式 可自定义解析表达式
@ -4496,12 +4325,6 @@
<param name="timeout">超时</param> <param name="timeout">超时</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)"> <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary> <summary>
使用完毕后，归还资源 使用完毕后，归还资源
@ -4577,12 +4400,6 @@
</summary> </summary>
<param name="obj">资源对象</param> <param name="obj">资源对象</param>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
<summary>
从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
</summary>
<param name="obj">资源对象</param>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})"> <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
<summary> <summary>
归还对象给对象池的时候触发 归还对象给对象池的时候触发

3
Providers/FreeSql.Provider.Custom/PostgreSQL/Curd/CustomPostgreSQLOnConflictDoUpdate.cs
View File

@ -24,7 +24,7 @@ namespace FreeSql.Custom.PostgreSQL
public CustomPostgreSQLOnConflictDoUpdate(IInsert<T1> insert, Expression<Func<T1, object>> columns = null) public CustomPostgreSQLOnConflictDoUpdate(IInsert<T1> insert, Expression<Func<T1, object>> columns = null)
{ {
_pgsqlInsert = insert as CustomPostgreSQLInsert<T1>; _pgsqlInsert = insert as CustomPostgreSQLInsert<T1>;
if (_pgsqlInsert == null) throw new Exception(CoreStrings.S_Features_Unique("OnConflictDoUpdate", "Odbc/PostgreSQL")); if (_pgsqlInsert == null) throw new Exception(CoreStrings.S_Features_Unique("OnConflictDoUpdate", "Custom/PostgreSQL"));
if (_pgsqlInsert._noneParameterFlag == "c") _pgsqlInsert._noneParameterFlag = "cu"; if (_pgsqlInsert._noneParameterFlag == "c") _pgsqlInsert._noneParameterFlag = "cu";
if (columns != null) if (columns != null)
@ -109,6 +109,7 @@ namespace FreeSql.Custom.PostgreSQL
{ {
sb.Append(") DO UPDATE SET\r\n"); sb.Append(") DO UPDATE SET\r\n");
if (_pgsqlUpdate._tempPrimarys.Any() == false) _pgsqlUpdate._tempPrimarys = _tempPrimarys;
var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0; var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0;
var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0; var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0;
if (sbSetEmpty == false || sbSetIncrEmpty == false) if (sbSetEmpty == false || sbSetIncrEmpty == false)

1
Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESOnConflictDoUpdate.cs
View File

@ -109,6 +109,7 @@ namespace FreeSql.KingbaseES
{ {
sb.Append(") DO UPDATE SET\r\n"); sb.Append(") DO UPDATE SET\r\n");
if (_update._tempPrimarys.Any() == false) _update._tempPrimarys = _tempPrimarys;
var sbSetEmpty = _update.InternalSbSet.Length == 0; var sbSetEmpty = _update.InternalSbSet.Length == 0;
var sbSetIncrEmpty = _update.InternalSbSetIncr.Length == 0; var sbSetIncrEmpty = _update.InternalSbSetIncr.Length == 0;
if (sbSetEmpty == false || sbSetIncrEmpty == false) if (sbSetEmpty == false || sbSetIncrEmpty == false)

1
Providers/FreeSql.Provider.Odbc/KingbaseES/Curd/OdbcKingbaseESOnConflictDoUpdate.cs
View File

@ -109,6 +109,7 @@ namespace FreeSql.Odbc.KingbaseES
{ {
sb.Append(") DO UPDATE SET\r\n"); sb.Append(") DO UPDATE SET\r\n");
if (_pgsqlUpdate._tempPrimarys.Any() == false) _pgsqlUpdate._tempPrimarys = _tempPrimarys;
var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0; var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0;
var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0; var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0;
if (sbSetEmpty == false || sbSetIncrEmpty == false) if (sbSetEmpty == false || sbSetIncrEmpty == false)

1
Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLOnConflictDoUpdate.cs
View File

@ -109,6 +109,7 @@ namespace FreeSql.Odbc.PostgreSQL
{ {
sb.Append(") DO UPDATE SET\r\n"); sb.Append(") DO UPDATE SET\r\n");
if (_pgsqlUpdate._tempPrimarys.Any() == false) _pgsqlUpdate._tempPrimarys = _tempPrimarys;
var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0; var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0;
var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0; var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0;
if (sbSetEmpty == false || sbSetIncrEmpty == false) if (sbSetEmpty == false || sbSetIncrEmpty == false)

1
Providers/FreeSql.Provider.PostgreSQL/Curd/OnConflictDoUpdate.cs
View File

@ -109,6 +109,7 @@ namespace FreeSql.PostgreSQL.Curd
{ {
sb.Append(") DO UPDATE SET\r\n"); sb.Append(") DO UPDATE SET\r\n");
if (_pgsqlUpdate._tempPrimarys.Any() == false) _pgsqlUpdate._tempPrimarys = _tempPrimarys;
var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0; var sbSetEmpty = _pgsqlUpdate.InternalSbSet.Length == 0;
var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0; var sbSetIncrEmpty = _pgsqlUpdate.InternalSbSetIncr.Length == 0;
if (sbSetEmpty == false || sbSetIncrEmpty == false) if (sbSetEmpty == false || sbSetIncrEmpty == false)