weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-06 16:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dotnetcore/FreeSql

Browse Source
This commit is contained in:
2881099
2025-11-02 22:32:03 +08:00
parent 1f6e16f2e2 a6a9d02d97
commit 351e33d010
11 changed files with 169 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs
View File

@@ -11,7 +11,31 @@ namespace FreeSql
/// <summary>
/// 工作单元管理器
/// </summary>
public class UnitOfWorkManager : IDisposable
public interface IUnitOfWorkManager : IDisposable
{
IFreeSql Orm { get; }
/// <summary>
/// 当前的工作单元
/// </summary>
IUnitOfWork Current { get; }
/// <summary>
/// 将仓储的事务交给我管理
/// </summary>
/// <param name="repository"></param>
void Binding(IBaseRepository repository);
/// <summary>
/// 创建工作单元
/// </summary>
/// <param name="propagation">事务传播方式</param>
/// <param name="isolationLevel">事务隔离级别</param>
/// <returns></returns>
IUnitOfWork Begin(Propagation propagation = Propagation.Required, IsolationLevel? isolationLevel = null);
}
/// <summary>
/// 工作单元管理器
/// </summary>
public class UnitOfWorkManager : IUnitOfWorkManager
{
internal DbContextScopedFreeSql _ormScoped;
internal IFreeSql OrmOriginal => _ormScoped?._originalFsql;

26
FreeSql.Tests/FreeSql.Tests/PostgreSQL/Curd/PostgreSQLInsertOrUpdateTest.cs
View File

@@ -98,11 +98,37 @@ ON CONFLICT(""id"") DO UPDATE SET
var lst = fsql.Select<tbiou02>().Where(a => new[] { 1, 2, 3, 4 }.Contains(a.id)).ToList();
Assert.Equal(4, lst.Where(a => a.name == "00" + a.id).Count());
}
class tbiou02
{
public int id { get; set; }
public string name { get; set; }
}
[Fact]
public void InsertOrUpdate_TempPrimary()
{
fsql.Delete<tbiou_temp>().Where("1=1").ExecuteAffrows();
var iou = fsql.InsertOrUpdate<tbiou_temp>().SetSource(new tbiou_temp { name = "01", description = "testval" }, m => new { m.name });
var sql = iou.ToSql();
Assert.Equal(@"INSERT INTO ""tbiou_temp""(""name"", ""description"") VALUES('01', 'testval')
ON CONFLICT(""name"") DO UPDATE SET
""description"" = EXCLUDED.""description""", sql);
Assert.Equal(1, iou.ExecuteAffrows());
var iou2 = fsql.InsertOrUpdate<tbiou_temp>().SetSource(new tbiou_temp { name = "01", description = "testval2" }, m => new { m.name }).ExecuteAffrows();
Assert.Equal(1, iou2);
}
[Index("uix_tbiou_temp_name", "name", true)]
class tbiou_temp
{
[Column(IsPrimary = true, IsIdentity = true)]
public int id { get; set; }
public string name { get; set; }
public string description { get; set; }
}
[Fact]
public void InsertOrUpdate_OnePrimaryAndIdentity()
{

101
FreeSql/Extensions/FreeSqlGlobalExtensions.cs
View File

@@ -420,21 +420,102 @@ public static partial class FreeSqlGlobalExtensions
case DataType.SqlServer:
case DataType.OdbcSqlServer:
case DataType.CustomSqlServer:
{
var oldalias = selectProvider._aliasRule;
selectProvider._aliasRule = (type, old) =>
{
if (oldalias != null) old = oldalias(type, old);
if (string.IsNullOrWhiteSpace(indexName) == false && type == selectProvider._tables[0].Table.Type) return LocalAppendWithString(old, $"index={indexName}");
if (rule == null) return old;
return rule.TryGetValue(type, out var tryidxName) && string.IsNullOrWhiteSpace(tryidxName) == false ? LocalAppendWithString(old, $"index={tryidxName}") : old;
};
}
break;
case DataType.MySql:
case DataType.OdbcMySql:
case DataType.CustomMySql:
{
var oldalias = selectProvider._aliasRule;
selectProvider._aliasRule = (type, old) =>
{
if (oldalias != null) old = oldalias(type, old);
if (string.IsNullOrWhiteSpace(indexName) == false && type == selectProvider._tables[0].Table.Type) return LocalAppendMySqlIndex(old, indexName);
if (rule == null) return old;
return rule.TryGetValue(type, out var tryidxName) && string.IsNullOrWhiteSpace(tryidxName) == false ? LocalAppendMySqlIndex(old, indexName) : old;
};
}
break;
case DataType.Oracle:
case DataType.OdbcOracle:
case DataType.CustomOracle:
{
var hintParts = new List<string>();
if (!string.IsNullOrEmpty(indexName) && !string.IsNullOrEmpty(selectProvider._tables[0].Alias))
{
string alias = selectProvider._tables[0].Alias;
hintParts.Add($"INDEX({alias} {indexName})");
}
if (rule != null && rule.Count > 0)
{
var tablesMap = selectProvider._tables
.Skip(1)
.Where(t => !string.IsNullOrEmpty(t.Alias) && t.Table?.Type != null)
.ToDictionary(t => t.Table.Type, t => t);
foreach (var indexRule in rule)
{
if (tablesMap.TryGetValue(indexRule.Key, out var tableInfo))
{
string otherIndexName = indexRule.Value;
if (!string.IsNullOrEmpty(otherIndexName))
hintParts.Add($"INDEX({tableInfo.Alias} {otherIndexName})");
}
}
}
if (hintParts.Count > 0)
{
string finalHint = $"/*+ {string.Join(" ", hintParts)} */";
var _select = selectProvider._select;
int selectKeywordIndex = _select.IndexOf("SELECT ", StringComparison.OrdinalIgnoreCase);
if (selectKeywordIndex != -1)
{
int insertionPoint = selectKeywordIndex + "SELECT ".Length;
selectProvider._select = _select.Insert(insertionPoint, $"{finalHint} ");
}
}
}
break;
case DataType.Sqlite:
{
var oldalias = selectProvider._aliasRule;
selectProvider._aliasRule = (type, old) =>
{
if (oldalias != null) old = oldalias(type, old);
if (string.IsNullOrWhiteSpace(indexName) == false && type == selectProvider._tables[0].Table.Type) return LocalAppendSqliteIndex(old, indexName);
if (rule == null) return old;
return rule.TryGetValue(type, out var tryidxName) && string.IsNullOrWhiteSpace(tryidxName) == false ? LocalAppendSqliteIndex(old, indexName) : old;
};
}
break;
default:
return query;
}
var oldalias = selectProvider._aliasRule;
selectProvider._aliasRule = (type, old) =>
{
if (oldalias != null) old = oldalias(type, old);
if (string.IsNullOrWhiteSpace(indexName) == false && type == selectProvider._tables[0].Table.Type) return LocalAppendWithString(old, $"index={indexName}");
if (rule == null) return old;
return rule.TryGetValue(type, out var tryidxName) && string.IsNullOrWhiteSpace(tryidxName) == false ? LocalAppendWithString(old, $"index={tryidxName}") : old;
};
return query;
}
static string LocalAppendWithString(string old, string str) => old?.Contains(" With(") == true ? old.Replace(" With(", $" With({str}, ") : $"{old} With({str})";
static string LocalAppendMySqlIndex(string old, string indexName)
{
if (string.IsNullOrEmpty(old)) return $"FORCE INDEX({indexName})";
int forceIndexPosition = old.IndexOf("FORCE INDEX(", StringComparison.OrdinalIgnoreCase);
if (forceIndexPosition == -1) return $"{old} FORCE INDEX({indexName})";
int closingParenPosition = old.IndexOf(')', forceIndexPosition);
if (closingParenPosition != -1) return old.Insert(closingParenPosition, $",{indexName}");
return old;
}
static string LocalAppendSqliteIndex(string old, string indexName)
{
if (string.IsNullOrEmpty(old)) return $"INDEXED BY {indexName}";
if (old.IndexOf("INDEXED BY", StringComparison.OrdinalIgnoreCase) != -1) return old;
return $"{old} INDEXED BY {indexName}";
}
/// <summary>
/// 设置全局 SqlServer: with(nolock)<para></para>

11
Providers/FreeSql.Provider.ClickHouse/Curd/ClickHouseInsert.cs
View File

@@ -185,14 +185,21 @@ namespace FreeSql.ClickHouse.Curd
before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, null, _params);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
var data = ToDataTable();
var columns = new string[_table.ColumnsByPosition.Length];
for (var i = 0; i < columns.Length; i++)
{
columns[i] = _table.ColumnsByPosition[i].CsName;
}
using (var conn = await _orm.Ado.MasterPool.GetAsync())
{
using (var bulkCopyInterface = new ClickHouseBulkCopy(conn.Value as ClickHouseConnection)
{
DestinationTableName = data.TableName,
BatchSize = _source.Count
BatchSize = _source.Count,
ColumnNames = columns,
})
{
await bulkCopyInterface.InitAsync();
await bulkCopyInterface.WriteToServerAsync(data, default);
}
}
@@ -201,7 +208,7 @@ namespace FreeSql.ClickHouse.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

2
Providers/FreeSql.Provider.Custom/PostgreSQL/Curd/CustomPostgreSQLInsertOrUpdate.cs
View File

@@ -56,7 +56,7 @@ namespace FreeSql.Custom.PostgreSQL
if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
else
{
var ocdu = new CustomPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());
var ocdu = new CustomPostgreSQLOnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());
ocdu._tempPrimarys = _tempPrimarys;
var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) ||
_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);

2
Providers/FreeSql.Provider.Duckdb/FreeSql.Provider.Duckdb.csproj
View File

@@ -28,7 +28,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DuckDB.NET.Data.Full" Version="1.2.1" />
<PackageReference Include="DuckDB.NET.Data.Full" Version="1.4.1" />
</ItemGroup>
<ItemGroup>

2
Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESInsertOrUpdate.cs
View File

@@ -56,7 +56,7 @@ namespace FreeSql.KingbaseES
if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
else
{
var ocdu = new KingbaseESOnConflictDoUpdate<T1>(insert.InsertIdentity());
var ocdu = new KingbaseESOnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());
ocdu._tempPrimarys = _tempPrimarys;
var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) ||
_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);

17
Providers/FreeSql.Provider.KingbaseES/KingbaseESCodeFirst.cs
View File

@@ -149,8 +149,17 @@ namespace FreeSql.KingbaseES
protected override string GetComparisonDDLStatements(params TypeSchemaAndName[] objects)
{
InitIsSysV8R3();
var builder = new System.Data.Common.DbConnectionStringBuilder
{
ConnectionString = _orm.Ado.ConnectionString
};
var searchPath = builder.ContainsKey("SearchPath") ? builder["SearchPath"].ToString() : "PUBLIC"; //读取链接字符串中的SearchPath 来确定架构模式
if (searchPath.Contains(','))
{
searchPath = searchPath.Split(',')[0];
}
var pg_ = _isSysV8R3 == true ? "sys_" : "pg_";
var public_ = _isSysV8R3 == true ? "PUBLIC" : "public";
var public_ = _isSysV8R3 == true ? searchPath.ToUpper() : searchPath;
var sb = new StringBuilder();
var seqcols = new List<NativeTuple<ColumnInfo, string[], bool>>(); //序列
@@ -182,11 +191,11 @@ namespace FreeSql.KingbaseES
var sbalter = new StringBuilder();
var istmpatler = false; //创建临时表，导入数据，删除旧表，修改
if (_orm.Ado.ExecuteScalar(CommandType.Text, string.Format($" select 1 from {pg_}tables a inner join {pg_}namespace b on b.nspname = a.schemaname where b.nspname || '.' || a.tablename = '{{0}}.{{1}}'", tbname)) == null)
if (_orm.Ado.ExecuteScalar(CommandType.Text, string.Format($" select 1 from {pg_}tables a inner join {pg_}namespace b on b.nspname = a.schemaname where b.nspname ='{{0}}' && a.tablename = '{{1}}'", tbname)) == null)//原判断V9版本存在问题
{ //表不存在
if (tboldname != null)
{
if (_orm.Ado.ExecuteScalar(CommandType.Text, string.Format($" select 1 from {pg_}tables a inner join {pg_}namespace b on b.nspname = a.schemaname where b.nspname || '.' || a.tablename = '{{0}}.{{1}}'", tboldname)) == null)
if (_orm.Ado.ExecuteScalar(CommandType.Text, string.Format($" select 1 from {pg_}tables a inner join {pg_}namespace b on b.nspname = a.schemaname where b.nspname ='{{0}}' && a.tablename = '{{1}}'", tboldname)) == null)
//旧表不存在
tboldname = null;
}
@@ -388,7 +397,7 @@ from {pg_}class a
inner join {pg_}namespace b on b.oid = a.relnamespace
left join {pg_}description d on d.objoid = a.oid and objsubid = 0
where upper(b.nspname) not in ('SYS_CATALOG', 'INFORMATION_SCHEMA', 'TOPOLOGY', 'SYSAUDIT', 'SYSLOGICAL', 'SYS_TEMP_1', 'SYS_TOAST', 'SYS_TOAST_TEMP_1', 'XLOG_RECORD_READ') and a.relkind in ('r') and b.nspname = {{0}} and a.relname = {{1}}
and upper(b.nspname || '.' || a.relname) not in ('PUBLIC.GEOGRAPHY_COLUMNS','PUBLIC.GEOMETRY_COLUMNS','PUBLIC.RASTER_COLUMNS','PUBLIC.RASTER_OVERVIEWS')", tbname[0], tbname[1])));
and upper(text(b.nspname || '.' || a.relname)) not in ('PUBLIC.GEOGRAPHY_COLUMNS','PUBLIC.GEOMETRY_COLUMNS','PUBLIC.RASTER_COLUMNS','PUBLIC.RASTER_OVERVIEWS')", tbname[0], tbname[1])));//解决报错 function upper(boolean) is not unique 错误的问题
if (dbcomment != (tb.Comment ?? ""))
sbalter.Append("COMMENT ON TABLE ").Append(_commonUtils.QuoteSqlName($"{tbname[0]}.{tbname[1]}")).Append(" IS ").Append(_commonUtils.FormatSql("{0}", tb.Comment)).Append(";\r\n");

BIN
Providers/FreeSql.Provider.KingbaseES/lib/Kdbndp.dll
View File

Binary file not shown.

2
Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLInsertOrUpdate.cs
View File

@@ -56,7 +56,7 @@ namespace FreeSql.Odbc.PostgreSQL
if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
else
{
var ocdu = new OdbcPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());
var ocdu = new OdbcPostgreSQLOnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());
ocdu._tempPrimarys = _tempPrimarys;
var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) ||
_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);

2
Providers/FreeSql.Provider.PostgreSQL/Curd/PostgreSQLInsertOrUpdate.cs
View File

@@ -58,7 +58,7 @@ namespace FreeSql.PostgreSQL.Curd
if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
else
{
var ocdu = new OnConflictDoUpdate<T1>(insert.InsertIdentity());
var ocdu = new OnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());
ocdu._tempPrimarys = _tempPrimarys;
var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) ||
_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);