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

- 修复 UpdateJoin IsVersion 字段的别名问题；

Browse Source
This commit is contained in:
2881099 2023-10-19 14:42:52 +08:00
parent 5782d6e517
commit 801ba148d6
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@ -1216,6 +1216,24 @@ namespace FreeSql.Internal.CommonProvider
if (_versionColumn != null && _versionColumn.Attribute.CanUpdate) if (_versionColumn != null && _versionColumn.Attribute.CanUpdate)
{ {
var vcname = _commonUtils.QuoteSqlName(_versionColumn.Attribute.Name); var vcname = _commonUtils.QuoteSqlName(_versionColumn.Attribute.Name);
var vcvalue = vcname;
if (string.IsNullOrWhiteSpace(_tableAlias) == false)
{
switch (_orm.Ado.DataType)
{
case DataType.PostgreSQL:
case DataType.OdbcPostgreSQL:
case DataType.CustomPostgreSQL:
case DataType.KingbaseES:
case DataType.OdbcKingbaseES:
case DataType.ShenTong:
vcvalue = $"{_tableAlias}.{vcname}"; //set name = b.name
break;
default:
vcname = vcvalue = $"{_tableAlias}.{vcname}"; //set a.name = b.name
break;
}
}
if (_versionColumn.Attribute.MapType == typeof(byte[])) if (_versionColumn.Attribute.MapType == typeof(byte[]))
{ {
_updateVersionValue = Utils.GuidToBytes(Guid.NewGuid()); _updateVersionValue = Utils.GuidToBytes(Guid.NewGuid());
@ -1227,7 +1245,7 @@ namespace FreeSql.Internal.CommonProvider
sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.GetNoneParamaterSqlValue(_paramsSource, "uv", _versionColumn, _versionColumn.Attribute.MapType, _updateVersionValue)); sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.GetNoneParamaterSqlValue(_paramsSource, "uv", _versionColumn, _versionColumn.Attribute.MapType, _updateVersionValue));
} }
else else
sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.IsNull(vcname, 0)).Append(" + 1"); sb.Append(", ").Append(vcname).Append(" = ").Append(_commonUtils.IsNull(vcvalue, 0)).Append(" + 1");
} }
ToSqlWhere(sb); ToSqlWhere(sb);
_interceptSql?.Invoke(sb); _interceptSql?.Invoke(sb);