From 1968c69a31d1a34440901170c64c1257f4361e3e Mon Sep 17 00:00:00 2001 From: MarvelTiter_yaoqinglin Date: Fri, 28 Aug 2026 16:01:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LightORM/Builder/DeleteBuilder.cs | 152 +++++++++++------- src/LightORM/Builder/InsertBuilder.cs | 3 +- src/LightORM/Builder/ScopedDatabaseAdapter.cs | 4 +- src/LightORM/Builder/SelectBuilder.cs | 114 ++++++------- src/LightORM/Builder/SqlBuilder.cs | 40 ++++- src/LightORM/Builder/UpdateBuilder.cs | 5 +- .../ExpressionSql/ExpressionCoreSql.cs | 4 +- .../ExpressionSql/ScopedExpressionCoreSql.cs | 26 +-- .../ExpressionSql/TransientContext.cs | 90 +++++++++++ .../TransientExpressionCoreSql.cs | 121 -------------- src/LightORM/Extension/BatchActionHelper.cs | 9 +- .../Extension/BatchSqlInfoExtensions.cs | 4 +- .../Extension/CustomDatabaseExtensions.cs | 136 +++++++++------- .../Extension/ExpressionContextExtension.cs | 4 +- .../Extension/IncludeContextExtensions.cs | 6 +- .../Extension/SelectHandleExtensions.cs | 8 +- .../Implements/CustomDatabaseAdapter.cs | 64 +++++--- src/LightORM/Interfaces/ExpSql/ISql.cs | 10 +- src/LightORM/Interfaces/IDatabaseAdapter.cs | 4 +- src/LightORM/Interfaces/IExpressionContext.cs | 8 +- src/LightORM/Models/BatchSqlInfo.cs | 44 ++--- src/LightORM/Models/JsonColumnContext.cs | 13 +- src/LightORM/Models/TableInfo.cs | 2 +- .../Performances/SelectBuilderPool.cs | 3 +- src/LightORM/Providers/DeleteProvider.cs | 20 ++- src/LightORM/Providers/InsertProvider.cs | 20 ++- src/LightORM/Providers/UpdateProvider.cs | 21 ++- .../Repository/LightOrmQueryProvider.cs | 2 +- src/LightORM/Utils/ExpressionResolver.cs | 18 ++- .../CustomDamengAdapter.BatchInsert.cs | 117 ++++++++++++++ .../CustomDamengAdapter.InsertOrUpdate.cs | 27 ++-- .../CustomOracleAdapter.BatchInsert.cs | 124 +++++++++++++- .../CustomOracleAdapter.InsertOrUpdate.cs | 28 ++-- .../CustomPostgreSQL.InsertOrUpdate.cs | 2 +- .../CustomSqlServerAdapter.InsertOrUpdate.cs | 21 ++- test/BenchmarkTest/StringBuilderPoolTest.cs | 8 +- .../ResultTest/ExecutionTest.cs | 17 ++ .../SqlGenerate/UpdateSql.cs | 17 ++ .../SqlGenerate/InsertOrUpdateTest.cs | 13 ++ .../SqlGenerate/SelectSql.cs | 4 +- .../SqlGenerate/InsertOrUpdateTest.cs | 13 ++ test/LightORMTest/CreateTableTest.cs | 2 + test/LightORMTest/Models/User.cs | 18 ++- .../ResultTest/ExecutionTest.InitData.cs | 117 ++++++++++++-- test/LightORMTest/ResultTest/ExecutionTest.cs | 52 ++++++ .../SqlGenerate/InsertOrUpdateTest.cs | 27 +++- test/LightORMTest/SqlGenerate/SelectSql.cs | 6 +- test/LightORMTest/SqlGenerate/UpdateSql.cs | 12 +- test/LightORMTest/TestBase.cs | 25 +-- 49 files changed, 1110 insertions(+), 495 deletions(-) create mode 100644 src/LightORM/ExpressionSql/TransientContext.cs delete mode 100644 src/LightORM/ExpressionSql/TransientExpressionCoreSql.cs create mode 100644 src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.BatchInsert.cs create mode 100644 test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs create mode 100644 test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs create mode 100644 test/LightORMTest.PostgreSQL/SqlGenerate/InsertOrUpdateTest.cs create mode 100644 test/LightORMTest.SqlServer/SqlGenerate/InsertOrUpdateTest.cs diff --git a/src/LightORM/Builder/DeleteBuilder.cs b/src/LightORM/Builder/DeleteBuilder.cs index 2d870ea9..c848cd67 100644 --- a/src/LightORM/Builder/DeleteBuilder.cs +++ b/src/LightORM/Builder/DeleteBuilder.cs @@ -18,6 +18,7 @@ internal class DeleteBuilder : SqlBuilder public List? BatchInfos { get; set; } #if NET8_0_OR_GREATER [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "根据已知类型构建导航条件")] + [UnconditionalSuppressMessage("AOT", "IL2026", Justification = "根据已知类型构建导航条件")] #endif protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo expInfo, ExpressionResolvedResult result) { @@ -35,77 +36,101 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e var navSqlBuilder = SelectBuilder.GetSelectBuilder(); navSqlBuilder.IsSubQuery = true; navSqlBuilder.Depth = 1; - navSqlBuilder.AddTableInfo(MainTable); + navSqlBuilder.AddTableInfo(MainTable with { Depth = 1 }); + var selectMain = navSqlBuilder.MainTable; var navInfo = navColumn.NavigateInfo!; - var mainCol = MainTable.GetColumnInfo(navInfo.MainName!); + var mainCol = selectMain.GetColumnInfo(navInfo.MainName!); var targetType = navInfo.NavigateType; var targetTable = TableInfo.Create(targetType, navSqlBuilder.NextTableIndex); - - navSqlBuilder.SelectValue = $"{MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)}"; + //navSqlBuilder.SelectValue = $"{selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)}"; + var mainParameter = Expression.Parameter(selectMain.Type); + var tarParameter = Expression.Parameter(targetType); + var mainMember = Expression.Property(mainParameter, navInfo.MainName!); if (navInfo.MappingType != null) { + var mappingParameter = Expression.Parameter(navInfo.MappingType); var targetNav = targetTable.GetNavigateColumns(c => c.NavigateInfo?.MappingType == navInfo.MappingType).First().NavigateInfo!; var targetCol = targetTable.GetColumnInfo(targetNav.MainName!); - var mapTable = TableInfo.Create(navInfo.MappingType, 1); - var subCol = mapTable.GetColumnInfo(navInfo.SubName!); + //var mapTable = TableInfo.Create(navInfo.MappingType, 1); + //var subCol = mapTable.GetColumnInfo(navInfo.SubName!); //TryJoin(mapTable); - navSqlBuilder.Joins.Add(new JoinInfo(mapTable) - { - JoinType = TableLinkType.InnerJoin, - Where = $"( {MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" - }); + //navSqlBuilder.AddJoin(new JoinInfo(mapTable) + //{ + // JoinType = TableLinkType.InnerJoin, + // Where = $"( {selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" + //}); + var subMember = Expression.Property(mappingParameter, navInfo.SubName!); + var body = Expression.Equal(mainMember, subMember); + var joinWhere = Expression.Lambda(body, mainParameter, mappingParameter); + navSqlBuilder.JoinHandle(navInfo.MappingType, joinWhere, TableLinkType.InnerJoin); + + //subCol = mapTable.GetColumnInfo(targetNav.SubName!); + //targetTable.Index += 1; + //navSqlBuilder.AddJoin(new JoinInfo(targetTable) + //{ + // JoinType = TableLinkType.InnerJoin, + // Where = $"( {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" + //}); + + var tarMainMember = Expression.Property(tarParameter, targetNav.MainName!); + var tarSubMember = Expression.Property(mappingParameter, targetNav.SubName!); + var tarBody = Expression.Equal(tarMainMember, tarSubMember); + var joinTarWhere = Expression.Lambda(tarBody, mainParameter, mappingParameter, tarParameter); + navSqlBuilder.JoinHandle(navInfo.NavigateType, joinTarWhere, TableLinkType.InnerJoin); - subCol = mapTable.GetColumnInfo(targetNav.SubName!); - targetTable.Index += 1; - navSqlBuilder.Joins.Add(new JoinInfo(targetTable) - { - JoinType = TableLinkType.InnerJoin, - Where = $"( {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" - }); - if (result.NavigateWhereExpression.TryGetLambdaExpression(out var l) - && l!.Parameters[0].Type == navSqlBuilder.Joins.LastOrDefault()?.EntityInfo?.Type) - { - List ps = [.. navSqlBuilder.AllTables().Select(t => Expression.Parameter(t.TableEntityInfo.Type!))]; - ps.RemoveAt(ps.Count - 1); - var newWhereExpression = Expression.Lambda(l.Body, [.. ps, l.Parameters[0]]); - //var ee = new ExpressionInfo(SqlResolveOptions.Where, newWhereExpression); - var eeResult = newWhereExpression.Resolve(SqlResolveOptions.Where, ResolveCtx!); - navSqlBuilder.Where.Add(eeResult.SqlString!); - if (eeResult.ResolvedValues?.Count > 0) - ResolvedValues.AddRange(eeResult.ResolvedValues); - } + } else { - var targetCol = targetTable.GetColumnInfo(navInfo.SubName!); + var tarMainMember = Expression.Property(mainParameter, navInfo.MainName!); + var tarSubMember = Expression.Property(tarParameter, navInfo.SubName!); + var tarBody = Expression.Equal(tarMainMember, tarSubMember); + var joinTarWhere = Expression.Lambda(tarBody, mainParameter, tarParameter); + navSqlBuilder.JoinHandle(navInfo.NavigateType, joinTarWhere, TableLinkType.InnerJoin); + //var targetCol = targetTable.GetColumnInfo(navInfo.SubName!); //TryJoin(targetTable); - navSqlBuilder.Joins.Add(new JoinInfo(targetTable) - { - JoinType = TableLinkType.InnerJoin, - Where = $"( {MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} )" - }); - var n = result.MemberOfNavigateMember; - if (n is not null) - { - var c = targetTable.GetColumn(n); - if (c is not null) - { - string mainColWhere; - var indexOfLeft = result.SqlString?.IndexOf('('); - if (indexOfLeft > -1) - { - mainColWhere = result.SqlString!.Insert(indexOfLeft.Value + 1, $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}"); - } - else - { - mainColWhere = $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}{result.SqlString}"; - } - navSqlBuilder.Where.Add(mainColWhere); - } - } + //navSqlBuilder.AddJoin(new JoinInfo(targetTable) + //{ + // JoinType = TableLinkType.InnerJoin, + // Where = $"( {selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} )" + //}); + //var n = result.MemberOfNavigateMember; + //if (n is not null) + //{ + // var c = targetTable.GetColumn(n); + // if (c is not null) + // { + // string mainColWhere; + // var indexOfLeft = result.SqlString?.IndexOf('('); + // if (indexOfLeft > -1) + // { + // mainColWhere = result.SqlString!.Insert(indexOfLeft.Value + 1, $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}"); + // } + // else + // { + // mainColWhere = $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}{result.SqlString}"; + // } + // navSqlBuilder.Where.Add(mainColWhere); + // } + //} + } + + if (result.NavigateWhereExpression.TryGetLambdaExpression(out var l) + && l!.Parameters[0].Type == navSqlBuilder.GetJoins().LastOrDefault()?.EntityInfo?.Type) + { + + List ps = [.. navSqlBuilder.AllTables().Select(t => Expression.Parameter(t.TableEntityInfo.Type!))]; + ps.RemoveAt(ps.Count - 1); + var newWhereExpression = Expression.Lambda(l.Body, [.. ps, l.Parameters[0]]); + var ee = new ExpressionInfo(SqlResolveOptions.Where, newWhereExpression); + navSqlBuilder.Expressions.Add(ee); } - Where.Add($"{database.AttachEmphasis(mainCol.ColumnName)} IN ({N}{navSqlBuilder.ToSqlString(database)})"); + navSqlBuilder.Expressions.Add(new( SqlResolveOptions.Select,Expression.Lambda(mainMember, mainParameter))); + using var _ = StringBuilderPool.Get(out var sb); + navSqlBuilder.Build(sb, database, navSqlBuilder.Depth); + Where.Add($"{database.AttachEmphasis(mainCol.ColumnName)} IN ({N}{sb})"); + ResolvedValues.AddRange(navSqlBuilder.ResolvedValues); } } else @@ -130,7 +155,7 @@ private void CreateBatchDeleteSql(IDatabaseAdapter database) } BatchInfos = columns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count); //var delete = $"DELETE FROM {GetTableName(database, MainTable, false)}"; - database.HandleBatchDelete(new(this, columns, BatchInfos, database)); + database.HandleBatchDelete(new(this, columns, BatchInfos, DbParameters, database)); batchDone = true; } @@ -149,25 +174,28 @@ public override string ToSqlString(IDatabaseAdapter database) } ResolveExpressions(database); - + using var _ = StringBuilderPool.Get(out var sql); + WriteTags(sql); if (FullDelete) { if (Truncate) { - return $"TRUNCATE TABLE {GetTableName(database, MainTable, false)}"; + sql.Append("TRUNCATE TABLE "); + sql.Append(GetTableName(database, MainTable, false)); } else { - return $"DELETE FROM {GetTableName(database, MainTable, false)}"; + sql.Append("DELETE FROM "); + sql.Append(GetTableName(database, MainTable, false)); } + return sql.ToString(); } if (Where.Count == 0 && TargetObject is null) { throw new LightOrmException("Where Condition is null and not provider a entity value"); } - using var _ = StringBuilderPool.Get(out var sql); - sql = new("DELETE FROM "); + sql.Append("DELETE FROM "); //sql.AppendLine(GetTableName(database, MainTable, false)); sql.AppendTableName(database, MainTable, false).AppendLine(); // 没有设置Where条件, 且提供实体值, 则使用主键作为Where条件 diff --git a/src/LightORM/Builder/InsertBuilder.cs b/src/LightORM/Builder/InsertBuilder.cs index 74fd82cd..8e60e63b 100644 --- a/src/LightORM/Builder/InsertBuilder.cs +++ b/src/LightORM/Builder/InsertBuilder.cs @@ -93,7 +93,7 @@ public void CreateInsertBatchSql(IDatabaseAdapter database) // TODO 批量插入对JSON列处理 BatchInfos = insertColumns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count); - database.HandleBatchInsert(new(this, insertColumns, BatchInfos, database)); + database.HandleBatchInsert(new(this, insertColumns, BatchInfos, DbParameters, database)); batchDone = true; @@ -185,6 +185,7 @@ public override string ToSqlString(IDatabaseAdapter database) //columns.RemoveLast(1); //values.RemoveLast(1); using var _ = StringBuilderPool.Get(out var sb); + WriteTags(sb); if ((UpdateOnConflict || IgnoreOnConflict) && insertColumns.Any(i => i.IsPrimaryKey)) { database.HandleInsertOrUpdate(new(this, sb, columnValueMap, DbParameters, IgnoreOnConflict, database)); diff --git a/src/LightORM/Builder/ScopedDatabaseAdapter.cs b/src/LightORM/Builder/ScopedDatabaseAdapter.cs index 55cc8251..99ad1c3a 100644 --- a/src/LightORM/Builder/ScopedDatabaseAdapter.cs +++ b/src/LightORM/Builder/ScopedDatabaseAdapter.cs @@ -81,9 +81,9 @@ public void ReturnIdentitySql(StringBuilder sql) public string RewriteParameterReferences(string sql, string prefix) => inner.RewriteParameterReferences(sql, prefix); - void IDatabaseAdapter.HandleBatchInsert(BatchActionContext context) => inner.HandleBatchInsert(context); + void IDatabaseAdapter.HandleBatchInsert(BatchActionContext> context) => inner.HandleBatchInsert(context); - void IDatabaseAdapter.HandleBatchUpdate(BatchActionContext context) => inner.HandleBatchUpdate(context); + void IDatabaseAdapter.HandleBatchUpdate(BatchActionContext> context) => inner.HandleBatchUpdate(context); void IDatabaseAdapter.HandleInsertOrUpdate(UpsertContext context) => inner.HandleInsertOrUpdate(context); diff --git a/src/LightORM/Builder/SelectBuilder.cs b/src/LightORM/Builder/SelectBuilder.cs index 618963e1..d7a0d91c 100644 --- a/src/LightORM/Builder/SelectBuilder.cs +++ b/src/LightORM/Builder/SelectBuilder.cs @@ -54,7 +54,7 @@ internal partial class SelectBuilder : SqlBuilder, ISelectSqlBuilder public bool IsCube { get; set; } public string SelectValue { get; set; } = "*"; public int Depth { get; set; } - public List Joins { get; set; } = []; + private readonly List joins = []; public List Having { get; set; } = []; public SortedSet Includes { get; set; } = []; @@ -63,15 +63,7 @@ internal partial class SelectBuilder : SqlBuilder, ISelectSqlBuilder public List OrderBy { get; set; } = []; public int TableIndexFix { get; set; } public object? AdditionalValue { get; set; } - public int NextTableIndex => SelectedTables.Count + Joins.Count + TableIndexFix; - - private List? Tags { get; set; } - - public void AddTag(TagInfo tag) - { - Tags ??= []; - Tags.Add(tag); - } + public int NextTableIndex => SelectedTables.Count + joins.Count + TableIndexFix; //protected override Lazy GetAllTables() //{ @@ -84,18 +76,66 @@ public void AddTableInfo(TableInfo tableInfo) SelectedTables.Add(tableInfo); } + public void AddJoin(JoinInfo joinInfo) + { + joinInfo.EntityInfo.Depth = Depth; + joins.Add(joinInfo); + } + + public JoinInfo? GetJoin(Func predicate) + { + return joins.FirstOrDefault(predicate); + } + public List GetJoins() => joins; + + public void ClearJoins() => joins.Clear(); + public override IEnumerable AllTables() { foreach (var item in SelectedTables) { yield return item; } - foreach (var item in Joins) + foreach (var item in joins) { yield return item.EntityInfo!; } } + internal override void WriteTags(StringBuilder sql, string ident) + { + if (Tags is not { Count: > 0 }) + { + return; + } + foreach (var tag in Tags) + { + if (IsTemp) + sql.Append("-- "); + else + sql.Append(ident).Append("-- "); + if (tag.WithCallSite) + { + var fileName = tag.FilePath != null + ? Path.GetFileNameWithoutExtension(tag.FilePath) + : "Unknown"; + sql.Append(fileName) + .Append('.') + .Append(tag.CallMember ?? "Unknown") + .Append(':') + .Append(tag.LineNumber?.ToString() ?? "?") + .Append(" - ") + .Append(tag.Message); + } + else + { + sql.Append(tag.Message); + } + sql.AppendLine(); + } + // 注释和sql隔开一行 + //sql.AppendLine(); + } protected override void BeforeResolveExpressions(ResolveContext context) { @@ -124,7 +164,7 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e ScanNavigate(database, result, MainTable); IsDistinct = true; if (result.NavigateWhereExpression.TryGetLambdaExpression(out var l) - && l!.Parameters[0].Type == Joins.LastOrDefault()?.EntityInfo?.Type) + && l!.Parameters[0].Type == joins.LastOrDefault()?.EntityInfo?.Type) { List ps = [.. AllTables().Select(t => Expression.Parameter(t.TableEntityInfo.Type!))]; ps.RemoveAt(ps.Count - 1); @@ -142,7 +182,7 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e } else if (expInfo.ResolveOptions.SqlType == SqlPartial.Join) { - var joinInfo = Joins.FirstOrDefault(j => j.ExpressionId == expInfo.Id); + var joinInfo = joins.FirstOrDefault(j => j.ExpressionId == expInfo.Id); joinInfo?.Where = result.SqlString!; } else if (expInfo.ResolveOptions.SqlType == SqlPartial.Select) @@ -208,7 +248,7 @@ private void ScanNavigate(IDatabaseAdapter database, ExpressionResolvedResult re var mapTable = TableInfo.Create(navInfo.MappingType, NextTableIndex); var subCol = mapTable.GetColumnInfo(navInfo.SubName!); //TryJoin(mapTable); - Joins.Add(new JoinInfo(mapTable) + joins.Add(new JoinInfo(mapTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {mainTableInfo.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" @@ -216,7 +256,7 @@ private void ScanNavigate(IDatabaseAdapter database, ExpressionResolvedResult re subCol = mapTable.GetColumnInfo(targetNav.SubName!); targetTable.Index += 1; - Joins.Add(new JoinInfo(targetTable) + joins.Add(new JoinInfo(targetTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" @@ -226,7 +266,7 @@ private void ScanNavigate(IDatabaseAdapter database, ExpressionResolvedResult re { var targetCol = targetTable.GetColumnInfo(navInfo.SubName!); //TryJoin(targetTable); - Joins.Add(new JoinInfo(targetTable) + joins.Add(new JoinInfo(targetTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {mainTableInfo.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} )" @@ -276,40 +316,6 @@ private void BuildFromString(StringBuilder sql, IDatabaseAdapter database) sql.AppendLine(); } - private void WriteTags(StringBuilder sql, ref string ident) - { - if (Tags is not { Count: > 0 }) - { - return; - } - foreach (var tag in Tags) - { - if (IsTemp) - sql.Append("-- "); - else - sql.Append(ident).Append("-- "); - if (tag.WithCallSite) - { - var fileName = tag.FilePath != null - ? Path.GetFileNameWithoutExtension(tag.FilePath) - : "Unknown"; - sql.Append(fileName) - .Append('.') - .Append(tag.CallMember ?? "Unknown") - .Append(':') - .Append(tag.LineNumber?.ToString() ?? "?") - .Append(" - ") - .Append(tag.Message); - } - else - { - sql.Append(tag.Message); - } - sql.AppendLine(); - } - // 注释和sql隔开一行 - //sql.AppendLine(); - } public override string ToSqlString(IDatabaseAdapter database) { //SubQuery?.ResolveExpressions(); @@ -332,7 +338,7 @@ public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel Depth = currentLevel; ResolveExpressions(database); var ident = new string(' ', 4 * currentLevel); - WriteTags(sql, ref ident); + WriteTags(sql, ident); if (InsertInfo.HasValue) { //sb.AppendLine($"INSERT INTO {database.AttachEmphasis(InsertInfo.Value.TableName)}"); @@ -411,7 +417,7 @@ public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel ResolvedValues.UnionWith(SubQuery.ResolvedValues); } - foreach (var item in Joins) + foreach (var item in joins) { if (item.IsSubQuery && item.SubQuery is not null) { @@ -552,9 +558,9 @@ int EstimateSqlLength(int currentLevel = 0) } // JOINs - for (int i = 0; i < Joins.Count; i++) + for (int i = 0; i < joins.Count; i++) { - var join = Joins[i]; + var join = joins[i]; total += indent + 10; // "INNER JOIN " if (join.IsSubQuery && join.SubQuery != null) { diff --git a/src/LightORM/Builder/SqlBuilder.cs b/src/LightORM/Builder/SqlBuilder.cs index eaf08db4..edaba96b 100644 --- a/src/LightORM/Builder/SqlBuilder.cs +++ b/src/LightORM/Builder/SqlBuilder.cs @@ -44,6 +44,8 @@ protected virtual void BeforeResolveExpressions(ResolveContext context) protected ResolveContext? ResolveCtx { get; set; } public bool? QuoteIdentifiers { get; set; } + protected List? Tags { get; set; } + internal void HandleSqlParameters(StringBuilder sql, IDatabaseAdapter database) { //var useParameterized = IsParameterized ?? ExpressionSqlOptions.Instance.Value.UseParameterized; @@ -110,7 +112,7 @@ protected void ResolveExpressions(IDatabaseAdapter database) result.SqlString = string.Format(item.Template, result.SqlString); } HandleResult(database, item, result); - if (result.ResolvedValues != null) + if (result.ResolvedValues != null && !result.UseNavigate) ResolvedValues.AddRange(result.ResolvedValues); item.IsCompleted = true; } @@ -179,4 +181,40 @@ protected static object VersionDefaultValue(Type type) } throw new NotSupportedException("不支持的Version列类型"); } + + public void AddTag(TagInfo tag) + { + Tags ??= []; + Tags.Add(tag); + } + + internal virtual void WriteTags(StringBuilder sql, string ident = "") + { + if (Tags is not { Count: > 0 }) + { + return; + } + foreach (var tag in Tags) + { + sql.Append(ident).Append("-- "); + if (tag.WithCallSite) + { + var fileName = tag.FilePath != null + ? Path.GetFileNameWithoutExtension(tag.FilePath) + : "Unknown"; + sql.Append(fileName) + .Append('.') + .Append(tag.CallMember ?? "Unknown") + .Append(':') + .Append(tag.LineNumber?.ToString() ?? "?") + .Append(" - ") + .Append(tag.Message); + } + else + { + sql.Append(tag.Message); + } + sql.AppendLine(); + } + } } \ No newline at end of file diff --git a/src/LightORM/Builder/UpdateBuilder.cs b/src/LightORM/Builder/UpdateBuilder.cs index c2e123ef..57e4bd8c 100644 --- a/src/LightORM/Builder/UpdateBuilder.cs +++ b/src/LightORM/Builder/UpdateBuilder.cs @@ -206,8 +206,8 @@ private void CreateUpdateBatchSql(IDatabaseAdapter database) BatchInfos = columns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count, DbParameters); - database.HandleBatchUpdate(new(this, columns, BatchInfos, database)); - + database.HandleBatchUpdate(new(this, columns, BatchInfos, DbParameters, database)); + batchDone = true; } @@ -278,6 +278,7 @@ public override string ToSqlString(IDatabaseAdapter database) var setNullCol = MainTable.TableEntityInfo.Columns.Where(c => SetNullMembers.Count > 0 && SetNullMembers.Contains(c.PropertyName)).ToList(); using var _ = StringBuilderPool.Get(out var sb); //StringBuilder sb = new("UPDATE "); + WriteTags(sb); sb.Append("UPDATE "); sb.AppendTableName(database, MainTable, false); sb.AppendLine(" SET "); diff --git a/src/LightORM/ExpressionSql/ExpressionCoreSql.cs b/src/LightORM/ExpressionSql/ExpressionCoreSql.cs index a7b30ee2..798e3c0b 100644 --- a/src/LightORM/ExpressionSql/ExpressionCoreSql.cs +++ b/src/LightORM/ExpressionSql/ExpressionCoreSql.cs @@ -10,10 +10,10 @@ internal sealed partial class ExpressionCoreSql(ExpressionSqlOptions option) : E private readonly ConnectionFactory connectionFactory = new(option); public string Id { get; } = $"{Guid.NewGuid():N}"; public override SqlAdo Ado => GetAdo(Options.DefaultDbKey); - public TransientExpressionContext SwitchDatabase(string key) + public ITransientContext SwitchDatabase(string key) { var connection = connectionFactory.GetDatabaseConnection(key); - return new(this, connection, Options); + return new TransientContext(connection, Options); } public SqlAdo GetAdo(string key) diff --git a/src/LightORM/ExpressionSql/ScopedExpressionCoreSql.cs b/src/LightORM/ExpressionSql/ScopedExpressionCoreSql.cs index 44ac4300..777c73da 100644 --- a/src/LightORM/ExpressionSql/ScopedExpressionCoreSql.cs +++ b/src/LightORM/ExpressionSql/ScopedExpressionCoreSql.cs @@ -10,18 +10,8 @@ internal sealed class ScopedExpressionCoreSql(ExpressionSqlOptions options) : Ex private IsolationLevel isolationLevel = IsolationLevel.Unspecified; private readonly ConnectionFactory connectionFactory = new(options); private readonly ConcurrentDictionary connections = []; - private TransientExpressionContext? current; - public override SqlAdo Ado - { - get - { - if (current.HasValue) - { - return current.Value.Ado; - } - return DefaultAdo; - } - } + private TransientContext? current; + public override SqlAdo Ado => current?.Ado ?? DefaultAdo; public SqlAdo DefaultAdo { @@ -36,8 +26,8 @@ public SqlAdo DefaultAdo } } - private readonly Dictionary contextCaches = []; - TransientExpressionContext IScopedExpressionContext.SwitchDatabase(string key) + private readonly Dictionary contextCaches = []; + ITransientContext IScopedExpressionContext.SwitchDatabase(string key) { if (contextCaches.TryGetValue(key, out var ctx)) { @@ -48,7 +38,7 @@ TransientExpressionContext IScopedExpressionContext.SwitchDatabase(string key) { connection.BeginTransaction(isolationLevel); } - ctx = new(this, connection, Options); + ctx = new(connection, Options); contextCaches[key] = ctx; current = ctx; return ctx; @@ -125,15 +115,15 @@ public async Task RollbackAllTransactionAsync(CancellationToken cancellationToke public Task BeginTransactionAsync(string key = "MainDb" , IsolationLevel isolationLevel = IsolationLevel.Unspecified - , CancellationToken cancellationToken = default) + , CancellationToken cancellationToken = default) => connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).BeginTransactionAsync(isolationLevel, cancellationToken); - public Task CommitTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default) + public Task CommitTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default) => connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).CommitTransactionAsync(cancellationToken); - public Task RollbackTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default) + public Task RollbackTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default) => connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).RollbackTransactionAsync(cancellationToken); #endif diff --git a/src/LightORM/ExpressionSql/TransientContext.cs b/src/LightORM/ExpressionSql/TransientContext.cs new file mode 100644 index 00000000..a5f18cbf --- /dev/null +++ b/src/LightORM/ExpressionSql/TransientContext.cs @@ -0,0 +1,90 @@ +using System.Collections.Concurrent; +using System.Diagnostics.CodeAnalysis; +using System.Threading; + +namespace LightORM; + +internal sealed class TransientContext :ExpressionCoreSqlBase, ITransientContext +{ + private readonly DatabaseConnection connection; + public override SqlAdo Ado => new(connection); + //internal ExpressionSqlOptions Options { get; } + //private readonly + internal TransientContext(DatabaseConnection connection, ExpressionSqlOptions options) + :base(options) + { + //Options = options; + this.connection = connection; + } + +// public MultipleResult QueryMultiple(params IExpSelect[] selects) +// => ExpressionCoreSqlContextMethodImpl.QueryMultiple(Ado, selects); + +// public Task QueryMultipleAsync(IExpSelect[] selects, CancellationToken cancellationToken = default) +// => ExpressionCoreSqlContextMethodImpl.QueryMultipleAsync(Ado, selects, cancellationToken); + +// public IExpSelect Select< +//#if NET8_0_OR_GREATER +// [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties)] +//#endif +// T>() => ExpressionCoreSqlContextMethodImpl.Select(this); + +// #region insert + +// public IExpInsert Insert() => ExpressionCoreSqlContextMethodImpl.Insert(Ado); + +// public IExpInsert Insert(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Insert(Ado, entities); + +// #endregion + +// #region update + +// public IExpUpdate Update() => ExpressionCoreSqlContextMethodImpl.Update(Ado); + +// public IExpUpdate Update(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Update(Ado, entities); + +// #endregion + +// #region delete + +// public IExpDelete Delete() => ExpressionCoreSqlContextMethodImpl.Delete(Ado); + +// public IExpDelete Delete(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Delete(Ado, entities); + +// #endregion + +// #region 数据库表操作 + +// public string? CreateTableSql(Action? action = null) +// { +// var ado = Ado; +// return ExpressionCoreSqlContextMethodImpl.InternalCreateTableSql(ado.Provider, action); +// } + +// public async Task CreateTableAsync(Action? action = null, CancellationToken cancellationToken = default) +// { +// var ado = Ado; +// return await ExpressionCoreSqlContextMethodImpl.InternalCreateTableAsync(ado, Options, action, cancellationToken); +// } + +// public async Task> GetTablesAsync() +// { +// var ado = Ado; +// return await ExpressionCoreSqlContextMethodImpl.InternalGetTablesAsync(ado, Options); +// } + +// public async Task GetTableStructAsync(DbStruct.ReadedTable table) +// { +// var ado = Ado; +// return await ExpressionCoreSqlContextMethodImpl.InternalTableStructAsync(table, ado, Options); +// } + +// public async Task DropTableAsync(CancellationToken cancellationToken = default) +// { +// var ado = Ado; +// var t = TableContext.GetTableInfo(); +// return await ExpressionCoreSqlContextMethodImpl.InternalDropTableAsync(ado, t.TableName, cancellationToken); +// } + +// #endregion +} \ No newline at end of file diff --git a/src/LightORM/ExpressionSql/TransientExpressionCoreSql.cs b/src/LightORM/ExpressionSql/TransientExpressionCoreSql.cs deleted file mode 100644 index b97b3b80..00000000 --- a/src/LightORM/ExpressionSql/TransientExpressionCoreSql.cs +++ /dev/null @@ -1,121 +0,0 @@ -using System.Collections.Concurrent; -using System.Diagnostics.CodeAnalysis; -using System.Threading; - -namespace LightORM.ExpressionSql; - -public readonly struct TransientExpressionContext -{ - private readonly DatabaseConnection connection; - - public SqlAdo Ado => new(connection); - internal ExpressionSqlOptions Options { get; } - internal IContext Context { get; } - - internal TransientExpressionContext(IContext context, DatabaseConnection connection, ExpressionSqlOptions options) - { - Options = options; - Context = context; - this.connection = connection; - } - - public MultipleResult QueryMultiple(params IExpSelect[] selects) - => ExpressionCoreSqlContextMethodImpl.QueryMultiple(Ado, selects); - - public Task QueryMultipleAsync(IExpSelect[] selects, CancellationToken cancellationToken = default) - => ExpressionCoreSqlContextMethodImpl.QueryMultipleAsync(Ado, selects, cancellationToken); - - public IExpSelect Select< -#if NET8_0_OR_GREATER - [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties)] -#endif - T>() => ExpressionCoreSqlContextMethodImpl.Select(Context); - - #region insert - - public IExpInsert Insert() => ExpressionCoreSqlContextMethodImpl.Insert(Ado); - - public IExpInsert Insert(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Insert(Ado, entities); - - #endregion - - #region update - - public IExpUpdate Update() => ExpressionCoreSqlContextMethodImpl.Update(Ado); - - public IExpUpdate Update(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Update(Ado, entities); - - #endregion - - #region delete - - public IExpDelete Delete() => ExpressionCoreSqlContextMethodImpl.Delete(Ado); - - public IExpDelete Delete(params T[] entities) => ExpressionCoreSqlContextMethodImpl.Delete(Ado, entities); - - #endregion - - #region 数据库表操作 - - public string? CreateTableSql(Action? action = null) - { - var ado = Ado; - return ExpressionCoreSqlContextMethodImpl.InternalCreateTableSql(ado.Provider, action); - } - - public async Task CreateTableAsync(Action? action = null, CancellationToken cancellationToken = default) - { - var ado = Ado; - return await ExpressionCoreSqlContextMethodImpl.InternalCreateTableAsync(ado, Options, action, cancellationToken); - } - - public async Task> GetTablesAsync() - { - var ado = Ado; - return await ExpressionCoreSqlContextMethodImpl.InternalGetTablesAsync(ado, Options); - } - - public async Task GetTableStructAsync(DbStruct.ReadedTable table) - { - var ado = Ado; - return await ExpressionCoreSqlContextMethodImpl.InternalTableStructAsync(table, ado, Options); - } - - public async Task DropTableAsync(CancellationToken cancellationToken = default) - { - var ado = Ado; - var t = TableContext.GetTableInfo(); - return await ExpressionCoreSqlContextMethodImpl.InternalDropTableAsync(ado, t.TableName, cancellationToken); - } - - #endregion -} - -[Obsolete] -internal sealed class TransientExpressionCoreSql(string key - , DatabaseConnection connection - , ExpressionSqlOptions options) : ExpressionCoreSqlBase(options), ITransientExpressionContext -{ - private static readonly ConcurrentDictionary> weakCache = new(); - - public override SqlAdo Ado { get; } = new(connection); - - public string Key { get; } = key; - - public static TransientExpressionCoreSql Create(string key, DatabaseConnection connection, ExpressionSqlOptions options) - { - // 尝试从缓存获取 - if (weakCache.TryGetValue(key, out var weakRef)) - { - if (weakRef.TryGetTarget(out var cachedInstance)) - { - return cachedInstance; - } - } - - // 创建新实例并缓存 - var newInstance = new TransientExpressionCoreSql(key, connection, options); - weakCache[key] = new WeakReference(newInstance); - return newInstance; - } -} \ No newline at end of file diff --git a/src/LightORM/Extension/BatchActionHelper.cs b/src/LightORM/Extension/BatchActionHelper.cs index 989936ac..883f5d10 100644 --- a/src/LightORM/Extension/BatchActionHelper.cs +++ b/src/LightORM/Extension/BatchActionHelper.cs @@ -47,8 +47,15 @@ public static List GenBatchInfos(this ITableColumnInfo[] column { isStatic = true; } - dbParameters.Add(new SimpleColumn(col.IsPrimaryKey, col.IsVersionColumn, col.ColumnName, $"{col.PropertyName}_{rowIndex}", col.PropertyName, val, isStatic) + + dbParameters.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}", rowIndex, false, val, isStatic) ); + + if (col.IsVersionColumn) + { + var newVersionValue = SqlBuilder.VersionPlus(val); + dbParameters.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}_n", rowIndex, true, newVersionValue, isStatic)); + } } rowIndex++; pList.Add(dbParameters); diff --git a/src/LightORM/Extension/BatchSqlInfoExtensions.cs b/src/LightORM/Extension/BatchSqlInfoExtensions.cs index 1cd74664..5775d70e 100644 --- a/src/LightORM/Extension/BatchSqlInfoExtensions.cs +++ b/src/LightORM/Extension/BatchSqlInfoExtensions.cs @@ -5,13 +5,13 @@ internal static class BatchSqlInfoExtensions public static Dictionary ToDictionaryParameters(this BatchSqlInfo info) { Dictionary values = []; - foreach (var row in info.Parameters) + foreach (var row in info.RowParameters) { foreach (var col in row) { if (col.Value == null) continue; if (col.IsStaticValue) continue; - values.Add(col.ParameterName, col.Value); + values.Add(col.ValueName, col.Value); } } return values; diff --git a/src/LightORM/Extension/CustomDatabaseExtensions.cs b/src/LightORM/Extension/CustomDatabaseExtensions.cs index 986659fe..ca094509 100644 --- a/src/LightORM/Extension/CustomDatabaseExtensions.cs +++ b/src/LightORM/Extension/CustomDatabaseExtensions.cs @@ -2,7 +2,7 @@ namespace LightORM.Extension; -public static class CustomDatabaseExtensions +internal static class CustomDatabaseExtensions { extension(IDatabaseAdapter database) @@ -23,53 +23,6 @@ public void HandleBooleanValue(StringBuilder sql, bool value) { sql.Append(database.FormatBooleanValue(value)); } - - internal string GetValueExpression(SimpleColumn col) - { - if (col.Value is null) - { - return "NULL"; - } - if (col.IsStaticValue) - { - var v = FormatStaticValue(database, col.Value); - return v; - } - return database.AttachPrefix(col.ParameterName); - } - - private string FormatStaticValue(object value) - { - return value switch - { - // 字符串:用单引号包裹,并转义单引号(基础防护) - string s => $"'{s.Replace("'", "''")}'", - - // 布尔值:根据 SQL 标准,多数数据库用 1/0,PostgreSQL 用 true/false - bool b => database.FormatBooleanValue(b), - - // 整数类型 - sbyte or byte or short or ushort or int or uint or long or ulong => $"{value}", - - // 浮点数 - float f => f.ToString(System.Globalization.CultureInfo.InvariantCulture), - double d => d.ToString(System.Globalization.CultureInfo.InvariantCulture), - decimal m => m.ToString(System.Globalization.CultureInfo.InvariantCulture), - - // 日期时间(可选支持) - DateTime dt => $"'{dt:yyyy-MM-dd HH:mm:ss}'", -#if NET6_0_OR_GREATER - DateOnly dOnly => $"'{dOnly:yyyy-MM-dd}'", - TimeOnly tOnly => $"'{tOnly:HH:mm:ss}'", -#endif - // Guid(可选) - Guid g => $"'{g}'", - - // 不支持的类型:抛出异常或返回 NULL / 占位符 - _ => throw new NotSupportedException($"Static value of type '{value.GetType()}' is not supported in SQL literal generation.") - }; - } - } extension(StringBuilder sql) @@ -113,18 +66,66 @@ public StringBuilder AppendJoined(List values, string separator) return sql; } - //public static StringBuilder AppendJoined(this StringBuilder sql, ref SlimList values, string separator) - //{ - // for (int i = 0; i < values.Count; i++) - // { - // if (i > 0) - // { - // sql.Append(separator); - // } - // sql.Append(values[i]); - // } - // return sql; - //} + public StringBuilder AppendSimpleColumnParameter(SimpleColumn col, IDatabaseAdapter database) + { + //sql.WithPrefix(col.PropName, database); + //sql.Append('_'); + //sql.Append(col.RowIndex); + //if (col.IsNewVersion) + //{ + // sql.Append("_n"); + //} + sql.WithPrefix(col.ValueName, database); + return sql; + } + + internal void AppendSimpleColumnValueExpression(SimpleColumn col, IDatabaseAdapter database) + { + if (col.Value is null) + { + sql.Append("NULL"); + return; + } + if (col.IsStaticValue) + { + var v = FormatStaticValue(database, col.Value!); + sql.Append(v); + return; + } + AppendSimpleColumnParameter(sql, col, database); + } + + private static string FormatStaticValue(IDatabaseAdapter database, object value) + { + return value switch + { + // 字符串:用单引号包裹,并转义单引号(基础防护) + string s => $"'{s.Replace("'", "''")}'", + + // 布尔值:根据 SQL 标准,多数数据库用 1/0,PostgreSQL 用 true/false + bool b => database.FormatBooleanValue(b), + + // 整数类型 + sbyte or byte or short or ushort or int or uint or long or ulong => $"{value}", + + // 浮点数 + float f => f.ToString(System.Globalization.CultureInfo.InvariantCulture), + double d => d.ToString(System.Globalization.CultureInfo.InvariantCulture), + decimal m => m.ToString(System.Globalization.CultureInfo.InvariantCulture), + + // 日期时间(可选支持) + DateTime dt => $"'{dt:yyyy-MM-dd HH:mm:ss}'", +#if NET6_0_OR_GREATER + DateOnly dOnly => $"'{dOnly:yyyy-MM-dd}'", + TimeOnly tOnly => $"'{tOnly:HH:mm:ss}'", +#endif + // Guid(可选) + Guid g => $"'{g}'", + + // 不支持的类型:抛出异常或返回 NULL / 占位符 + _ => throw new NotSupportedException($"Static value of type '{value.GetType()}' is not supported in SQL literal generation.") + }; + } public StringBuilder AppendTableName(IDatabaseAdapter database, TableInfo ti, bool useAlias = true, bool useEmphasis = true) { @@ -147,10 +148,11 @@ public StringBuilder AppendTableName(IDatabaseAdapter database, TableInfo ti, bo return sql; } - public StringBuilder AppendEntryColumns(ICollection entries) + public StringBuilder AppendEntryColumns(ICollection entries, string? prefix = null) { foreach (MapEntry entry in entries) { + sql.Append(prefix); sql.Append(entry.Column); sql.Append(','); } @@ -158,6 +160,18 @@ public StringBuilder AppendEntryColumns(ICollection entries) return sql; } + public StringBuilder AppendEntryColumns(ITableColumnInfo[] entries, IDatabaseAdapter database, string? prefix = null) + { + foreach (var entry in entries) + { + sql.Append(prefix); + sql.AppendEmphasis(entry.ColumnName, database); + sql.Append(','); + } + sql.RemoveLast(1); + return sql; + } + public StringBuilder AppendEntryValues(ICollection entries) { foreach (MapEntry entry in entries) diff --git a/src/LightORM/Extension/ExpressionContextExtension.cs b/src/LightORM/Extension/ExpressionContextExtension.cs index 8e100c07..baff1da1 100644 --- a/src/LightORM/Extension/ExpressionContextExtension.cs +++ b/src/LightORM/Extension/ExpressionContextExtension.cs @@ -158,7 +158,7 @@ public ILightOrmRepository GetRepository< return new DefaultRepository(context); } - private TransientExpressionContext SwitchDb() + private ITransientContext SwitchDb() { var table = TableContext.GetTableInfo(); if (table.TargetDatabase is null) @@ -264,7 +264,7 @@ public static class ScopedExpressionContextExtensions { extension(IScopedExpressionContext context) { - private TransientExpressionContext SwitchDb() + private ITransientContext SwitchDb() { var table = TableContext.GetTableInfo(); if (table.TargetDatabase is null) diff --git a/src/LightORM/Extension/IncludeContextExtensions.cs b/src/LightORM/Extension/IncludeContextExtensions.cs index 6a19f5be..a34ac8f6 100644 --- a/src/LightORM/Extension/IncludeContextExtensions.cs +++ b/src/LightORM/Extension/IncludeContextExtensions.cs @@ -96,14 +96,14 @@ private static SelectBuilder BuildSql(IDatabaseAdapter database, IncludeInfo inc { var mapTable = TableInfo.Create(include.NavigateInfo!.MappingType, selectSql.NextTableIndex); var subCol = mapTable.GetColumnInfo(mainNav.SubName!); - selectSql.Joins.Add(new JoinInfo(mapTable) + selectSql.AddJoin(new JoinInfo(mapTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {selectSql.MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" }); subCol = parentTable.GetColumnInfo(include.NavigateInfo!.SubName!); parentTable.Index = selectSql.NextTableIndex; - selectSql.Joins.Add(new JoinInfo(parentTable) + selectSql.AddJoin(new JoinInfo(parentTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {parentTable.Alias}.{database.AttachEmphasis(include.ParentWhereColumn!.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" @@ -113,7 +113,7 @@ private static SelectBuilder BuildSql(IDatabaseAdapter database, IncludeInfo inc { var subCol = parentTable.GetColumnInfo(include.NavigateInfo!.SubName!); parentTable.Index = selectSql.NextTableIndex; - selectSql.Joins.Add(new JoinInfo(parentTable) + selectSql.AddJoin(new JoinInfo(parentTable) { JoinType = TableLinkType.InnerJoin, Where = $"( {parentTable.Alias}.{database.AttachEmphasis(include.ParentWhereColumn!.ColumnName)} = {selectSql.MainTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" diff --git a/src/LightORM/Extension/SelectHandleExtensions.cs b/src/LightORM/Extension/SelectHandleExtensions.cs index d397b601..ee610759 100644 --- a/src/LightORM/Extension/SelectHandleExtensions.cs +++ b/src/LightORM/Extension/SelectHandleExtensions.cs @@ -60,7 +60,7 @@ internal void JoinHandle(Expression? exp joinInfo.IsSubQuery = true; joinInfo.SubQuery = subQuery.SqlBuilder; } - select.SqlBuilder.Joins.Add(joinInfo); + select.SqlBuilder.AddJoin(joinInfo); } internal void JoinHandle(Type type, Expression? exp, TableLinkType joinType) @@ -75,7 +75,7 @@ internal void JoinHandle(Type type, Expression? exp, TableLinkType joinType) JoinType = joinType, }; //joinInfo.EntityInfo.Deep = select.SqlBuilder.Level; - select.SqlBuilder.Joins.Add(joinInfo); + select.SqlBuilder.AddJoin(joinInfo); } internal void JoinHandle(Expression? exp, TableLinkType joinType, IExpTemp tempQuery) @@ -90,7 +90,7 @@ internal void JoinHandle(Expression? exp, TableLinkType joinType, IExpTem JoinType = joinType, }; select.SqlBuilder.HandleTempsRecursion(tempQuery.SqlBuilder); - select.SqlBuilder.Joins.Add(joinInfo); + select.SqlBuilder.AddJoin(joinInfo); } internal void HandleResult(Expression? exp, string? template) @@ -146,7 +146,7 @@ internal void JoinHandle(Type type, Expression? exp joinInfo.IsSubQuery = true; joinInfo.SubQuery = subQuery.SqlBuilder; } - builder.Joins.Add(joinInfo); + builder.AddJoin(joinInfo); } } } diff --git a/src/LightORM/Implements/CustomDatabaseAdapter.cs b/src/LightORM/Implements/CustomDatabaseAdapter.cs index b693791b..abf6bb75 100644 --- a/src/LightORM/Implements/CustomDatabaseAdapter.cs +++ b/src/LightORM/Implements/CustomDatabaseAdapter.cs @@ -138,7 +138,7 @@ public virtual void HandleInsertOrUpdate(UpsertContext context) throw new NotImplementedException(); } - public virtual void HandleBatchInsert(BatchActionContext context) + public virtual void HandleBatchInsert(BatchActionContext> context) { var batchs = context.Batchs; var builder = context.Builder; @@ -147,10 +147,11 @@ public virtual void HandleBatchInsert(BatchActionContext context) foreach (var item in batchs) { using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); PreHandleInsertBuilder(sb); - for (int i = 0; i < item.Parameters.Count; i++) + for (int i = 0; i < item.RowParameters.Count; i++) { - List? dic = item.Parameters[i]; + List? dic = item.RowParameters[i]; if (i > 0) { sb.Append(','); @@ -159,7 +160,10 @@ public virtual void HandleBatchInsert(BatchActionContext context) sb.Append('('); foreach (var c in dic) { - sb.Append(this.GetValueExpression(c)); + if (c.IsNewVersion) + continue; + //sb.Append(database.GetValueExpression(c)); + sb.AppendSimpleColumnValueExpression(c, database); sb.Append(','); } sb.RemoveLast(1); @@ -188,7 +192,7 @@ void PreHandleInsertBuilder(StringBuilder sb) } } - public virtual void HandleBatchUpdate(BatchActionContext context) + public virtual void HandleBatchUpdate(BatchActionContext> context) { var batchs = context.Batchs; var builder = context.Builder; @@ -199,6 +203,7 @@ public virtual void HandleBatchUpdate(BatchActionContext context) // 每一个BatchSqInfo就是每批次更新的数据量 //StringBuilder sb = new("UPDATE "); using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); sb.Append("UPDATE "); //sb.Append(GetTableName(database, MainTable, false)); sb.AppendTableName(database, builder.MainTable, false); @@ -211,29 +216,32 @@ public virtual void HandleBatchUpdate(BatchActionContext context) sb.AppendEmphasis(col.ColumnName, database); sb.AppendLine(" = CASE"); // 每一条记录的参数数量 - for (var rowIndex = 0; rowIndex < batch.Parameters.Count; rowIndex++) + for (var rowIndex = 0; rowIndex < batch.RowParameters.Count; rowIndex++) { - var rowDatas = batch.Parameters[rowIndex]; - var currentCol = rowDatas.First(r => r.PropName == col.PropertyName); - if (currentCol.IsVersion) - { - var newVersion = SqlBuilder.VersionPlus(currentCol.Value); - var newCol = currentCol with { ParameterName = $"{currentCol.ParameterName}_n", Value = newVersion, IsVersion = false }; - rowDatas.Add(newCol); - currentCol = newCol; - } + var rowDatas = batch.RowParameters[rowIndex]; bool first = true; sb.Append(" WHEN "); - foreach (var item in rowDatas.Where(r => r.IsPrimaryKey || r.IsVersion)) + foreach (var item in rowDatas.Where(r => r.IsPrimaryKey || (r.IsVersion && !r.IsNewVersion))) { if (!first) sb.Append(" AND "); first = false; sb.AppendEmphasis(item.ColumnName, database); sb.Append(" = "); - sb.WithPrefix(item.ParameterName, database); + //sb.WithPrefix(item.ParameterName, database); + sb.AppendSimpleColumnParameter(item, database); } sb.Append(" THEN "); - sb.AppendLine(database.GetValueExpression(currentCol)); + var currentCol = rowDatas.First(r => + { + if (r.IsVersion) + { + return r.IsNewVersion && r.PropName == col.PropertyName; + } + return r.PropName == col.PropertyName; + }); + //sb.AppendLine(database.GetValueExpression(currentCol)); + sb.AppendSimpleColumnValueExpression(currentCol, database); + sb.AppendLine(); } sb.Append("END, "); @@ -241,7 +249,7 @@ public virtual void HandleBatchUpdate(BatchActionContext context) sb.RemoveLast(2); - var pValues = batch.Parameters.SelectMany(rowDatas => rowDatas.Where(r => r.IsPrimaryKey | r.IsVersion)).GroupBy(c => c.ColumnName).ToList(); + var pValues = batch.RowParameters.SelectMany(rowDatas => rowDatas.Where(r => r.IsPrimaryKey | (r.IsVersion && !r.IsNewVersion))).GroupBy(c => c.ColumnName).ToList(); if (pValues.Count == 0 && builder.Where.Count == 0) { throw new LightOrmException($"类型{builder.MainTable.Type}, 没有主键并且缺失Where条件"); @@ -261,7 +269,8 @@ public virtual void HandleBatchUpdate(BatchActionContext context) sb.Append(" IN ("); foreach (var i in item) { - sb.WithPrefix(i.ParameterName, database); + sb.AppendSimpleColumnParameter(i, database); + sb.Append(','); } sb.RemoveLast(1); @@ -295,6 +304,7 @@ public virtual void HandleBatchDelete(BatchActionContext> co foreach (var batch in batchs) { using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); sb.Append("DELETE FROM "); //sb.AppendLine(GetTableName(database, MainTable, false)); sb.AppendTableName(database, builder.MainTable, false).AppendLine(); @@ -306,9 +316,9 @@ public virtual void HandleBatchDelete(BatchActionContext> co break; } sb.Append('('); - for (int rowIndex = 0; rowIndex < batch.Parameters.Count; rowIndex++) + for (int rowIndex = 0; rowIndex < batch.RowParameters.Count; rowIndex++) { - List? row = batch.Parameters[rowIndex]; + List? row = batch.RowParameters[rowIndex]; if (keyColumns.Length > 1) { sb.Append('('); @@ -320,10 +330,11 @@ public virtual void HandleBatchDelete(BatchActionContext> co } sb.AppendEmphasis(row[i].ColumnName, database); sb.Append(" = "); - sb.WithPrefix(row[i].ParameterName, database); + //sb.WithPrefix(row[i].ParameterName, database); + sb.AppendSimpleColumnParameter(row[i], database); } sb.Append(')'); - if (rowIndex < batch.Parameters.Count - 1) + if (rowIndex < batch.RowParameters.Count - 1) sb.Append(" OR "); } else @@ -335,8 +346,9 @@ public virtual void HandleBatchDelete(BatchActionContext> co sb.Append(" IN ("); } - sb.WithPrefix(row[0].ParameterName, database); - if (rowIndex < batch.Parameters.Count - 1) + //sb.WithPrefix(row[0].ParameterName, database); + sb.AppendSimpleColumnParameter(row[0], database); + if (rowIndex < batch.RowParameters.Count - 1) sb.Append(','); else sb.Append(')'); diff --git a/src/LightORM/Interfaces/ExpSql/ISql.cs b/src/LightORM/Interfaces/ExpSql/ISql.cs index 4c109ed5..d7a77551 100644 --- a/src/LightORM/Interfaces/ExpSql/ISql.cs +++ b/src/LightORM/Interfaces/ExpSql/ISql.cs @@ -1,4 +1,5 @@ -using System.Threading; +using System.Runtime.CompilerServices; +using System.Threading; namespace LightORM.Interfaces.ExpSql; public interface ISql @@ -15,6 +16,13 @@ public interface ISql : ISql #endregion + #region 日志输出辅助 + + TPart TagWith(string tag); + TPart TagWithCallSite(string tag, [CallerFilePath] string? filePath = null, [CallerMemberName] string? callMember = null, [CallerLineNumber] int? lineNum = null); + + #endregion + } public interface ISqlWhereAndExecute : ISql diff --git a/src/LightORM/Interfaces/IDatabaseAdapter.cs b/src/LightORM/Interfaces/IDatabaseAdapter.cs index c103232e..56943dd5 100644 --- a/src/LightORM/Interfaces/IDatabaseAdapter.cs +++ b/src/LightORM/Interfaces/IDatabaseAdapter.cs @@ -40,9 +40,9 @@ public interface IDatabaseAdapter internal void HandleInsertOrUpdate(UpsertContext context); - internal void HandleBatchInsert(BatchActionContext context); + internal void HandleBatchInsert(BatchActionContext> context); - internal void HandleBatchUpdate(BatchActionContext context); + internal void HandleBatchUpdate(BatchActionContext> context); internal void HandleBatchDelete(BatchActionContext> context); } diff --git a/src/LightORM/Interfaces/IExpressionContext.cs b/src/LightORM/Interfaces/IExpressionContext.cs index 2df6f64c..359e2002 100644 --- a/src/LightORM/Interfaces/IExpressionContext.cs +++ b/src/LightORM/Interfaces/IExpressionContext.cs @@ -24,9 +24,9 @@ IExpSelect Select< /// /// 后的数据库操作对象 /// -public interface ITransientExpressionContext : IDefinedTableAction, IContext +public interface ITransientContext : IDefinedTableAction, IContext { - internal string Key { get; } + //internal string Key { get; } } @@ -79,7 +79,7 @@ IExpSelect FromTemp< //IExpDelete Delete(); //IExpDelete Delete(params T[] entities); ISingleScopedExpressionContext Use(IDatabaseProvider db); - TransientExpressionContext SwitchDatabase(string key); + ITransientContext SwitchDatabase(string key); /// /// 创建指定数据库的单元操作对象,支持事务 @@ -125,7 +125,7 @@ public interface IDefinedTableAction public interface IScopedExpressionContext : IDisposable, IDefinedTableAction, IContext { SqlAdo DefaultAdo { get; } - TransientExpressionContext SwitchDatabase(string key); + ITransientContext SwitchDatabase(string key); string Id { get; } void BeginTransaction(string key = ConstString.Main, IsolationLevel isolationLevel = IsolationLevel.Unspecified); void CommitTransaction(string key = ConstString.Main); diff --git a/src/LightORM/Models/BatchSqlInfo.cs b/src/LightORM/Models/BatchSqlInfo.cs index bb59692c..e34be089 100644 --- a/src/LightORM/Models/BatchSqlInfo.cs +++ b/src/LightORM/Models/BatchSqlInfo.cs @@ -1,33 +1,23 @@ namespace LightORM.Models { - //internal class SimpleColumn - //{ - // public SimpleColumn(bool isPrimaryKey, string columnName, string parameterName, string propName, object? val) - // { - // IsPrimaryKey = isPrimaryKey; - // ColumnName = columnName; - // ParameterName = parameterName; - // PropName = propName; - // Value = val; - // } - // public bool IsPrimaryKey { get; set; } - // public bool IsVersion { get; set; } - // public string ColumnName { get; set; } - // public string ParameterName { get; set; } - // public string PropName { get; set; } - // public object? Value { get; set; } - //} - internal record SimpleColumn(bool IsPrimaryKey, bool IsVersion, string ColumnName, string ParameterName, string PropName, object? Value, bool IsStaticValue); - internal record BatchParameters(ITableColumnInfo Column, List Parameters); - internal class BatchSqlInfo + internal readonly record struct SimpleColumn(ITableColumnInfo Column + , string ValueName + , int RowIndex + , bool IsNewVersion + , object? Value + , bool IsStaticValue) { - public BatchSqlInfo(List> parameters, int index) - { - Parameters = parameters; - Index = index; - } - public int Index { get; set; } + public bool IsPrimaryKey => Column.IsPrimaryKey; + public bool IsVersion => Column.IsVersionColumn; + public string PropName => Column.PropertyName; + public string ColumnName => Column.ColumnName; + + } + //internal record BatchParameters(ITableColumnInfo Column, List Parameters); + internal class BatchSqlInfo(List> parameters, int index) + { + public int Index { get; set; } = index; public string? Sql { get; set; } - public List> Parameters { get; set; } + public List> RowParameters { get; set; } = parameters; } } diff --git a/src/LightORM/Models/JsonColumnContext.cs b/src/LightORM/Models/JsonColumnContext.cs index c356d296..6543bb37 100644 --- a/src/LightORM/Models/JsonColumnContext.cs +++ b/src/LightORM/Models/JsonColumnContext.cs @@ -32,8 +32,17 @@ public enum ActionType internal readonly record struct UpsertContext(SqlBuilder Builder, StringBuilder Sql, Dictionary ColumnValueMap, Dictionary Parameters, bool IgnoreWhenMap, IDatabaseAdapter ScopedAdapter); -internal readonly record struct BatchActionContext(SqlBuilder Builder, ITableColumnInfo[] TargetColumns, List Batchs, IDatabaseAdapter ScopedAdapter); -internal readonly record struct BatchActionContext(TBuilder Builder, ITableColumnInfo[] TargetColumns, List Batchs, IDatabaseAdapter ScopedAdapter) where TBuilder : SqlBuilder; +internal readonly record struct BatchActionContext(SqlBuilder Builder + , ITableColumnInfo[] TargetColumns + , List Batchs + , Dictionary Parameters + , IDatabaseAdapter ScopedAdapter); + +internal readonly record struct BatchActionContext(TBuilder Builder + , ITableColumnInfo[] TargetColumns + , List Batchs + , Dictionary Parameters + , IDatabaseAdapter ScopedAdapter) where TBuilder : SqlBuilder; public readonly record struct JsonColumnParameterContext(ActionType ActionType , ITableColumnInfo Column diff --git a/src/LightORM/Models/TableInfo.cs b/src/LightORM/Models/TableInfo.cs index 856065a8..4c4a6a69 100644 --- a/src/LightORM/Models/TableInfo.cs +++ b/src/LightORM/Models/TableInfo.cs @@ -1,6 +1,6 @@ namespace LightORM.Models; -public class TableInfo +public record TableInfo { private const string ALIAS = "abcdefghijklmnopqrstuvwyz"; private int index; diff --git a/src/LightORM/Performances/SelectBuilderPool.cs b/src/LightORM/Performances/SelectBuilderPool.cs index 93b47229..d7ac9a83 100644 --- a/src/LightORM/Performances/SelectBuilderPool.cs +++ b/src/LightORM/Performances/SelectBuilderPool.cs @@ -29,9 +29,9 @@ public static void Return(SelectBuilder builder) private static void ResetBuilder(SelectBuilder builder) { // 清空列表但保留容量 + builder.ClearJoins(); builder.SelectedTables.Clear(); builder.Where.Clear(); - builder.Joins.Clear(); builder.OrderBy.Clear(); builder.Having.Clear(); builder.Includes?.Clear(); @@ -71,7 +71,6 @@ private static void ClearBuilder(SelectBuilder builder) // 如果列表容量过大,重建以释放内存 ShrinkListIfLarge(builder.Where); ShrinkListIfLarge(builder.OrderBy); - ShrinkListIfLarge(builder.Joins); // ... 其他列表 } diff --git a/src/LightORM/Providers/DeleteProvider.cs b/src/LightORM/Providers/DeleteProvider.cs index b7613f7c..b482ea1a 100644 --- a/src/LightORM/Providers/DeleteProvider.cs +++ b/src/LightORM/Providers/DeleteProvider.cs @@ -1,4 +1,5 @@ using LightORM.Extension; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; @@ -46,6 +47,21 @@ public IExpDelete QuoteIdentifiers() #endregion + #region 日志输出辅助 + + public IExpDelete TagWith(string tag) + { + sqlBuilder.AddTag(new(tag, null, null, null, false)); + return this; + } + public IExpDelete TagWithCallSite(string tag, [CallerFilePath] string? filePath = null, [CallerMemberName] string? callMember = null, [CallerLineNumber] int? lineNum = null) + { + sqlBuilder.AddTag(new(tag, filePath, callMember, lineNum, true)); + return this; + } + + #endregion + public int Execute() { var sql = sqlBuilder.ToSqlString(Database); @@ -158,13 +174,13 @@ public string ToSqlWithParameters() foreach (var batch in sqlBuilder.BatchInfos ?? []) { sb.AppendLine($"批量删除,批次:{batch.Index}"); - foreach (var item in batch.Parameters) + foreach (var item in batch.RowParameters) { sb.AppendLine("----行数据"); item.ForEach(row => { if (row.IsStaticValue) return; - sb.AppendLine($"--------{row.ParameterName} - {row.Value}"); + sb.AppendLine($"--------{row.ValueName} - {row.Value}"); }); } } diff --git a/src/LightORM/Providers/InsertProvider.cs b/src/LightORM/Providers/InsertProvider.cs index 69068751..027c3a73 100644 --- a/src/LightORM/Providers/InsertProvider.cs +++ b/src/LightORM/Providers/InsertProvider.cs @@ -1,4 +1,5 @@ using LightORM.Extension; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; @@ -44,6 +45,21 @@ public IExpInsert QuoteIdentifiers() #endregion + #region 日志输出辅助 + + public IExpInsert TagWith(string tag) + { + sqlBuilder.AddTag(new(tag, null, null, null, false)); + return this; + } + public IExpInsert TagWithCallSite(string tag, [CallerFilePath] string? filePath = null, [CallerMemberName] string? callMember = null, [CallerLineNumber] int? lineNum = null) + { + sqlBuilder.AddTag(new(tag, filePath, callMember, lineNum, true)); + return this; + } + + #endregion + public void SetTargetObject(T? entity) { sqlBuilder.TargetObject = entity; @@ -249,13 +265,13 @@ public string ToSqlWithParameters() foreach (var batch in sqlBuilder.BatchInfos ?? []) { sb.AppendLine($"批量插入,批次:{batch.Index}"); - foreach (var item in batch.Parameters) + foreach (var item in batch.RowParameters) { sb.AppendLine("----行数据"); item.ForEach(row => { if (row.IsStaticValue) return; - sb.AppendLine($"--------{row.ParameterName} - {row.Value}"); + sb.AppendLine($"--------{row.ValueName} - {row.Value}"); }); } } diff --git a/src/LightORM/Providers/UpdateProvider.cs b/src/LightORM/Providers/UpdateProvider.cs index a604d2ad..b22787a5 100644 --- a/src/LightORM/Providers/UpdateProvider.cs +++ b/src/LightORM/Providers/UpdateProvider.cs @@ -1,4 +1,5 @@ using LightORM.Extension; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; @@ -43,6 +44,22 @@ public IExpUpdate QuoteIdentifiers() } #endregion + + #region 日志输出辅助 + + public IExpUpdate TagWith(string tag) + { + sqlBuilder.AddTag(new(tag, null, null, null, false)); + return this; + } + public IExpUpdate TagWithCallSite(string tag, [CallerFilePath] string? filePath = null, [CallerMemberName] string? callMember = null, [CallerLineNumber] int? lineNum = null) + { + sqlBuilder.AddTag(new(tag, filePath, callMember, lineNum, true)); + return this; + } + + #endregion + public int Execute() { var sql = sqlBuilder.ToSqlString(Database); @@ -282,13 +299,13 @@ public string ToSqlWithParameters() foreach (var batch in sqlBuilder.BatchInfos ?? []) { sb.AppendLine($"批量更新,批次:{batch.Index}"); - foreach (var item in batch.Parameters) + foreach (var item in batch.RowParameters) { sb.AppendLine("----行数据"); item.ForEach(row => { if (row.IsStaticValue) return; - sb.AppendLine($"--------{row.ParameterName} - {row.Value}"); + sb.AppendLine($"--------{row.ValueName} - {row.Value}"); }); } } diff --git a/src/LightORM/Repository/LightOrmQueryProvider.cs b/src/LightORM/Repository/LightOrmQueryProvider.cs index fa1422dd..61109456 100644 --- a/src/LightORM/Repository/LightOrmQueryProvider.cs +++ b/src/LightORM/Repository/LightOrmQueryProvider.cs @@ -62,7 +62,7 @@ private LightOrmQuery HandleJoinExpression(MethodCallExpress var exp = new ExpressionInfo(SqlResolveOptions.Join, joinCondition); select.Expressions.Add(exp); var ei = TableInfo.Create(joinType, select.NextTableIndex); - select.Joins.Add(new JoinInfo(ei) + select.AddJoin(new JoinInfo(ei) { ExpressionId = exp.Id, JoinType = TableLinkType.InnerJoin, diff --git a/src/LightORM/Utils/ExpressionResolver.cs b/src/LightORM/Utils/ExpressionResolver.cs index 36fde86f..1162d852 100644 --- a/src/LightORM/Utils/ExpressionResolver.cs +++ b/src/LightORM/Utils/ExpressionResolver.cs @@ -10,7 +10,7 @@ namespace LightORM; internal static class ExpressionExtensions { - private readonly record struct CacheKey(SqlAction SqlAction, ulong hash); + private readonly record struct CacheKey(SqlAction SqlAction, ulong Hash); private static readonly ConcurrentDictionary expressionResolvedResultCache = new(); public static ExpressionResolvedResult Resolve(this Expression? expression, SqlResolveOptions options, ResolveContext context) { @@ -24,7 +24,7 @@ public static ExpressionResolvedResult Resolve(this Expression? expression, SqlR hash = ExpressionHasher.Default.ComputeHash64(expression); Debug.WriteLineIf(ShowExpressionHashCodeDebugInfo, $"hashcocde: {hash}"); } - CacheKey key = new (options.SqlAction, hash); + CacheKey key = new(options.SqlAction, hash); if (enableCache && expressionResolvedResultCache.TryGetValue(key, out var result)) { //result.DbParameters @@ -364,7 +364,7 @@ Indexer GetResolvedIndex(bool shouldReset = true) else if (exp.NodeType == ExpressionType.Convert) { IsVisitConvert = true; - Visit(exp.Operand); + Visit(exp.Operand); IsVisitConvert = false; } else @@ -463,6 +463,10 @@ static MemberExpression SafeCreateProperty(Expression expression, string propert return null; } +#if NET8_0_OR_GREATER + [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "根据已知类型构建导航条件")] + [UnconditionalSuppressMessage("AOT", "IL2026", Justification = "根据已知类型构建导航条件")] +#endif Expression? VisitMember(MemberExpression exp) { Debug.WriteLineIf(ShowExpressionResolveDebugInfo, $"{Options.SqlAction} {Options.SqlType}: MemberExpression: {exp}"); @@ -487,6 +491,14 @@ static MemberExpression SafeCreateProperty(Expression expression, string propert if (Members.Count > 0) { MemberOfNavigateMember = Members.Pop().Member.Name; + var p = Expression.Parameter(col.NavigateInfo!.NavigateType); + var propAccess = Expression.Property(p, MemberOfNavigateMember); + var right = CurrentBinary?.Right; + if (right is not null) + { + var body = Expression.Equal(propAccess, right); + NavigateWhereExpression = [Expression.Lambda(body, p)]; + } } Members.Clear(); } diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.BatchInsert.cs new file mode 100644 index 00000000..e3a9e542 --- /dev/null +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.BatchInsert.cs @@ -0,0 +1,117 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; + +namespace LightORM.Providers.Dameng; + +internal partial class CustomDamengAdapter +{ + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) + { + UpsertBatchInsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void UpsertBatchInsert(BatchActionContext> context) + { + var builder = context.Builder; + var database = context.ScopedAdapter; + var batchs = context.Batchs; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); + sb.AppendLine("USING ("); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + List? row = batch.RowParameters[i]; + if (i > 0) + { + sb.AppendLine(" UNION ALL"); + } + sb.Append(" SELECT "); + foreach (var c in row) + { + if (c.IsStaticValue) + { + //sb.Append(database.GetValueExpression(c)); + sb.AppendSimpleColumnValueExpression(c, database); + } + else + { + //sb.WithPrefix(c.ParameterName, database); + sb.AppendSimpleColumnParameter(c, database); + } + if (c.IsNewVersion) + { + sb.Append(" AS ").Append(c.PropName).Append("_n").Append(','); + } + else + { + sb.Append(" AS ").AppendEmphasis(c.ColumnName, database).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(" FROM DUAL"); + } + sb.AppendLine(") s"); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + if (i == 0) + sb.Append("ON (t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + else + sb.Append(" AND t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + } + sb.AppendLine(")"); + if (!builder.IgnoreOnConflict) + { + sb.AppendLine("WHEN MATCHED THEN"); + sb.Append(" UPDATE SET"); + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (kv.IsVersionColumn) + { + var verionName = $"{kv.PropertyName}_n"; + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").Append(verionName).Append(','); + } + else + { + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(kv.ColumnName, database).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(); + foreach (var kv in columns) + { + if (!kv.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.Append("t.").AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(kv.ColumnName, database).Append(' '); + } + sb.AppendLine(); + } + sb.AppendLine("WHEN NOT MATCHED THEN"); + sb.Append(" INSERT (") + .AppendEntryColumns(columns, database) + .Append(") VALUES (") + .AppendEntryColumns(columns, database, "s.") + .Append(')'); + batch.Sql = sb.ToString(); + } + } +} diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs index d70b2ee1..7ccb1ec4 100644 --- a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs @@ -1,11 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Dameng; @@ -18,9 +13,20 @@ public override void HandleInsertOrUpdate(UpsertContext context) var sb = context.Sql; sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); sb.Append("USING (SELECT "); - foreach (var e in columnValueMaps.Values) + foreach (var kv in columnValueMaps) { + var e = kv.Value; + var c = kv.Key; sb.Append(e.Value).Append(" AS ").Append(e.Column).Append(','); + if (c.IsVersionColumn) + { + var oldVersion = context.Parameters[c.PropertyName]; + var newVersion = SqlBuilder.VersionPlus(oldVersion); + var verionName = $"{c.PropertyName}_n"; + context.Parameters[verionName] = newVersion; + sb.Append(' '); + sb.WithPrefix(verionName, database).Append(" AS ").Append(verionName).Append(','); + } } sb.RemoveLast(1); sb.AppendLine(" FROM DUAL ) s"); @@ -44,12 +50,9 @@ public override void HandleInsertOrUpdate(UpsertContext context) continue; if (kv.Key.IsVersionColumn) { - var oldVersion = context.Parameters[kv.Key.PropertyName]; - var newVersion = SqlBuilder.VersionPlus(oldVersion); var verionName = $"{kv.Key.PropertyName}_n"; - context.Parameters[verionName] = newVersion; sb.Append(' '); - sb.Append(kv.Value.Column).Append(" = ").WithPrefix(verionName, database).Append(','); + sb.Append(kv.Value.Column).Append(" = ").Append("s.").Append(verionName).Append(','); } else { @@ -64,7 +67,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) if (!kv.Key.IsVersionColumn) continue; sb.Append(" WHERE "); - sb.Append(kv.Value.Column).Append(" = ").Append(kv.Value.Value).Append(' '); + sb.Append("t.").Append(kv.Value.Column).Append(" = ").Append("s.").Append(kv.Value.Column).Append(' '); } sb.AppendLine(); } @@ -72,7 +75,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) sb.Append(" INSERT (") .AppendEntryColumns(columnValueMaps.Values) .Append(") VALUES (") - .AppendEntryValues(columnValueMaps.Values) + .AppendEntryColumns(columnValueMaps.Values, "s.") .Append(')'); } diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs index 2052aa9e..6eee1536 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs @@ -8,7 +8,116 @@ namespace LightORM.Providers.Oracle; internal partial class CustomOracleAdapter { - public override void HandleBatchInsert(BatchActionContext context) + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) + { + UpsertBatchInsert(context); + } + else + { + NormalBatchInsert(context); + } + + } + + private static void UpsertBatchInsert(BatchActionContext> context) + { + var builder = context.Builder; + var database = context.ScopedAdapter; + var batchs = context.Batchs; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); + sb.AppendLine("USING ("); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + List? row = batch.RowParameters[i]; + if (i > 0) + { + sb.AppendLine(" UNION ALL"); + } + sb.Append(" SELECT "); + foreach (var c in row) + { + if (c.IsStaticValue) + { + //sb.Append(database.GetValueExpression(c)); + sb.AppendSimpleColumnValueExpression(c, database); + } + else + { + //sb.WithPrefix(c.ParameterName, database); + sb.AppendSimpleColumnParameter(c, database); + } + if (c.IsNewVersion) + { + sb.Append(" AS ").Append(c.PropName).Append("_n").Append(','); + } + else + { + sb.Append(" AS ").AppendEmphasis(c.ColumnName, database).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(" FROM DUAL"); + } + sb.AppendLine(") s"); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + if (i == 0) + sb.Append("ON (t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + else + sb.Append(" AND t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + } + sb.AppendLine(")"); + if (!builder.IgnoreOnConflict) + { + sb.AppendLine("WHEN MATCHED THEN"); + sb.Append(" UPDATE SET"); + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (kv.IsVersionColumn) + { + var verionName = $"{kv.PropertyName}_n"; + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").Append(verionName).Append(','); + } + else + { + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(kv.ColumnName, database).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(); + foreach (var kv in columns) + { + if (!kv.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(kv.ColumnName, database).Append(' '); + } + sb.AppendLine(); + } + sb.AppendLine("WHEN NOT MATCHED THEN"); + sb.Append(" INSERT (") + .AppendEntryColumns(columns, database) + .Append(") VALUES (") + .AppendEntryColumns(columns, database, "s.") + .Append(')'); + batch.Sql = sb.ToString(); + } + } + + private static void NormalBatchInsert(BatchActionContext> context) { var batchs = context.Batchs; var builder = context.Builder; @@ -18,22 +127,25 @@ public override void HandleBatchInsert(BatchActionContext context) { //StringBuilder sb = new("INSERT ALL"); using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); sb.AppendLine("INSERT ALL"); - for (int i = 0; i < item.Parameters.Count; i++) + for (int i = 0; i < item.RowParameters.Count; i++) { AttachInserts(sb); - List? dic = item.Parameters[i]; + List? dic = item.RowParameters[i]; sb.Append('('); foreach (var c in dic) { - sb.Append(this.GetValueExpression(c)); + if (c.IsNewVersion) + continue; + sb.AppendSimpleColumnValueExpression(c, database); sb.Append(','); } sb.RemoveLast(1); sb.AppendLine(")"); } sb.Append("SELECT 1 FROM DUAL"); - builder.HandleSqlParameters(sb, this); + builder.HandleSqlParameters(sb, database); item.Sql = sb.ToString(); } @@ -45,7 +157,7 @@ void AttachInserts(StringBuilder sb) sb.Append(" ("); foreach (var item in insertColumns) { - sb.AppendEmphasis(item.ColumnName, this); + sb.AppendEmphasis(item.ColumnName, database); sb.Append(','); } sb.RemoveLast(1); diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs index 04e1aabf..08a7eb80 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs @@ -1,11 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Oracle; @@ -18,9 +13,20 @@ public override void HandleInsertOrUpdate(UpsertContext context) var sb = context.Sql; sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); sb.Append("USING (SELECT "); - foreach (var e in columnValueMaps.Values) + foreach (var kv in columnValueMaps) { + var e = kv.Value; + var c = kv.Key; sb.Append(e.Value).Append(" AS ").Append(e.Column).Append(','); + if (c.IsVersionColumn) + { + var oldVersion = context.Parameters[c.PropertyName]; + var newVersion = SqlBuilder.VersionPlus(oldVersion); + var verionName = $"{c.PropertyName}_n"; + context.Parameters[verionName] = newVersion; + sb.Append(' '); + sb.WithPrefix(verionName,database).Append(" AS ").Append(verionName).Append(','); + } } sb.RemoveLast(1); sb.AppendLine(" FROM DUAL ) s"); @@ -44,12 +50,9 @@ public override void HandleInsertOrUpdate(UpsertContext context) continue; if (kv.Key.IsVersionColumn) { - var oldVersion = context.Parameters[kv.Key.PropertyName]; - var newVersion = SqlBuilder.VersionPlus(oldVersion); var verionName = $"{kv.Key.PropertyName}_n"; - context.Parameters[verionName] = newVersion; sb.Append(' '); - sb.Append(kv.Value.Column).Append(" = ").WithPrefix(verionName, database).Append(','); + sb.Append(kv.Value.Column).Append(" = ").Append("s.").Append(verionName).Append(','); } else { @@ -64,7 +67,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) if (!kv.Key.IsVersionColumn) continue; sb.Append(" WHERE "); - sb.Append(kv.Value.Column).Append(" = ").Append(kv.Value.Value).Append(' '); + sb.Append(kv.Value.Column).Append(" = ").Append("s.").Append(kv.Value.Column).Append(' '); } sb.AppendLine(); } @@ -72,8 +75,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) sb.Append(" INSERT (") .AppendEntryColumns(columnValueMaps.Values) .Append(") VALUES (") - .AppendEntryValues(columnValueMaps.Values) + .AppendEntryColumns(columnValueMaps.Values,"s.") .Append(')'); } - } diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs index b9e2572f..5e44ae90 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs @@ -79,7 +79,7 @@ void OnConflict() sb.Append(" WHERE "); sb.AppendTableName(database, context.Builder.MainTable, false) .Append('.') - .Append(kv.Value.Column).Append(" = ").Append(kv.Value.Value).Append(' '); + .Append(kv.Value.Column).Append(" = ").Append("EXCLUDED.").Append(kv.Value.Column).Append(' '); } } } diff --git a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs index eef00247..f004f0a6 100644 --- a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs @@ -1,7 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System.Text; namespace LightORM.Providers.SqlServer; @@ -14,9 +13,20 @@ public override void HandleInsertOrUpdate(UpsertContext context) var sb = context.Sql; sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); sb.Append("USING (SELECT "); - foreach (var e in columnValueMaps.Values) + foreach (var kv in columnValueMaps) { + var e = kv.Value; + var c = kv.Key; sb.Append(e.Value).Append(" AS ").Append(e.Column).Append(','); + if (c.IsVersionColumn) + { + var oldVersion = context.Parameters[c.PropertyName]; + var newVersion = SqlBuilder.VersionPlus(oldVersion); + var verionName = $"{c.PropertyName}_n"; + context.Parameters[verionName] = newVersion; + sb.Append(' '); + sb.WithPrefix(verionName, database).Append(" AS ").Append(verionName).Append(','); + } } sb.RemoveLast(1); sb.AppendLine(") s"); @@ -49,12 +59,9 @@ public override void HandleInsertOrUpdate(UpsertContext context) continue; if (kv.Key.IsVersionColumn) { - var oldVersion = context.Parameters[kv.Key.PropertyName]; - var newVersion = SqlBuilder.VersionPlus(oldVersion); var verionName = $"{kv.Key.PropertyName}_n"; - context.Parameters[verionName] = newVersion; sb.Append(' '); - sb.Append(kv.Value.Column).Append(" = ").WithPrefix(verionName, database).Append(','); + sb.Append(kv.Value.Column).Append(" = ").Append("s.").Append(verionName).Append(','); } else { @@ -76,7 +83,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) sb.Append(" INSERT (") .AppendEntryColumns(columnValueMaps.Values) .Append(") VALUES (") - .AppendEntryValues(columnValueMaps.Values) + .AppendEntryColumns(columnValueMaps.Values, "s.") .Append(");"); } } diff --git a/test/BenchmarkTest/StringBuilderPoolTest.cs b/test/BenchmarkTest/StringBuilderPoolTest.cs index fc4a37ad..67217889 100644 --- a/test/BenchmarkTest/StringBuilderPoolTest.cs +++ b/test/BenchmarkTest/StringBuilderPoolTest.cs @@ -35,7 +35,7 @@ public string SimpleSelectNoPool() var db = ExpSqlFactory.GetContext(); var select = db.Select(); var builder = select.SqlBuilder; - var database = select.Executor.Provider.DatabaseAdapter; + var database = select.Ado.Provider.DatabaseAdapter; return builder.ToSqlString(database); } @@ -45,7 +45,7 @@ public string SimpleSelectWithPool() var db = ExpSqlFactory.GetContext(); var select = db.Select(); var builder = select.SqlBuilder; - var database = select.Executor.Provider.DatabaseAdapter; + var database = select.Ado.Provider.DatabaseAdapter; return builder.ToSqlString(database); } @@ -117,7 +117,7 @@ public string CTENoPool() t }); var builder = select.SqlBuilder; - var database = select.Executor.Provider.DatabaseAdapter; + var database = select.Ado.Provider.DatabaseAdapter; return builder.ToSqlString(database); } @@ -189,7 +189,7 @@ public string CTEWithPool() t }); var builder = select.SqlBuilder; - var database = select.Executor.Provider.DatabaseAdapter; + var database = select.Ado.Provider.DatabaseAdapter; return builder.ToSqlString(database); } diff --git a/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs b/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs new file mode 100644 index 00000000..9cb53cf1 --- /dev/null +++ b/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace LightORMTest.Dameng.ResultTest; + +[TestClass] +public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest +{ + public override DbBaseType DbType => DatabaseType.Dameng; + + protected override void Configura(IExpressionContextSetup option) + { + option.UseDameng(ConnectString.Value); + option.UseInterceptor(); + } +} diff --git a/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs b/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs new file mode 100644 index 00000000..864c9048 --- /dev/null +++ b/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace LightORMTest.Oracle.SqlGenerate; + +[TestClass] +public class UpdateSql : LightORMTest.SqlGenerate.UpdateSql +{ + public override DbBaseType DbType => DbBaseType.Oracle; + + protected override void Configura(IExpressionContextSetup option) + { + option.UseOracle(ConnectString.Value); + option.UseInterceptor(); + } +} diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/InsertOrUpdateTest.cs new file mode 100644 index 00000000..a8d1a6d7 --- /dev/null +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/InsertOrUpdateTest.cs @@ -0,0 +1,13 @@ +namespace LightORMTest.PostgreSQL.SqlGenerate; + +[TestClass] +public class InsertOrUpdateTest : LightORMTest.SqlGenerate.InsertOrUpdateTest +{ + public override DbBaseType DbType => DbBaseType.PostgreSQL; + + protected override void Configura(IExpressionContextSetup option) + { + option.UsePostgreSQL(ConnectString.Value); + option.UseInterceptor(); + } +} \ No newline at end of file diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs index 1021b77c..5b926bd1 100644 --- a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs @@ -1,4 +1,6 @@ -namespace LightORMTest.PostgreSQL.SqlGenerate; +using LightORM.Providers.Oracle.Extensions; + +namespace LightORMTest.PostgreSQL.SqlGenerate; [TestClass] public class SelectSql : LightORMTest.SqlGenerate.SelectSql diff --git a/test/LightORMTest.SqlServer/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest.SqlServer/SqlGenerate/InsertOrUpdateTest.cs new file mode 100644 index 00000000..2bea8e2f --- /dev/null +++ b/test/LightORMTest.SqlServer/SqlGenerate/InsertOrUpdateTest.cs @@ -0,0 +1,13 @@ +namespace LightORMTest.SqlServer.SqlGenerate; + +[TestClass] +public class InsertOrUpdateTest : LightORMTest.SqlGenerate.InsertOrUpdateTest +{ + public override DbBaseType DbType => DbBaseType.SqlServer; + + protected override void Configura(IExpressionContextSetup option) + { + option.UseSqlServer(LightORM.Providers.SqlServer.SqlServerVersion.V1, ConnectString.Value); + option.UseInterceptor(); + } +} \ No newline at end of file diff --git a/test/LightORMTest/CreateTableTest.cs b/test/LightORMTest/CreateTableTest.cs index 5aa1d939..dbb506e3 100644 --- a/test/LightORMTest/CreateTableTest.cs +++ b/test/LightORMTest/CreateTableTest.cs @@ -33,6 +33,7 @@ public async Task CreateTable() { using var db = this.Db.CreateMainDbScoped(); await db.DropTableAsync(TestContext.CancellationToken); + await db.DropTableAsync(TestContext.CancellationToken); await db.DropTableAsync(TestContext.CancellationToken); await db.DropTableAsync(TestContext.CancellationToken); await db.DropTableAsync(TestContext.CancellationToken); @@ -41,6 +42,7 @@ public async Task CreateTable() await db.DropTableAsync(TestContext.CancellationToken); await db.DropTableAsync(TestContext.CancellationToken); await db.CreateTableAsync(cancellationToken: TestContext.CancellationToken); + await db.CreateTableAsync(cancellationToken: TestContext.CancellationToken); await db.CreateTableAsync(cancellationToken: TestContext.CancellationToken); await db.CreateTableAsync(cancellationToken: TestContext.CancellationToken); await db.CreateTableAsync(cancellationToken: TestContext.CancellationToken); diff --git a/test/LightORMTest/Models/User.cs b/test/LightORMTest/Models/User.cs index 7e3eff60..5d4572d3 100644 --- a/test/LightORMTest/Models/User.cs +++ b/test/LightORMTest/Models/User.cs @@ -44,15 +44,17 @@ public class User [LightNavigate(ManyToMany = typeof(UserRole), MainName = nameof(UserId), SubName = nameof(UserRole.UserId))] public IEnumerable UserRoles { get; set; } - [LightNavigate(nameof(Id), nameof(City.Uid))] - public City City { get; set; } - + [LightNavigate(nameof(UserId), nameof(UserProfile.UserId))] + public UserProfile Profile { get; set; } } -[LightTable] -public class City +[LightTable(Name = "USER_PROFILE")] +public class UserProfile { - public int Uid { get; set; } - public string Id { get; set; } - public string Name { get; set; } + [LightColumn(Name = "USER_ID")] + public string UserId { get; set; } + [LightColumn(Name = "PHONE")] + public string Phone { get; set; } + [LightColumn(Name = "ADDRESS")] + public string Address { get; set; } } \ No newline at end of file diff --git a/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs b/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs index b18417b3..9404b5db 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs @@ -1,4 +1,4 @@ -using System.Text; +using System.Text; namespace LightORMTest.ResultTest; @@ -7,12 +7,20 @@ public partial class ExecutionTest [TestInitialize] public async Task InitDatas() { - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); - await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Delete() + .FullDelete().TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new User() { @@ -49,8 +57,66 @@ await Db.Insert([ IsLock = true, Password = "helloworld", Sign = SignType.Svip + }, + new User() + { + UserId = "test05", + UserName = "Test5", + Age = 22, + IsLock = true, + Password = "helloworld", + Sign = SignType.Svip + }, + new User() + { + UserId = "test06", + UserName = "Test6", + Age = 18, + IsLock = false, + Password = "helloworld", + Sign = SignType.Svip } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); + await Db.Insert([ + new UserProfile() + { + UserId = "test01", // 对应 User 的 UserId + Phone = "13800138001", + Address = "北京市朝阳区建国路1号" + }, + new UserProfile() + { + UserId = "test02", + Phone = "13800138002", + Address = "上海市浦东新区陆家嘴环路2号" + }, + new UserProfile() + { + UserId = "test03", + Phone = "13800138003", + Address = "广州市天河区天河路3号" + }, + new UserProfile() + { + UserId = "test04", + Phone = "13800138004", + Address = "深圳市南山区科技园路4号" + }, + new UserProfile() + { + UserId = "test05", + Phone = "13800138005", + Address = "东莞市桥头镇科技园路7号" + }, + new UserProfile() + { + UserId = "test06", + Phone = "13800138006", + Address = "佛山市禅城区育才路8号" + } + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new UserRole() { @@ -71,8 +137,24 @@ await Db.Insert([ { UserId = "test03", RoleId = "SuperAdmin" + }, + new UserRole() + { + UserId = "test04", + RoleId = "Normal" + }, + new UserRole() + { + UserId = "test05", + RoleId = "Normal" + }, + new UserRole() + { + UserId = "test06", + RoleId = "Normal" } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new Role() { @@ -83,8 +165,14 @@ await Db.Insert([ { RoleId = "SuperAdmin", RoleName = "超级管理员" + }, + new Role() + { + RoleId = "Normal", + RoleName = "普通用户" } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new Permission() { @@ -218,7 +306,8 @@ await Db.Insert([ Path = "", Sort = 4 } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new RolePermission() { @@ -320,7 +409,8 @@ await Db.Insert([ RoleId = "SuperAdmin", PermissionId = "P010" } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); await Db.Insert([ new Sales { Region = "华东", Province = "上海", Product = "笔记本电脑", Amount = 1500, Version = 1 }, new Sales { Region = "华东", Province = "江苏", Product = "笔记本电脑", Amount = 2200, Version = 1 }, @@ -350,6 +440,7 @@ await Db.Insert([ new Sales { Region = "西北", Province = "青海", Product = "键盘鼠标", Amount = 100, Version = 1 }, new Sales { Region = "西北", Province = "宁夏", Product = "键盘鼠标", Amount = 80, Version = 1 }, new Sales { Region = "西北", Province = "新疆", Product = "键盘鼠标", Amount = 150, Version = 1 } - ]).ExecuteAsync(TestContext.CancellationToken); + ]) + .TagWith("初始化数据").ExecuteAsync(TestContext.CancellationToken); } } diff --git a/test/LightORMTest/ResultTest/ExecutionTest.cs b/test/LightORMTest/ResultTest/ExecutionTest.cs index 621ed5dd..c76d67a4 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.cs @@ -263,7 +263,11 @@ public async Task DeleteTest() Assert.AreEqual(1, dc); dc = await Db.Delete().Where(u => u.UserRoles.Any(ur => ur.RoleId == "Admin")).ExecuteAsync(TestContext.CancellationToken); + Assert.AreEqual(2, dc); + var p = "13800138006"; + dc = await Db.Delete().Where(u => u.Profile.Phone == p).ExecuteAsync(TestContext.CancellationToken); Assert.AreEqual(1, dc); + } [TestMethod] @@ -328,6 +332,54 @@ public async Task InsertOrUpdateTest() Assert.AreEqual(1, e4); } + [TestMethod] + public async Task InsertOrUpdateBatchTest() + { + var nr1 = new Role() + { + RoleId = "Admin", + RoleName = "管理员22" + }; + var nr2 = new Role() + { + RoleId = "SuperAdmin", + RoleName = "超级管理员22" + }; + //await Db.Insert(nr).ExecuteAsync(TestContext.CancellationToken); + var e1 = await Db.Insert(nr1, nr2).IgnoreIfExits().ExecuteAsync(TestContext.CancellationToken); + var e2 = await Db.Insert(nr1, nr2).OrUpdate().ExecuteAsync(TestContext.CancellationToken); + Assert.AreEqual(0, e1); + if (DbType == DbBaseType.MySql) + Assert.AreEqual(2, e2); + else + Assert.AreEqual(2, e2); + var nu1 = new Sales() + { + Region = "华东", + Province = "上海", + Product = "笔记本电脑2", + Amount = 111, + Version = 1, + }; + + var nu2 = new Sales() + { + Region = "华东", + Province = "江苏", + Product = "笔记本电脑2", + Amount = 222, + Version = 1, + }; + + var e3 = await Db.Insert(nu1, nu2).IgnoreIfExits().ExecuteAsync(TestContext.CancellationToken); + var e4 = await Db.Insert(nu1, nu2).OrUpdate().ExecuteAsync(TestContext.CancellationToken); + Assert.AreEqual(0, e3); + if (DbType == DbBaseType.MySql) + Assert.AreEqual(2, e4); + else + Assert.AreEqual(2, e4); + } + [NotNull] public TestContext? TestContext { get; set; } } diff --git a/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs index 40255d36..999bc87b 100644 --- a/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs +++ b/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs @@ -15,7 +15,32 @@ public void InsertOrUpdateSingle() Age = 18, UserName = "测试", }; - var sql = Db.Insert(user).OrUpdate().NoQuoteIdentifiers().ToSqlWithParameters(); + var sql = Db.Insert(user).OrUpdate().ToSqlWithParameters(); + Console.WriteLine(sql); + } + + [TestMethod] + public void InsertOrUpdateBatch() + { + var user = new User() + { + UserId = "testUpsert1", + Age = 18, + UserName = "测试1", + }; + var user1 = new User() + { + UserId = "testUpsert2", + Age = 19, + UserName = "测试2", + }; + var user2 = new User() + { + UserId = "testUpsert3", + Age = 20, + UserName = "测试3", + }; + var sql = Db.Insert(user, user1, user2).OrUpdate().ToSqlWithParameters(); Console.WriteLine(sql); } } diff --git a/test/LightORMTest/SqlGenerate/SelectSql.cs b/test/LightORMTest/SqlGenerate/SelectSql.cs index e19e0300..8bda6ab3 100644 --- a/test/LightORMTest/SqlGenerate/SelectSql.cs +++ b/test/LightORMTest/SqlGenerate/SelectSql.cs @@ -189,14 +189,14 @@ public void Select_Navigate_Where_Single() var sql = Db.Select() // 两种写法都可以 //.Where(u => u.UserRoles.Where(r => r.RoleId.Contains("admin")).Any()) - .Where(u => u.City.Name.StartsWith("D")) + .Where(u => u.Profile.Address.StartsWith("D")) .ToSql(); Console.WriteLine(sql); var sql2 = Db.Select() // 两种写法都可以 //.Where(u => u.UserRoles.Where(r => r.RoleId.Contains("admin")).Any()) - .Where(u => u.City.Name.StartsWith("D")) + .Where(u => u.Profile.Address.StartsWith("D")) .ToSql(); Console.WriteLine(sql2); } @@ -650,7 +650,7 @@ public void TestRowNumberWindowFunc() var sql = Db.Select() .ToSql(u => new { - RowNo = WinFn.RowNumber().PartitionBy(u.City.Name).OrderBy(u.Id).Value(), + RowNo = WinFn.RowNumber().PartitionBy(u.Profile.Phone).OrderBy(u.Id).Value(), u.UserId, u.UserName, u.Password diff --git a/test/LightORMTest/SqlGenerate/UpdateSql.cs b/test/LightORMTest/SqlGenerate/UpdateSql.cs index 63299115..9a7396b1 100644 --- a/test/LightORMTest/SqlGenerate/UpdateSql.cs +++ b/test/LightORMTest/SqlGenerate/UpdateSql.cs @@ -158,12 +158,12 @@ List GetList() { return new List { - new() , - new() , - new() , - new() , - new() , - new() , + new() { UserId = "01", UserName = "p1"}, + new() { UserId = "02", UserName = "p2"} , + new() { UserId = "03", UserName = "p3"}, + new() { UserId = "04", UserName = "p4"}, + new() { UserId = "05", UserName = "p5"}, + new() { UserId = "06", UserName = "p6"}, }; } } diff --git a/test/LightORMTest/TestBase.cs b/test/LightORMTest/TestBase.cs index 2163c5e0..6e577bfb 100644 --- a/test/LightORMTest/TestBase.cs +++ b/test/LightORMTest/TestBase.cs @@ -60,8 +60,8 @@ public class LightOrmAop : AdoInterceptorBase { public override void AfterExecute(SqlExecuteContext context) { - //if (context.Sql?.Contains("-- ") == false) - // return; + if (context.Sql?.Contains("初始化数据") == true) + return; Debug.WriteLine($""" @@ -76,14 +76,16 @@ public override void AfterExecute(SqlExecuteContext context) """); - IEnumerable DisplayParameter(object? p) + + } + + private static IEnumerable DisplayParameter(object? p) + { + if (p is Dictionary dic) { - if (p is Dictionary dic) + foreach (var item in dic) { - foreach (var item in dic) - { - yield return $"{item.Key} - {item.Value}"; - } + yield return $"{item.Key} - {item.Value}"; } } } @@ -98,6 +100,11 @@ public override void OnException(SqlExecuteExceptionContext context) Debug.WriteLine($"{context.TraceId}:{context.Exception.Message}"); Debug.WriteLine(context.Sql); Debug.WriteLine("====================================="); + Debug.WriteLine("参数:"); + foreach (var item in DisplayParameter(context.Parameter)) + { + Debug.WriteLine(item); + } } public override void OnPrepareCommand(SqlExecuteContext context) @@ -108,7 +115,7 @@ public override void OnPrepareCommand(SqlExecuteContext context) public class JsonHandler : ILightJsonHelper { - public object? Deserialize(string json,Type type) + public object? Deserialize(string json, Type type) { return System.Text.Json.JsonSerializer.Deserialize(json, type); } From 765dc76842be22012d0b2b4d04563a1d3f479800 Mon Sep 17 00:00:00 2001 From: MarvelTiter_yaoqinglin Date: Sat, 29 Aug 2026 22:38:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LightORM/Builder/DeleteBuilder.cs | 107 +++--- src/LightORM/Builder/SelectBuilder.cs | 11 - src/LightORM/Builder/SqlBuilder.cs | 27 +- .../ExpressionSql/ExpressionCoreSqlBase.cs | 3 +- .../ExpressionCoreSqlContextMethodImpl.cs | 11 +- src/LightORM/Extension/BatchActionHelper.cs | 8 +- .../Extension/CustomDatabaseExtensions.cs | 28 ++ src/LightORM/Extension/StringBuilderHelper.cs | 18 +- .../Implements/BaseDatabaseHandler.cs | 30 +- .../Implements/CustomDatabaseAdapter.cs | 14 +- src/LightORM/Implements/WriteTableFromType.cs | 19 +- .../Interfaces/IDatabaseTableHandler.cs | 2 +- src/LightORM/Models/DataBaseOption.cs | 2 +- src/LightORM/Models/TableInfo.cs | 10 +- src/LightORM/Providers/DeleteProvider.cs | 4 +- .../ExpressionBuilder.ExternalHelper.cs | 114 +++++- src/LightORM/SqlExecutor/ExpressionBuilder.cs | 98 +----- src/LightORM/Utils/ExpressionResolver.cs | 8 +- src/LightORM/Utils/ResolveContext.cs | 29 +- .../TableContextGenerator.cs | 2 +- .../DamengProvider.cs | 2 +- ...Writer.cs => DamengTableHandler.Writer.cs} | 7 +- .../DamengTableHandler.cs | 5 +- .../LightORM.Providers.Dameng.csproj | 2 +- .../KingbaseESProvider.cs | 2 +- ...er.cs => KingbaseESTableHandler.Writer.cs} | 7 +- .../KingbaseESTableHandler.cs | 5 +- .../LightORM.Providers.KingbaseES.csproj | 2 +- .../CustomMySqlAdapter.BatchInsert.cs | 167 +++++++++ .../CustomMySqlAdapter.InertOrUpdate.cs | 65 +++- .../LightORM.Providers.MySql.csproj | 2 +- .../LightORM.Providers.MySql/MySqlProvider.cs | 2 +- ...eWriter.cs => MySqlTableHandler.Writer.cs} | 7 +- .../MySqlTableHandler.cs | 5 +- .../CustomOracleAdapter.cs | 8 +- .../OracleProvider.cs | 2 +- ...Writer.cs => OracleTableHandler.Writer.cs} | 17 +- .../OracleTableHandler.cs | 36 +- .../CustomPostgreSQL.BatchInsert.cs | 324 ++++++++++++++++++ .../LightORM.Providers.PostgreSQL.csproj | 2 +- ...er.cs => PostgreSQLTableHandler.Writer.cs} | 22 +- .../PostgreSQLTableHandler.cs | 11 +- .../PostgresSQLProvider.cs | 4 +- .../LightORM.Providers.SqlServer.csproj | 2 +- .../SqlServerProvider.cs | 2 +- ...ter.cs => SqlServerTableHandler.Writer.cs} | 7 +- .../SqlServerTableHandler.cs | 5 +- .../LightORM.Providers.Sqlite.csproj | 2 +- .../SqliteProvider.cs | 2 +- ...Writer.cs => SqliteTableHandler.Writer.cs} | 7 +- .../SqliteTableHandler.cs | 5 +- test/LightORMTest.MySql/MSTestSettings.cs | 2 +- test/LightORMTest.Oracle/MSTestSettings.cs | 2 +- .../LightORMTest.PostgreSQL/MSTestSettings.cs | 2 +- .../ResultTest/JsonTest.cs | 23 +- test/LightORMTest/MSTestSettings.cs | 2 +- test/LightORMTest/Models/User.cs | 8 +- .../ResultTest/ExecutionTest.InitData.cs | 4 +- .../ResultTest/ExecutionTest.Trans.cs | 2 +- test/LightORMTest/ResultTest/ExecutionTest.cs | 49 +-- test/LightORMTest/ResultTest/JsonTest.cs | 118 +++---- test/LightORMTest/TestBase.cs | 2 +- 62 files changed, 1076 insertions(+), 421 deletions(-) rename src/Providers/LightORM.Providers.Dameng/{TableStructure/DamengTableWriter.cs => DamengTableHandler.Writer.cs} (97%) rename src/Providers/LightORM.Providers.KingbaseES/{TableStructure/KingbaseESTableWriter.cs => KingbaseESTableHandler.Writer.cs} (96%) create mode 100644 src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs rename src/Providers/LightORM.Providers.MySql/{TableStructure/MySqlTableWriter.cs => MySqlTableHandler.Writer.cs} (96%) rename src/Providers/LightORM.Providers.Oracle/{TableStructure/OracleTableWriter.cs => OracleTableHandler.Writer.cs} (93%) create mode 100644 src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs rename src/Providers/LightORM.Providers.PostgreSQL/{TableStructure/PostgreSQLTableWriter.cs => PostgreSQLTableHandler.Writer.cs} (91%) rename src/Providers/LightORM.Providers.SqlServer/{TableStructure/SqlServerTableWriter.cs => SqlServerTableHandler.Writer.cs} (96%) rename src/Providers/LightORM.Providers.Sqlite/{TableStructure/SqliteTableWriter.cs => SqliteTableHandler.Writer.cs} (96%) diff --git a/src/LightORM/Builder/DeleteBuilder.cs b/src/LightORM/Builder/DeleteBuilder.cs index c848cd67..a5a9091a 100644 --- a/src/LightORM/Builder/DeleteBuilder.cs +++ b/src/LightORM/Builder/DeleteBuilder.cs @@ -16,6 +16,13 @@ internal class DeleteBuilder : SqlBuilder public bool Truncate { get; set; } HashSet Members { get; set; } = []; public List? BatchInfos { get; set; } + + public override void AddTableInfo(TableInfo tableInfo) + { + tableInfo.FullAlias = true; + base.AddTableInfo(tableInfo); + } + #if NET8_0_OR_GREATER [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "根据已知类型构建导航条件")] [UnconditionalSuppressMessage("AOT", "IL2026", Justification = "根据已知类型构建导航条件")] @@ -33,90 +40,63 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e { continue; } - var navSqlBuilder = SelectBuilder.GetSelectBuilder(); - navSqlBuilder.IsSubQuery = true; - navSqlBuilder.Depth = 1; - navSqlBuilder.AddTableInfo(MainTable with { Depth = 1 }); - var selectMain = navSqlBuilder.MainTable; var navInfo = navColumn.NavigateInfo!; - var mainCol = selectMain.GetColumnInfo(navInfo.MainName!); + var mainCol = MainTable.GetColumnInfo(navInfo.MainName!); var targetType = navInfo.NavigateType; - var targetTable = TableInfo.Create(targetType, navSqlBuilder.NextTableIndex); + var targetTable = TableInfo.Create(targetType); + targetTable.Depth++; //navSqlBuilder.SelectValue = $"{selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)}"; - var mainParameter = Expression.Parameter(selectMain.Type); + var mainParameter = MainTable.Parameter!; var tarParameter = Expression.Parameter(targetType); var mainMember = Expression.Property(mainParameter, navInfo.MainName!); + var navSqlBuilder = SelectBuilder.GetSelectBuilder(); + navSqlBuilder.IsSubQuery = true; + navSqlBuilder.Depth = 1; + navSqlBuilder.SetResolveParentContext(ResolveCtx!); if (navInfo.MappingType != null) { var mappingParameter = Expression.Parameter(navInfo.MappingType); + var mappingTable = TableInfo.Create(navInfo.MappingType); + navSqlBuilder.AddTableInfo(mappingTable); var targetNav = targetTable.GetNavigateColumns(c => c.NavigateInfo?.MappingType == navInfo.MappingType).First().NavigateInfo!; var targetCol = targetTable.GetColumnInfo(targetNav.MainName!); - //var mapTable = TableInfo.Create(navInfo.MappingType, 1); - //var subCol = mapTable.GetColumnInfo(navInfo.SubName!); - //TryJoin(mapTable); - //navSqlBuilder.AddJoin(new JoinInfo(mapTable) - //{ - // JoinType = TableLinkType.InnerJoin, - // Where = $"( {selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" - //}); - var subMember = Expression.Property(mappingParameter, navInfo.SubName!); - var body = Expression.Equal(mainMember, subMember); - var joinWhere = Expression.Lambda(body, mainParameter, mappingParameter); - navSqlBuilder.JoinHandle(navInfo.MappingType, joinWhere, TableLinkType.InnerJoin); - //subCol = mapTable.GetColumnInfo(targetNav.SubName!); - //targetTable.Index += 1; - //navSqlBuilder.AddJoin(new JoinInfo(targetTable) - //{ - // JoinType = TableLinkType.InnerJoin, - // Where = $"( {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )" - //}); + //var subMember = Expression.Property(mappingParameter, navInfo.SubName!); + //var body = Expression.Equal(mainMember, subMember); + //var joinWhere = Expression.Lambda(body, mainParameter, mappingParameter); + //navSqlBuilder.JoinHandle(navInfo.MappingType, joinWhere, TableLinkType.InnerJoin); var tarMainMember = Expression.Property(tarParameter, targetNav.MainName!); var tarSubMember = Expression.Property(mappingParameter, targetNav.SubName!); var tarBody = Expression.Equal(tarMainMember, tarSubMember); - var joinTarWhere = Expression.Lambda(tarBody, mainParameter, mappingParameter, tarParameter); + var joinTarWhere = Expression.Lambda(tarBody, mappingParameter, tarParameter); navSqlBuilder.JoinHandle(navInfo.NavigateType, joinTarWhere, TableLinkType.InnerJoin); - + var mapMainMember = Expression.Property(mappingParameter, navInfo.SubName!); + var mainWhere = Expression.Equal(mapMainMember, mainMember); + var innerLambda = Expression.Lambda(mainWhere, mappingParameter); + var outerLambda = Expression.Lambda(innerLambda, mainParameter); + navSqlBuilder.Expressions.Add(new ExpressionInfo(SqlResolveOptions.Where, outerLambda.Body)); } else { - var tarMainMember = Expression.Property(mainParameter, navInfo.MainName!); - var tarSubMember = Expression.Property(tarParameter, navInfo.SubName!); - var tarBody = Expression.Equal(tarMainMember, tarSubMember); - var joinTarWhere = Expression.Lambda(tarBody, mainParameter, tarParameter); - navSqlBuilder.JoinHandle(navInfo.NavigateType, joinTarWhere, TableLinkType.InnerJoin); - //var targetCol = targetTable.GetColumnInfo(navInfo.SubName!); - //TryJoin(targetTable); - //navSqlBuilder.AddJoin(new JoinInfo(targetTable) - //{ - // JoinType = TableLinkType.InnerJoin, - // Where = $"( {selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {targetTable.Alias}.{database.AttachEmphasis(targetCol.ColumnName)} )" - //}); - //var n = result.MemberOfNavigateMember; - //if (n is not null) - //{ - // var c = targetTable.GetColumn(n); - // if (c is not null) - // { - // string mainColWhere; - // var indexOfLeft = result.SqlString?.IndexOf('('); - // if (indexOfLeft > -1) - // { - // mainColWhere = result.SqlString!.Insert(indexOfLeft.Value + 1, $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}"); - // } - // else - // { - // mainColWhere = $"{targetTable.Alias}.{database.AttachEmphasis(c.ColumnName)}{result.SqlString}"; - // } - // navSqlBuilder.Where.Add(mainColWhere); - // } - //} + navSqlBuilder.AddTableInfo(targetTable); + //var tarMainMember = Expression.Property(mainParameter, navInfo.MainName!); + //var tarSubMember = Expression.Property(tarParameter, navInfo.SubName!); + //var tarBody = Expression.Equal(tarMainMember, tarSubMember); + //var joinTarWhere = Expression.Lambda(tarBody, mainParameter, tarParameter); + //navSqlBuilder.JoinHandle(navInfo.NavigateType, joinTarWhere, TableLinkType.InnerJoin); + + var mapMainMember = Expression.Property(tarParameter, navInfo.SubName!); + var mainWhere = Expression.Equal(mapMainMember, mainMember); + var innerLambda = Expression.Lambda(mainWhere, tarParameter); + var outerLambda = Expression.Lambda(innerLambda, mainParameter); + navSqlBuilder.Expressions.Add(new ExpressionInfo(SqlResolveOptions.Where, outerLambda.Body)); } + if (result.NavigateWhereExpression.TryGetLambdaExpression(out var l) - && l!.Parameters[0].Type == navSqlBuilder.GetJoins().LastOrDefault()?.EntityInfo?.Type) + && l!.Parameters[0].Type == navSqlBuilder.AllTables().LastOrDefault()?.Type) { List ps = [.. navSqlBuilder.AllTables().Select(t => Expression.Parameter(t.TableEntityInfo.Type!))]; @@ -126,10 +106,11 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e navSqlBuilder.Expressions.Add(ee); } - navSqlBuilder.Expressions.Add(new( SqlResolveOptions.Select,Expression.Lambda(mainMember, mainParameter))); + //navSqlBuilder.Expressions.Add(new(SqlResolveOptions.Select, Expression.Lambda(mainMember, mainParameter))); + navSqlBuilder.SelectValue = "1"; using var _ = StringBuilderPool.Get(out var sb); navSqlBuilder.Build(sb, database, navSqlBuilder.Depth); - Where.Add($"{database.AttachEmphasis(mainCol.ColumnName)} IN ({N}{sb})"); + Where.Add($"EXISTS ({N}{sb})"); ResolvedValues.AddRange(navSqlBuilder.ResolvedValues); } } diff --git a/src/LightORM/Builder/SelectBuilder.cs b/src/LightORM/Builder/SelectBuilder.cs index d7a0d91c..680f8962 100644 --- a/src/LightORM/Builder/SelectBuilder.cs +++ b/src/LightORM/Builder/SelectBuilder.cs @@ -65,17 +65,6 @@ internal partial class SelectBuilder : SqlBuilder, ISelectSqlBuilder public object? AdditionalValue { get; set; } public int NextTableIndex => SelectedTables.Count + joins.Count + TableIndexFix; - //protected override Lazy GetAllTables() - //{ - // return new(() => [.. SelectedTables, .. Joins.Select(j => j.EntityInfo)]); - //} - - public void AddTableInfo(TableInfo tableInfo) - { - //tableInfo.Deep = Level; - SelectedTables.Add(tableInfo); - } - public void AddJoin(JoinInfo joinInfo) { joinInfo.EntityInfo.Depth = Depth; diff --git a/src/LightORM/Builder/SqlBuilder.cs b/src/LightORM/Builder/SqlBuilder.cs index edaba96b..b36f389b 100644 --- a/src/LightORM/Builder/SqlBuilder.cs +++ b/src/LightORM/Builder/SqlBuilder.cs @@ -48,8 +48,6 @@ protected virtual void BeforeResolveExpressions(ResolveContext context) internal void HandleSqlParameters(StringBuilder sql, IDatabaseAdapter database) { - //var useParameterized = IsParameterized ?? ExpressionSqlOptions.Instance.Value.UseParameterized; - //var uniqueParameters = ResolvedValues.RemoveProperty(); foreach (var item in ResolvedValues) { if (item.Type == ExpValueType.Null || item.Value is null) @@ -59,11 +57,11 @@ internal void HandleSqlParameters(StringBuilder sql, IDatabaseAdapter database) } if (item.Type == ExpValueType.Boolean) { - sql.Replace(item.Name, database.FormatBooleanValue((bool)item.Value)); + sql.ReplaceWithBoundaryCheck(item.Name, database.FormatBooleanValue((bool)item.Value)); } else if (item.Type == ExpValueType.BooleanReverse) { - sql.Replace(item.Name, database.FormatBooleanValue(!(bool)item.Value)); + sql.ReplaceWithBoundaryCheck(item.Name, database.FormatBooleanValue(!(bool)item.Value)); } else if (item.Type == ExpValueType.Collection) { @@ -78,13 +76,14 @@ internal void HandleSqlParameters(StringBuilder sql, IDatabaseAdapter database) values.Add(database.AttachPrefix(pn)); arrIndex++; } - sql.Replace(item.Name, string.Join(", ", values)); + sql.ReplaceWithBoundaryCheck(item.Name, string.Join(", ", values)); } } else { - sql.Replace(item.Name, database.AttachPrefix(item.Name)); - DbParameters[item.Name] = item.Value; + var succ = sql.ReplaceWithBoundaryCheck(item.Name, database.AttachPrefix(item.Name)); + if (succ) + DbParameters[item.Name] = item.Value; } } } @@ -100,7 +99,7 @@ protected void ResolveExpressions(IDatabaseAdapter database) { return; } - ResolveCtx ??= new ResolveContext(database); + ResolveCtx ??= new ResolveContext(database, [..AllTables()]); BeforeResolveExpressions(ResolveCtx); foreach (var item in Expressions.ExpressionInfos.Values) { @@ -112,7 +111,7 @@ protected void ResolveExpressions(IDatabaseAdapter database) result.SqlString = string.Format(item.Template, result.SqlString); } HandleResult(database, item, result); - if (result.ResolvedValues != null && !result.UseNavigate) + if (result.ResolvedValues != null) ResolvedValues.AddRange(result.ResolvedValues); item.IsCompleted = true; } @@ -217,4 +216,14 @@ internal virtual void WriteTags(StringBuilder sql, string ident = "") sql.AppendLine(); } } + + //protected override Lazy GetAllTables() + //{ + // return new(() => [.. SelectedTables, .. Joins.Select(j => j.EntityInfo)]); + //} + + public virtual void AddTableInfo(TableInfo tableInfo) + { + SelectedTables.Add(tableInfo); + } } \ No newline at end of file diff --git a/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs b/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs index cc9eff87..13ccbded 100644 --- a/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs +++ b/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs @@ -75,8 +75,7 @@ public async Task CreateTableAsync(Action? action = null, public async Task DropTableAsync(CancellationToken cancellationToken = default) { var ado = Ado; - var t = TableContext.GetTableInfo(); - return await ExpressionCoreSqlContextMethodImpl.InternalDropTableAsync(ado, t.TableName, cancellationToken); + return await ExpressionCoreSqlContextMethodImpl.InternalDropTableAsync(ado, cancellationToken); } #endregion diff --git a/src/LightORM/ExpressionSql/ExpressionCoreSqlContextMethodImpl.cs b/src/LightORM/ExpressionSql/ExpressionCoreSqlContextMethodImpl.cs index d9d9c00a..c245ded7 100644 --- a/src/LightORM/ExpressionSql/ExpressionCoreSqlContextMethodImpl.cs +++ b/src/LightORM/ExpressionSql/ExpressionCoreSqlContextMethodImpl.cs @@ -1,4 +1,5 @@ using LightORM.DbStruct; +using LightORM.Extension; using LightORM.Providers; using System.Diagnostics.CodeAnalysis; using System.Threading; @@ -231,14 +232,18 @@ public static async Task InternalTableStructAsync(ReadedTable table return table with { Columns = columns }; } - public static async Task InternalDropTableAsync(SqlAdo ado, string tableName, CancellationToken cancellationToken) + public static async Task InternalDropTableAsync(SqlAdo ado, CancellationToken cancellationToken) { try { if (ado.Provider.DbHandler is null) throw new NotSupportedException(); - var sql = ado.Provider.DbHandler.GetDropTableSql(tableName); - await ado.ExecuteNonQueryAsync(sql, cancellationToken: cancellationToken); + var table = typeof(T).CollectDbTableInfo(); + var sqls = ado.Provider.DbHandler.GetDropTableSql(table); + foreach (var sql in sqls) + { + await ado.ExecuteNonQueryAsync(sql, cancellationToken: cancellationToken); + } return true; } catch diff --git a/src/LightORM/Extension/BatchActionHelper.cs b/src/LightORM/Extension/BatchActionHelper.cs index 883f5d10..9212c6d3 100644 --- a/src/LightORM/Extension/BatchActionHelper.cs +++ b/src/LightORM/Extension/BatchActionHelper.cs @@ -39,7 +39,7 @@ public static List GenBatchInfos(this ITableColumnInfo[] column var pList = new List>(); foreach (var obj in batchList) { - var dbParameters = new List(); + var row = new List(); foreach (var col in columns) { var isStatic = GetValue(col, obj!, additionalParameters, out var val); @@ -48,17 +48,17 @@ public static List GenBatchInfos(this ITableColumnInfo[] column isStatic = true; } - dbParameters.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}", rowIndex, false, val, isStatic) + row.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}", rowIndex, false, val, isStatic) ); if (col.IsVersionColumn) { var newVersionValue = SqlBuilder.VersionPlus(val); - dbParameters.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}_n", rowIndex, true, newVersionValue, isStatic)); + row.Add(new SimpleColumn(col, $"{col.PropertyName}_{rowIndex}_n", rowIndex, true, newVersionValue, isStatic)); } } rowIndex++; - pList.Add(dbParameters); + pList.Add(row); } list.Add(new BatchSqlInfo(pList, i + 1)); diff --git a/src/LightORM/Extension/CustomDatabaseExtensions.cs b/src/LightORM/Extension/CustomDatabaseExtensions.cs index ca094509..9b84b944 100644 --- a/src/LightORM/Extension/CustomDatabaseExtensions.cs +++ b/src/LightORM/Extension/CustomDatabaseExtensions.cs @@ -19,6 +19,15 @@ public string AttachEmphasis(string name) return name; } + public string SafeAttach(string name) + { + if (database.IsKeyWord(name)) + { + return database.Emphasis.Insert(1, name); + } + return name; + } + public void HandleBooleanValue(StringBuilder sql, bool value) { sql.Append(database.FormatBooleanValue(value)); @@ -34,6 +43,25 @@ public StringBuilder WithPrefix(string name, IDatabaseAdapter database) return sql; } + public StringBuilder AppendAlias(string name, IDatabaseAdapter database) + { + if (database.Emphasis.Length != 2) + { + throw new LightOrmException("Emphasis must be exactly 2 characters, e.g., \"[]\" or \"``\"."); + } + if (database.IsKeyWord(name)) + { + sql.Append(database.Emphasis[0]); + sql.Append(name); + sql.Append(database.Emphasis[1]); + } + else + { + sql.Append(name); + } + return sql; + } + public StringBuilder AppendEmphasis(string name, IDatabaseAdapter database) { if (database.Emphasis.Length != 2) diff --git a/src/LightORM/Extension/StringBuilderHelper.cs b/src/LightORM/Extension/StringBuilderHelper.cs index b9cc9fb4..e8e86aac 100644 --- a/src/LightORM/Extension/StringBuilderHelper.cs +++ b/src/LightORM/Extension/StringBuilderHelper.cs @@ -38,7 +38,7 @@ public string Trim(params char[] chars) if (stringBuilder == null) throw new ArgumentNullException(nameof(stringBuilder)); #else - ArgumentNullException.ThrowIfNull(stringBuilder); + ArgumentNullException.ThrowIfNull(stringBuilder); #endif if (stringBuilder.Length == 0) return string.Empty; @@ -78,7 +78,7 @@ string content ) { #if NET8_0_OR_GREATER - return content.IsEmpty; + return content.IsEmpty; #else return string.IsNullOrEmpty(content); #endif @@ -162,5 +162,19 @@ public void ReplaceNull(string placeholder) stringBuilder.Replace(placeholder, "NULL"); } } + + public bool ReplaceWithBoundaryCheck(string placeholder, string newValue) + { + if (string.IsNullOrWhiteSpace(placeholder)) + return false; + var parameterIndex = stringBuilder.IndexOf(placeholder); + var preChar = stringBuilder[parameterIndex - 1]; + if (preChar == ' ' || (preChar == '(')) + { + stringBuilder.Replace(placeholder, newValue); + return true; + } + return false; + } } } diff --git a/src/LightORM/Implements/BaseDatabaseHandler.cs b/src/LightORM/Implements/BaseDatabaseHandler.cs index 409d84e7..529e31fc 100644 --- a/src/LightORM/Implements/BaseDatabaseHandler.cs +++ b/src/LightORM/Implements/BaseDatabaseHandler.cs @@ -3,18 +3,16 @@ namespace LightORM.Implements; -public abstract class BaseDatabaseHandler : IDatabaseTableHandler - where TWriter : WriteTableFromType, new() +public abstract partial class BaseDatabaseHandler : IDatabaseTableHandler where TOption : TableOptions { - protected TWriter Writer { get; } = new(); public abstract TOption Options { get; } public IEnumerable GenerateDbTable() { try { var info = typeof(T).CollectDbTableInfo(); - return Writer.BuildTableSql(Options, info); + return BuildTableSql(Options, info); } catch (Exception) { @@ -26,9 +24,29 @@ public IEnumerable GenerateDbTable() public abstract string GetTableStructSql(string table); public abstract bool ParseDataType(ReadedTableColumn column, out string type); - public virtual string GetDropTableSql(string tableName) + public virtual IEnumerable GetDropTableSql(DbTable table) { - return $"DROP TABLE {Writer.DbEmphasisInternal(Options, tableName)}"; + yield return $"DROP TABLE {DbEmphasisInternal(Options, table.Name)}"; + } +} + +partial class BaseDatabaseHandler +{ + protected abstract string ConvertToDbType(TOption option, DbColumn type); + protected abstract string BuildColumn(TOption option, DbColumn column); + protected abstract string DbEmphasis(TOption option, string name); + // TODO 待优化 + internal string DbEmphasisInternal(TOption option, string name) => DbEmphasis(option, name); + public abstract IEnumerable BuildTableSql(TOption option, DbTable table); + + protected static string GetIndexName(DbTable info, DbIndex index, int i) + { + return index.Name ?? $"IDX_{info.Name}_{string.Join("_", index.Columns)}_{i}"; + } + + protected static string GetPrimaryKeyName(string name, IEnumerable pks) + { + return $"PK_{name}_{string.Join("_", pks.Select(c => c.Name))}"; } } diff --git a/src/LightORM/Implements/CustomDatabaseAdapter.cs b/src/LightORM/Implements/CustomDatabaseAdapter.cs index abf6bb75..d61edd66 100644 --- a/src/LightORM/Implements/CustomDatabaseAdapter.cs +++ b/src/LightORM/Implements/CustomDatabaseAdapter.cs @@ -111,7 +111,19 @@ public void AddKeyWord(IEnumerable keyworks) public virtual string HandleMultipleQuerySql(string[] sqls, Dictionary parameters) { - return string.Join(";", sqls); + using var _ = StringBuilderPool.Get(out var sb); + for (int i = 0; i < sqls.Length; i++) + { + string? item = sqls[i]; + if (string.IsNullOrWhiteSpace(item)) + continue; + if (i > 0) + { + sb.AppendLine(";"); + } + sb.Append(item); + } + return sb.ToString(); } public virtual string RewriteParameterReferences(string sql, string prefix) diff --git a/src/LightORM/Implements/WriteTableFromType.cs b/src/LightORM/Implements/WriteTableFromType.cs index b386bfd1..5bf77fe6 100644 --- a/src/LightORM/Implements/WriteTableFromType.cs +++ b/src/LightORM/Implements/WriteTableFromType.cs @@ -2,24 +2,9 @@ namespace LightORM.Implements; -public abstract class WriteTableFromType where TOption:TableOptions +public abstract class WriteTableFromType where TOption : TableOptions { - protected abstract string ConvertToDbType(TOption option, DbColumn type); - protected abstract string BuildColumn(TOption option, DbColumn column); - protected abstract string DbEmphasis(TOption option, string name); - // TODO 待优化 - internal string DbEmphasisInternal(TOption option, string name) => DbEmphasis(option, name); - public abstract IEnumerable BuildTableSql(TOption option, DbTable table); - - protected static string GetIndexName(DbTable info, DbIndex index, int i) - { - return index.Name ?? $"IDX_{info.Name}_{string.Join("_", index.Columns)}_{i}"; - } - - protected static string GetPrimaryKeyName(string name, IEnumerable pks) - { - return $"PK_{name}_{string.Join("_", pks.Select(c => c.Name))}"; - } + } diff --git a/src/LightORM/Interfaces/IDatabaseTableHandler.cs b/src/LightORM/Interfaces/IDatabaseTableHandler.cs index a246917a..5311e7b2 100644 --- a/src/LightORM/Interfaces/IDatabaseTableHandler.cs +++ b/src/LightORM/Interfaces/IDatabaseTableHandler.cs @@ -8,6 +8,6 @@ public interface IDatabaseTableHandler string GetTablesSql(); string GetTableStructSql(string table); bool ParseDataType(ReadedTableColumn column, out string type); - string GetDropTableSql(string tableName); + IEnumerable GetDropTableSql(DbTable table); } diff --git a/src/LightORM/Models/DataBaseOption.cs b/src/LightORM/Models/DataBaseOption.cs index 45d826bf..e8757405 100644 --- a/src/LightORM/Models/DataBaseOption.cs +++ b/src/LightORM/Models/DataBaseOption.cs @@ -11,7 +11,7 @@ public sealed class DataBaseOption : IDbOption public DbProviderFactory? NewFactory { get; set; } public T GenerateOption { get; set; } = new(); public HashSet Keyworks { get; set; } = []; - public bool IsUseIdentifierQuote { get; set; } = true; + public bool? IsUseIdentifierQuote { get; private set; } public Action? SqlMethodConfiguration { get; set; } public IDbOption ConfigurationMethodResolver(Action action) diff --git a/src/LightORM/Models/TableInfo.cs b/src/LightORM/Models/TableInfo.cs index 4c4a6a69..7efee518 100644 --- a/src/LightORM/Models/TableInfo.cs +++ b/src/LightORM/Models/TableInfo.cs @@ -30,8 +30,10 @@ private TableInfo(string? tableName, Type type, int index) : this(type, index) public string? Schema => TableEntityInfo.Schema; - public int Depth { get; set; } + public ParameterExpression? Parameter { get; set; } + public int Depth { get; set; } + public bool FullAlias { get; set; } /// /// 表类型 /// @@ -47,6 +49,10 @@ public string Alias { get { + if (FullAlias || index == -1) + { + return TableName; + } return $"{alias}{Depth}"; } set => alias = value; @@ -61,7 +67,7 @@ public int Index { if (value == -1) { - Alias = TableEntityInfo.TableName; + Alias = TableName; } else { diff --git a/src/LightORM/Providers/DeleteProvider.cs b/src/LightORM/Providers/DeleteProvider.cs index b482ea1a..8e502e69 100644 --- a/src/LightORM/Providers/DeleteProvider.cs +++ b/src/LightORM/Providers/DeleteProvider.cs @@ -16,7 +16,7 @@ public DeleteProvider(SqlAdo executor, T? entity) { this.ado = executor; sqlBuilder = new(); - sqlBuilder.SelectedTables.Add(TableInfo.Create()); + sqlBuilder.AddTableInfo(TableInfo.Create()); sqlBuilder.TargetObject = entity; } @@ -24,7 +24,7 @@ public DeleteProvider(SqlAdo executor, T[] entities) { this.ado = executor; sqlBuilder = new(); - sqlBuilder.SelectedTables.Add(TableInfo.Create()); + sqlBuilder.AddTableInfo(TableInfo.Create()); sqlBuilder.TargetObjects = entities; sqlBuilder.IsBatchDelete = true; } diff --git a/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs b/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs index 58655929..ec45d2cb 100644 --- a/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs +++ b/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs @@ -1,9 +1,121 @@ -using System.Collections.Concurrent; +using LightORM.Extension; +using System.Collections.Concurrent; namespace LightORM.SqlExecutor; internal partial class ExpressionBuilder { + private readonly record struct NumberRange(double Min, double Max); + private static readonly Dictionary numericRanges = new() + { + { typeof(byte), new(byte.MinValue, byte.MaxValue) }, + { typeof(sbyte), new(sbyte.MinValue, sbyte.MaxValue) }, + { typeof(short),new (short.MinValue, short.MaxValue) }, + { typeof(ushort), new(ushort.MinValue, ushort.MaxValue) }, + { typeof(int), new(int.MinValue, int.MaxValue) }, + { typeof(uint),new (uint.MinValue, uint.MaxValue) }, + { typeof(long),new (long.MinValue, long.MaxValue) }, + { typeof(ulong),new (ulong.MinValue, ulong.MaxValue) }, + { typeof(float),new (float.MinValue, float.MaxValue) }, + { typeof(double),new (double.MinValue, double.MaxValue) }, + }; + + static Type GetSafeIntermediateType(Type sourceType, Type targetType) + { + if (!sourceType.IsNumber() || !targetType.IsNumber()) + { + return sourceType; + } + + // 特殊处理 decimal + if (sourceType == typeof(decimal) || targetType == typeof(decimal)) + { + return HandleDecimalConversion(sourceType, targetType); + } + + if (IsSafeNumericConversion(sourceType, targetType)) + { + return targetType; + } + + return GetTypeWithLargerRange(sourceType, targetType); + + static Type HandleDecimalConversion(Type sourceType, Type targetType) + { + // decimal 到其他类型 + if (sourceType == typeof(decimal)) + { + // decimal 可以安全转换为 double(因为 double 范围更大) + if (targetType == typeof(double)) + return typeof(double); + + // decimal 转换为 float 可能有精度损失,但不会溢出(float 范围比 decimal 大) + if (targetType == typeof(float)) + return typeof(float); + + // decimal 转换为整数类型可能溢出 + if (Type.GetTypeCode(targetType) == TypeCode.Int32) + { + // 需要通过检查或使用 checked 转换 + return typeof(decimal); // 保持 decimal,让后续转换处理 + } + + return typeof(decimal); + } + + // 其他类型到 decimal + if (targetType == typeof(decimal)) + { + // double 到 decimal 可能溢出(因为 decimal 范围更小) + if (sourceType == typeof(double)) + { + // double 的范围可能超出 decimal,需要特殊处理 + return typeof(double); // 保持 double,避免精度损失 + } + + // float 到 decimal 通常安全(float 范围比 decimal 大,但需要检查具体值) + if (sourceType == typeof(float)) + { + return typeof(float); + } + + // 整数类型到 decimal 通常安全(decimal 范围足够大) + if (Type.GetTypeCode(sourceType) == TypeCode.Int32) + { + return typeof(decimal); + } + + return typeof(decimal); + } + + return typeof(decimal); + } + + static bool IsSafeNumericConversion(Type sourceType, Type targetType) + { + + if (!numericRanges.TryGetValue(sourceType, out var sourceRange) || + !numericRanges.TryGetValue(targetType, out var targetRange)) + return false; + + // 源类型的范围必须在目标类型范围内 + return sourceRange.Min >= targetRange.Min && sourceRange.Max <= targetRange.Max; + } + + static Type GetTypeWithLargerRange(Type type1, Type type2) + { + if (!numericRanges.TryGetValue(type1, out var range1) || + !numericRanges.TryGetValue(type2, out var range2)) + return type1; + + // 比较范围大小 + double size1 = range1.Max - range1.Min; + double size2 = range2.Max - range2.Min; + + return size1 >= size2 ? type1 : type2; + } + } + private static ConcurrentDictionary JsonMaps { get; } = []; public static void AddJsonTypeMap(Type type) diff --git a/src/LightORM/SqlExecutor/ExpressionBuilder.cs b/src/LightORM/SqlExecutor/ExpressionBuilder.cs index 09a1bc31..1d08169f 100644 --- a/src/LightORM/SqlExecutor/ExpressionBuilder.cs +++ b/src/LightORM/SqlExecutor/ExpressionBuilder.cs @@ -161,6 +161,11 @@ Expression CreateAnonymous( } TargetValueExpression = CreateAnonymous(targetMember.PropertyType); } + else if (ContainsJsonType(targetMember.PropertyType)) + { + var ordinal = reader.GetOrdinal(targetMember.Name); + TargetValueExpression = GetTargetJsonExpression(reader, Culture, recordInstanceExp, SchemaTable, ordinal, targetMember.PropertyType); + } else { TargetValueExpression = CreateCustomEntiry(targetMember.PropertyType); @@ -206,30 +211,6 @@ Expression CreateCustomEntiry( FindMatchValueExpression(Bindings, col, targetMember, false); - //void work() - //{ - // for (int Ordinal = 0; Ordinal < reader.FieldCount; Ordinal++) - // { - // //Check if the RecordFieldName matches the TargetMember - // if (MemberMatchesName(col, reader.GetName(Ordinal))) - // { - // Expression TargetValueExpression = GetTargetValueExpression( - // reader, - // Culture, - // recordInstanceExp, - // SchemaTable, - // Ordinal, - // targetMember.PropertyType); - - // //Create a binding to the target member - // MemberAssignment BindExpression = Expression.Bind(targetMember, TargetValueExpression); - // Bindings.Add(BindExpression); - // return; - // } - // } - //} - - //work(); } // 处理Json列 @@ -244,30 +225,6 @@ Expression CreateCustomEntiry( FindMatchValueExpression(Bindings, col, targetMember, true); - //void work() - //{ - // for (int Ordinal = 0; Ordinal < reader.FieldCount; Ordinal++) - // { - // //Check if the RecordFieldName matches the TargetMember - // if (MemberMatchesName(col, reader.GetName(Ordinal))) - // { - // Expression TargetValueExpression = GetTargetJsonExpression( - // reader, - // Culture, - // recordInstanceExp, - // SchemaTable, - // Ordinal, - // targetMember.PropertyType); - - // //Create a binding to the target member - // MemberAssignment BindExpression = Expression.Bind(targetMember, TargetValueExpression); - // Bindings.Add(BindExpression); - // return; - // } - // } - //} - - //work(); } // 处理聚合的属性 @@ -286,30 +243,6 @@ Expression CreateCustomEntiry( var flatTargetMember = flatType.GetProperty(flatCol.PropertyName)!; FindMatchValueExpression(flatBindings, flatCol, flatTargetMember, false); - //void work() - //{ - // for (int Ordinal = 0; Ordinal < reader.FieldCount; Ordinal++) - // { - // //Check if the RecordFieldName matches the TargetMember - // if (MemberMatchesName(flatCol, reader.GetName(Ordinal))) - // { - // Expression TargetValueExpression = GetTargetValueExpression( - // reader, - // Culture, - // recordInstanceExp, - // SchemaTable, - // Ordinal, - // flatTargetMember.PropertyType); - - // //Create a binding to the target member - // MemberAssignment BindExpression = Expression.Bind(flatTargetMember, TargetValueExpression); - // bindings.Add(BindExpression); - // return; - // } - // } - //} - - //work(); } var memberInit = Expression.MemberInit(Expression.New(flatType), flatBindings); @@ -367,7 +300,7 @@ private static Expression GetTargetValueExpression( { Type RecordFieldType = reader.GetFieldType(Ordinal); bool AllowDBNull = IsColumnNullable(SchemaTable, Ordinal); - Expression RecordFieldExpression = GetRecordFieldExpression(recordInstanceExp, Ordinal, RecordFieldType); + Expression RecordFieldExpression = GetRecordFieldExpression(recordInstanceExp, Ordinal, TargetMemberType, RecordFieldType); Expression ConvertedRecordFieldExpression = GetConversionExpression(RecordFieldType, RecordFieldExpression, TargetMemberType, Culture); MethodCallExpression NullCheckExpression = GetNullCheckExpression(recordInstanceExp, Ordinal); @@ -408,7 +341,7 @@ private static Expression GetTargetJsonExpression( { Type RecordFieldType = reader.GetFieldType(Ordinal); bool AllowDBNull = IsColumnNullable(SchemaTable, Ordinal); - Expression RecordFieldExpression = GetRecordFieldExpression(recordInstanceExp, Ordinal, RecordFieldType); + Expression RecordFieldExpression = GetRecordFieldExpression(recordInstanceExp, Ordinal, TargetMemberType, RecordFieldType); Expression objectExp = GetJsonDeserializeExpression(RecordFieldType, RecordFieldExpression, TargetMemberType, Culture); Expression ConvertedRecordFieldExpression = Expression.Convert(objectExp, TargetMemberType); MethodCallExpression NullCheckExpression = GetNullCheckExpression(recordInstanceExp, Ordinal); @@ -440,29 +373,30 @@ static bool IsColumnNullable(DataTable schemaTable, int ordinal) } } - private static Expression GetRecordFieldExpression(ParameterExpression recordInstanceExp, int Ordinal, Type RecordFieldType) + private static Expression GetRecordFieldExpression(ParameterExpression recordInstanceExp, int ordinal, Type entityPropType, Type recordFieldType) { //MethodInfo GetValueMethod = default(MethodInfo); - typeMapMethod.TryGetValue(RecordFieldType, out var GetValueMethod); + var safeType = GetSafeIntermediateType(recordFieldType, entityPropType); + typeMapMethod.TryGetValue(safeType, out var GetValueMethod); if (GetValueMethod == null) GetValueMethod = DataRecord_GetValue; Expression RecordFieldExpression; - var ordinal = Expression.Constant(Ordinal, typeof(int)); - if (ReferenceEquals(RecordFieldType, typeof(byte[]))) + var ordinalExp = Expression.Constant(ordinal, typeof(int)); + if (ReferenceEquals(recordFieldType, typeof(byte[]))) { - RecordFieldExpression = Expression.Call(GetValueMethod, [recordInstanceExp, ordinal]); + RecordFieldExpression = Expression.Call(GetValueMethod, [recordInstanceExp, ordinalExp]); } - else if (IsUnsignType(RecordFieldType)) + else if (IsUnsignType(recordFieldType)) { RecordFieldExpression = Expression.Call( GetValueMethod, - [recordInstanceExp, ordinal] + [recordInstanceExp, ordinalExp] ); } else { - RecordFieldExpression = Expression.Call(recordInstanceExp, GetValueMethod, ordinal); + RecordFieldExpression = Expression.Call(recordInstanceExp, GetValueMethod, ordinalExp); } return RecordFieldExpression; diff --git a/src/LightORM/Utils/ExpressionResolver.cs b/src/LightORM/Utils/ExpressionResolver.cs index 1162d852..db0d7c95 100644 --- a/src/LightORM/Utils/ExpressionResolver.cs +++ b/src/LightORM/Utils/ExpressionResolver.cs @@ -381,7 +381,7 @@ Indexer GetResolvedIndex(bool shouldReset = true) { var alias = Context.GetTable(exp).Alias; //Sql.Append($"{alias}.*"); - Sql.Append(alias); + Sql.AppendAlias(alias, Database); Sql.Append(".*"); UseAs = false; } @@ -407,7 +407,7 @@ Indexer GetResolvedIndex(bool shouldReset = true) if (Options.RequiredTableAlias) { //Sql.Append($"{table.Alias}.{Database.AttachEmphasis(col.ColumnName)}"); - Sql.Append(table.Alias).Append('.').AppendEmphasis(col.ColumnName, Database); + Sql.AppendAlias(table.Alias, Database).Append('.').AppendEmphasis(col.ColumnName, Database); } else { @@ -496,7 +496,7 @@ static MemberExpression SafeCreateProperty(Expression expression, string propert var right = CurrentBinary?.Right; if (right is not null) { - var body = Expression.Equal(propAccess, right); + var body = Expression.Equal(propAccess, right); NavigateWhereExpression = [Expression.Lambda(body, p)]; } } @@ -537,7 +537,7 @@ static MemberExpression SafeCreateProperty(Expression expression, string propert if (Options.RequiredTableAlias) { - Sql.Append(table.Alias); + Sql.AppendAlias(table.Alias, Database); Sql.Append('.'); //Sql.Append($"{table.Alias}.{Database.AttachEmphasis(col.ColumnName)}"); } diff --git a/src/LightORM/Utils/ResolveContext.cs b/src/LightORM/Utils/ResolveContext.cs index d7797f24..e6b57547 100644 --- a/src/LightORM/Utils/ResolveContext.cs +++ b/src/LightORM/Utils/ResolveContext.cs @@ -4,26 +4,28 @@ namespace LightORM; public class ResolveContext { - readonly record struct ParameterKey(Type Type, string? Name); - + public readonly record struct ParameterKey(Type Type, string? Name); private readonly Dictionary lambdaParameterInfos = []; private string? parameterPrefix; public string? ParameterPrefix => parameterPrefix; public IDatabaseAdapter Database { get; } private readonly ResolveContext? parent; + private readonly List selectedTables; public int Depth { get; set; } - - public ResolveContext(IDatabaseAdapter database) + + public ResolveContext(IDatabaseAdapter database, params List selectedTables) { Database = database; + this.selectedTables = selectedTables; } - public ResolveContext(ResolveContext upperContext) + public ResolveContext(ResolveContext upperContext, params List selectedTables) { Database = upperContext.Database; Depth = upperContext.Depth + 1; + this.selectedTables = selectedTables; parent = upperContext; } @@ -42,13 +44,28 @@ public void HandleParameterExpression(ParameterExpression pExp, int index) var key = new ParameterKey(pExp.Type, pExp.Name); if (!lambdaParameterInfos.TryGetValue(key, out var p)) { - p = TableInfo.Create(pExp.Type, index); + p = selectedTables.FirstOrDefault(t => t.Type == pExp.Type && t.Index == index) ?? TableInfo.Create(pExp.Type, index); + p.Parameter = pExp; p.Name = pExp.Name; lambdaParameterInfos.Add(key, p); } p.Depth = Depth; } + public TableInfo GetTable(Func predicate) + { + foreach (var item in lambdaParameterInfos) + { + if (predicate.Invoke(item.Key)) + return item.Value; + } + if (parent is not null) + { + return parent.GetTable(predicate); + } + throw new LightOrmException("解析ParameterExpression出错"); + } + public TableInfo GetTable(ParameterExpression pExp) { var key = new ParameterKey(pExp.Type, pExp.Name); diff --git a/src/LightOrmTableContextGenerator/TableContextGenerator.cs b/src/LightOrmTableContextGenerator/TableContextGenerator.cs index 3fb7fef9..2c50e0c8 100644 --- a/src/LightOrmTableContextGenerator/TableContextGenerator.cs +++ b/src/LightOrmTableContextGenerator/TableContextGenerator.cs @@ -404,7 +404,7 @@ static string GetAttributeValueOrNull(AttributeData? a, string name, bool isStri } else { - v = $"{v}"; + v = $"{val}"; } } diff --git a/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs b/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs index fc89b108..aff77857 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs @@ -29,7 +29,7 @@ private DamengProvider(DataBaseOption option) : base(option. option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomDamengAdapter(sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? DmClientFactory.Instance; } diff --git a/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs similarity index 97% rename from src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs rename to src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs index bf8dcaec..ecac5d53 100644 --- a/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs @@ -1,13 +1,14 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LightORM.Providers.Dameng.TableStructure; +namespace LightORM.Providers.Dameng; -public class DamengTableWriter : LightORM.Implements.WriteTableFromType +partial class DamengTableHandler { public override IEnumerable BuildTableSql(DamengTableOptions option, DbTable table) { diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs index 6a3bce14..af6ec905 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs @@ -1,12 +1,11 @@ using LightORM.DbStruct; using LightORM.Implements; using System.Text; -using LightORM.Providers.Dameng.TableStructure; namespace LightORM.Providers.Dameng; -public sealed class DamengTableHandler(DamengTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class DamengTableHandler(DamengTableOptions tableOptions) + : BaseDatabaseHandler { public override DamengTableOptions Options => tableOptions; diff --git a/src/Providers/LightORM.Providers.Dameng/LightORM.Providers.Dameng.csproj b/src/Providers/LightORM.Providers.Dameng/LightORM.Providers.Dameng.csproj index 5c7b3beb..ebff4f2b 100644 --- a/src/Providers/LightORM.Providers.Dameng/LightORM.Providers.Dameng.csproj +++ b/src/Providers/LightORM.Providers.Dameng/LightORM.Providers.Dameng.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs index 7f1dd4b4..593d9673 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs @@ -28,7 +28,7 @@ private KingbaseESProvider(DataBaseOption option) : base option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomKingbaseESAdapter(sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? Kdbndp.KdbndpFactory.Instance; } public override DbBaseType DbBaseType => KingbaseEs; diff --git a/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.Writer.cs similarity index 96% rename from src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs rename to src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.Writer.cs index 857ab2a9..9903311f 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.Writer.cs @@ -1,10 +1,11 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using LightORM.Providers.KingbaseES.Utils; using System.Text; -namespace LightORM.Providers.KingbaseES.TableStructure; +namespace LightORM.Providers.KingbaseES; -public class KingbaseESTableWriter : LightORM.Implements.WriteTableFromType +partial class KingbaseESTableHandler { public override IEnumerable BuildTableSql(KingbaseESTableOptions option, DbTable table) { diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs index 31d56444..3bbf253f 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs @@ -1,11 +1,10 @@ using LightORM.DbStruct; using LightORM.Implements; -using LightORM.Providers.KingbaseES.TableStructure; namespace LightORM.Providers.KingbaseES; -public sealed class KingbaseESTableHandler(KingbaseESTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class KingbaseESTableHandler(KingbaseESTableOptions tableOptions) + : BaseDatabaseHandler { public override KingbaseESTableOptions Options => tableOptions; diff --git a/src/Providers/LightORM.Providers.KingbaseES/LightORM.Providers.KingbaseES.csproj b/src/Providers/LightORM.Providers.KingbaseES/LightORM.Providers.KingbaseES.csproj index c5283b66..f5563b1f 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/LightORM.Providers.KingbaseES.csproj +++ b/src/Providers/LightORM.Providers.KingbaseES/LightORM.Providers.KingbaseES.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs new file mode 100644 index 00000000..d908416c --- /dev/null +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs @@ -0,0 +1,167 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; +using System.Reflection; +using System.Text; + +namespace LightORM.Providers.MySql; + +internal partial class CustomMySqlAdapter +{ + const string NEW_VERSION_COLUMN = "NewVersionValue"; + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.IgnoreOnConflict || context.Builder.UpdateOnConflict) + { + HandleBatchUpsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void HandleBatchUpsert(BatchActionContext> context) + { + var database = context.ScopedAdapter; + var builder = context.Builder; + var batchs = context.Batchs; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + if (builder.IgnoreOnConflict) + { + PreHandleInsertBuilder(sb); + + for (int i = 0; i < batch.RowParameters.Count; i++) + { + List? dic = batch.RowParameters[i]; + if (i > 0) + { + sb.Append(','); + sb.AppendLine(); + } + sb.Append('('); + foreach (var c in dic) + { + if (c.IsNewVersion) + continue; + //sb.Append(database.GetValueExpression(c)); + sb.AppendSimpleColumnValueExpression(c, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.Append(')'); + } + builder.HandleSqlParameters(sb, database); + batch.Sql = sb.ToString(); + + void PreHandleInsertBuilder(StringBuilder sb) + { + sb.Append("INSERT IGNORE INTO "); + //sb.Append(GetTableName(database, MainTable, false)); + sb.AppendTableName(database, builder.MainTable, false).AppendLine(); + sb.Append('('); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.Append(')'); + sb.AppendLine(); + sb.AppendLine("VALUES"); + } + } + else + { + sb.Append("INSERT INTO "); + //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); + sb.Append('('); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + BuildSource(batch); + sb.AppendLine("ON DUPLICATE KEY UPDATE"); + var vc = columns.FirstOrDefault(c => c.IsVersionColumn); + foreach (var item in columns) + { + if (item.IsVersionColumn || item.IsPrimaryKey) + continue; + if (vc is not null) + { + sb.Append(" ").AppendEmphasis(item.ColumnName, database).Append(" = ") + .Append("IF(").AppendTableName(database, context.Builder.MainTable, false).Append('.').AppendEmphasis(vc.ColumnName, database) + .Append(" = ") + .Append("s.").AppendEmphasis(vc.ColumnName, database).Append(", ") + .Append("s.").AppendEmphasis(item.ColumnName, database).Append(", ") + .AppendTableName(database, context.Builder.MainTable, false).Append('.').AppendEmphasis(item.ColumnName, database).Append(')'); + } + else + { + sb.Append(" ").AppendTableName(database, context.Builder.MainTable, false).Append('.').AppendEmphasis(item.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(item.ColumnName, database); + } + sb.AppendLine(","); + } + + if (vc is not null) + { + sb.Append(" ").AppendEmphasis(vc.ColumnName, database).Append(" = ") + .Append("IF(").AppendTableName(database, context.Builder.MainTable, false).Append('.').AppendEmphasis(vc.ColumnName, database) + .Append(" = ") + .Append("s.").AppendEmphasis(vc.ColumnName, database).Append(", ") + .Append("s.").Append(NEW_VERSION_COLUMN).Append(',') + .AppendTableName(database, context.Builder.MainTable, false).Append('.').AppendEmphasis(vc.ColumnName, database).Append(')').AppendLine(","); + } + sb.RemoveLast(SqlBuilder.N.Length + 1); + + + void BuildSource(BatchSqlInfo batch) + { + sb.Append("SELECT "); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(); + sb.AppendLine("FROM ("); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + if (i > 0) + { + sb.AppendLine(" UNION ALL"); + } + sb.Append(" SELECT "); + var rowData = batch.RowParameters[i]; + foreach (var item in rowData) + { + if (item.IsNewVersion) + { + sb.WithPrefix(item.ValueName, database).Append(" AS ").Append(NEW_VERSION_COLUMN); + } + else + { + sb.WithPrefix(item.ValueName, database).Append(" AS ").AppendEmphasis(item.ColumnName, database); + } + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(); + } + sb.AppendLine(") AS s"); + } + } + batch.Sql = sb.ToString(); + } + } +} diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs index dab80af2..b66acc26 100644 --- a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs @@ -23,10 +23,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) sb.Append('('); sb.AppendEntryColumns(columnValueMaps.Values); sb.AppendLine(")"); - sb.AppendLine("VALUES"); - sb.Append('('); - sb.AppendEntryValues(columnValueMaps.Values); - sb.AppendLine(")"); + BuildSource(); } else { @@ -36,10 +33,7 @@ public override void HandleInsertOrUpdate(UpsertContext context) sb.Append('('); sb.AppendEntryColumns(columnValueMaps.Values); sb.AppendLine(")"); - sb.AppendLine("VALUES"); - sb.Append('('); - sb.AppendEntryValues(columnValueMaps.Values); - sb.AppendLine(")"); + BuildSource(); sb.AppendLine("ON DUPLICATE KEY UPDATE"); var vc = columnValueMaps.FirstOrDefault(c => c.Key.IsVersionColumn); foreach (var item in columnValueMaps) @@ -48,26 +42,65 @@ public override void HandleInsertOrUpdate(UpsertContext context) continue; if (vc.Key is not null) { - sb.Append(" ").Append(item.Value.Column).Append(" = ").Append("IF(").Append(vc.Value.Column).Append(" = ").Append(vc.Value.Value) - .Append(", ").Append("VALUES(").Append(item.Value.Column).Append("), ").Append(item.Value.Column).Append(')'); + sb.Append(" ").Append(item.Value.Column).Append(" = ") + .Append("IF(").AppendTableName(database, context.Builder.MainTable, false).Append('.').Append(vc.Value.Column) + .Append(" = ") + .Append("s.").Append(vc.Value.Column).Append(", ") + .Append("s.").Append(item.Value.Column).Append(", ") + .AppendTableName(database, context.Builder.MainTable, false).Append('.').Append(item.Value.Column).Append(')'); } else { - sb.Append(" ").Append(item.Value.Column).Append(" = ").Append("VALUES(").Append(item.Value.Column).Append(')'); + sb.Append(" ").AppendTableName(database, context.Builder.MainTable, false).Append('.').Append(item.Value.Column).Append(" = ").Append("s.").Append(item.Value.Column); } sb.AppendLine(","); } if (vc.Key is not null) { - var oldVersion = context.Parameters[vc.Key.PropertyName]; - var newVersion = SqlBuilder.VersionPlus(oldVersion); var verionName = $"{vc.Key.PropertyName}_n"; - context.Parameters[verionName] = newVersion; - sb.Append(" ").Append(vc.Value.Column).Append(" = ").Append("IF(").Append(vc.Value.Column).Append(" = ").WithPrefix(vc.Key.PropertyName, database).Append(", ").WithPrefix(verionName, database).Append(',').Append(vc.Value.Column).Append(')').AppendLine(","); + sb.Append(" ").Append(vc.Value.Column).Append(" = ") + .Append("IF(").AppendTableName(database, context.Builder.MainTable, false).Append('.').Append(vc.Value.Column) + .Append(" = ") + .Append("s.").Append(vc.Value.Column).Append(", ") + .Append("s.").Append(verionName).Append(',') + .AppendTableName(database, context.Builder.MainTable, false).Append('.').Append(vc.Value.Column).Append(')').AppendLine(","); } sb.RemoveLast(SqlBuilder.N.Length + 1); } - + + + void BuildSource() + { + sb.Append("SELECT "); + foreach (var item in columnValueMaps) + { + sb.Append(item.Value.Column); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(); + sb.AppendLine("FROM ("); + sb.Append(" SELECT "); + foreach (var item in columnValueMaps) + { + sb.Append(item.Value.Value).Append(" AS ").Append(item.Value.Column); + sb.Append(','); + if (item.Key.IsVersionColumn) + { + var oldVersion = context.Parameters[item.Key.PropertyName]; + var newVersion = SqlBuilder.VersionPlus(oldVersion); + var verionName = $"{item.Key.PropertyName}_n"; + context.Parameters[verionName] = newVersion; + sb.WithPrefix(verionName, database).Append(" AS ").Append(verionName); + sb.Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(); + sb.AppendLine(") AS s"); + } } + + } diff --git a/src/Providers/LightORM.Providers.MySql/LightORM.Providers.MySql.csproj b/src/Providers/LightORM.Providers.MySql/LightORM.Providers.MySql.csproj index 428c22d3..9d362218 100644 --- a/src/Providers/LightORM.Providers.MySql/LightORM.Providers.MySql.csproj +++ b/src/Providers/LightORM.Providers.MySql/LightORM.Providers.MySql.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs b/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs index a0b99f30..c3d10d24 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs @@ -36,7 +36,7 @@ private MySqlProvider(DataBaseOption option) : base(option.Ma option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomMySqlAdapter(sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? MySqlConnectorFactory.Instance; } public override DbBaseType DbBaseType => DbBaseType.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs similarity index 96% rename from src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs rename to src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs index 023bfd91..14ac91a5 100644 --- a/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs @@ -1,13 +1,14 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LightORM.Providers.MySql.TableStructure; +namespace LightORM.Providers.MySql; -public class MySqlTableWriter : LightORM.Implements.WriteTableFromType +partial class MySqlTableHandler { public override IEnumerable BuildTableSql(MySqlTableOptions option, DbTable table) { diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs index 92032bab..a0435fcf 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs @@ -5,12 +5,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using LightORM.Providers.MySql.TableStructure; namespace LightORM.Providers.MySql; -public sealed class MySqlTableHandler(string database, MySqlTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class MySqlTableHandler(string database, MySqlTableOptions tableOptions) + : BaseDatabaseHandler { public override MySqlTableOptions Options => tableOptions; public override string GetTablesSql() diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs index fb55d2d7..a5c4e982 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs @@ -3,6 +3,7 @@ using LightORM.Implements; using LightORM.Interfaces; using LightORM.Models; +using LightORM.Utils; using Oracle.ManagedDataAccess.Client; using System.Data; using System.Data.Common; @@ -45,14 +46,17 @@ public override void HandleDateValue(StringBuilder sql, DateTime dateTime) public override string HandleMultipleQuerySql(string[] sqls, Dictionary parameters) { - var sb = new StringBuilder(); + using var _ = StringBuilderPool.Get(out var sb); sb.AppendLine("BEGIN"); for (int i = 0; i < sqls.Length; i++) { + var sql = sqls[i]; + if (string.IsNullOrWhiteSpace(sql)) + continue; string cursorName = $"cur{i}"; // 追加游标打开语句,注意 SQL 中的参数已经重写过,直接嵌入即可 - sb.AppendLine($" OPEN :{cursorName} FOR {sqls[i]};"); + sb.AppendLine($" OPEN :{cursorName} FOR {sql};"); // 创建输出游标参数 var cursorParam = new OracleParameter(cursorName, OracleDbType.RefCursor, ParameterDirection.Output); // 添加到 parameters 字典 diff --git a/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs b/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs index fc028f09..663b449b 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs @@ -27,7 +27,7 @@ private OracleProvider(DataBaseOption option) : base(option. option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomOracleAdapter(sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? OracleClientFactory.Instance; } public override DbBaseType DbBaseType => DbBaseType.Oracle; diff --git a/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs similarity index 93% rename from src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs rename to src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs index ffa113cf..ddbcb1d7 100644 --- a/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs @@ -1,13 +1,14 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LightORM.Providers.Oracle.TableStructure; +namespace LightORM.Providers.Oracle; -public class OracleTableWriter : LightORM.Implements.WriteTableFromType +partial class OracleTableHandler { public override IEnumerable BuildTableSql(OracleTableOptions option, DbTable table) { @@ -190,7 +191,6 @@ protected override string ConvertToDbType(OracleTableOptions option, DbColumn ty }; } - protected override string DbEmphasis(OracleTableOptions option, string name) => $"\"{name.ToUpper()}\""; private static string CheckPkLength(string name, IEnumerable pks) { @@ -220,11 +220,6 @@ private static string CheckIdxLength(DbTable info, DbIndex index, int i) return $"IDX_{info.Name?.Substring(splitCount)}_{string.Join("_", index.Columns.Select(c => c.Substring(splitCount)))}_{i}"; } - private string AttachUserId(OracleTableOptions option, string name) - { - if (option.UserId != null) - return $"\"{option.UserId}\".\"{name.ToUpper()}\""; - else - return DbEmphasis(option, name); - } + + } \ No newline at end of file diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs index 63026ed7..589496a5 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs @@ -5,12 +5,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using LightORM.Providers.Oracle.TableStructure; namespace LightORM.Providers.Oracle; -public sealed class OracleTableHandler(OracleTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class OracleTableHandler(OracleTableOptions tableOptions) + : BaseDatabaseHandler { public override OracleTableOptions Options => tableOptions; public override string GetTablesSql() @@ -18,6 +17,27 @@ public override string GetTablesSql() return "select table_name TableName from user_tab_columns group by table_name order by table_name"; } + public override IEnumerable GetDropTableSql(DbTable table) + { + var dt = base.GetDropTableSql(table); + foreach (var item in dt) + { + yield return item; + } + if (!tableOptions.OverVersion) + { + // 序列 + 触发器自增 + var increments = table.Columns.Where(col => col.AutoIncrement); + foreach (var col in increments) + { + var seqName = $"SEQ_{table.Name}_{col.Name}".ToUpper(); + yield return $""" + DROP SEQUENCE {AttachUserId(tableOptions, seqName)} + """; + } + } + } + public override string GetTableStructSql(string table) { return $""" @@ -171,4 +191,14 @@ public override bool ParseDataType(ReadedTableColumn column, out string type) return true; } + + + private string AttachUserId(OracleTableOptions option, string name) + { + if (option.UserId != null) + return $"\"{option.UserId}\".\"{name.ToUpper()}\""; + else + return DbEmphasis(option, name); + } + protected override string DbEmphasis(OracleTableOptions option, string name) => $"\"{name.ToUpper()}\""; } \ No newline at end of file diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs new file mode 100644 index 00000000..29323e74 --- /dev/null +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs @@ -0,0 +1,324 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.PostgreSQL; + +partial class CustomPostgreSQL +{ + const string NEW_VERSION_COLUMN = "NewVersionValue"; + + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) + { + HandleBatchUpsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void HandleBatchUpsert(BatchActionContext> context) + { + var builder = context.Builder; + var batchs = context.Batchs; + var database = context.ScopedAdapter; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("INSERT INTO "); + //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + sb.AppendTableName(database, context.Builder.MainTable, false); + sb.Append('('); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + BuildSource(batch); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + sb.Append("ON CONFLICT ("); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + sb.AppendEmphasis(k.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + if (builder.IgnoreOnConflict) + { + sb.Append("DO NOTHING"); + } + else + { + sb.AppendLine("DO UPDATE SET"); + bool f1 = true; + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (!f1) + { + sb.AppendLine(","); + } + if (kv.IsVersionColumn) + { + sb.Append(" "); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = CASE"); + foreach (var item in batch.RowParameters) + { + bool first = true; + SimpleColumn versionCol = default; + foreach (var cell in item) + { + if (cell.IsNewVersion) + versionCol = cell; + if (!cell.IsPrimaryKey) + continue; + if (first) + { + sb.AppendLine(); + sb.Append(" WHEN EXCLUDED."); + } + else + sb.Append(" AND EXCLUDED."); + sb.AppendEmphasis(cell.ColumnName, database).Append(" = ").WithPrefix(cell.ValueName, database); + first = false; + } + sb.Append(" THEN ").WithPrefix(versionCol.ValueName, database); + } + sb.AppendLine(); + sb.Append(" END "); + } + else + { + sb.Append(" "); + // EXCLUDED 是 PostgreSQL 在 INSERT ... ON CONFLICT 语句中的一个特殊关键字,代表尝试插入的那行新数据。 + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database); + } + f1 = false; + } + sb.AppendLine(); + foreach (var kv in columns) + { + if (!kv.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.AppendTableName(database, context.Builder.MainTable, false) + .Append('.') + .AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database).Append(' '); + } + } + batch.Sql = sb.ToString(); + + void BuildSource(BatchSqlInfo batch) + { + sb.AppendLine("VALUES"); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + if (i > 0) + { + sb.AppendLine(","); + } + sb.Append(" ("); + var rowData = batch.RowParameters[i]; + foreach (var item in rowData) + { + if (item.IsNewVersion) + { + continue; + } + sb.WithPrefix(item.ValueName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.Append(')'); + } + sb.AppendLine(); + //sb.Append("SELECT "); + //foreach (var item in columns) + //{ + // sb.AppendEmphasis(item.ColumnName, database); + // sb.Append(','); + //} + //sb.RemoveLast(1); + //sb.AppendLine(); + //sb.AppendLine("FROM ("); + //for (int i = 0; i < batch.RowParameters.Count; i++) + //{ + // if (i > 0) + // { + // sb.AppendLine(" UNION ALL"); + // } + // sb.Append(" SELECT "); + // var rowData = batch.RowParameters[i]; + // foreach (var item in rowData) + // { + // if (item.IsNewVersion) + // { + // sb.WithPrefix(item.ValueName, database).Append(" AS ").Append(NEW_VERSION_COLUMN); + // } + // else + // { + // sb.WithPrefix(item.ValueName, database).Append(" AS ").AppendEmphasis(item.ColumnName, database); + // } + // sb.Append(','); + // } + // sb.RemoveLast(1); + // sb.AppendLine(); + //} + //sb.AppendLine(") AS s"); + } + } + } + + //private static void HandleBatchUpsert(BatchActionContext> context) + //{ + // var builder = context.Builder; + // var batchs = context.Batchs; + // var database = context.ScopedAdapter; + // var columns = context.TargetColumns; + // foreach (var batch in batchs) + // { + // using var _ = StringBuilderPool.Get(out var sb); + // builder.WriteTags(sb); + // sb.Append("INSERT INTO "); + // //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + // sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); + // sb.Append('('); + // foreach (var item in columns) + // { + // sb.AppendEmphasis(item.ColumnName, database); + // sb.Append(','); + // } + // sb.RemoveLast(1); + // sb.AppendLine(")"); + // BuildSource(batch); + // var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + // sb.Append("ON CONFLICT ("); + // for (int i = 0; i < whereKey.Length; i++) + // { + // var k = whereKey[i]; + // sb.AppendEmphasis(k.ColumnName, database); + // sb.Append(','); + // } + // sb.RemoveLast(1); + // sb.AppendLine(")"); + // if (builder.IgnoreOnConflict) + // { + // sb.Append("DO NOTHING"); + // } + // else + // { + // sb.Append("DO UPDATE SET"); + // foreach (var kv in columns) + // { + // if (kv.IsPrimaryKey) + // continue; + // if (kv.IsVersionColumn) + // { + // sb.Append(' '); + // sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").Append(NEW_VERSION_COLUMN).Append(','); + // } + // else + // { + // sb.Append(' '); + // // EXCLUDED 是 PostgreSQL 在 INSERT ... ON CONFLICT 语句中的一个特殊关键字,代表尝试插入的那行新数据。 + // sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database).Append(','); + // } + // } + // sb.RemoveLast(1); + // sb.AppendLine(); + // foreach (var kv in columns) + // { + // if (!kv.IsVersionColumn) + // continue; + // sb.Append(" WHERE "); + // sb.AppendTableName(database, context.Builder.MainTable, false) + // .Append('.') + // .AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database).Append(' '); + // } + // } + // batch.Sql = sb.ToString(); + + // void BuildSource(BatchSqlInfo batch) + // { + // sb.Append("SELECT "); + // foreach (var item in columns) + // { + // sb.AppendEmphasis(item.ColumnName, database); + // sb.Append(','); + // } + // sb.RemoveLast(1); + // sb.AppendLine(); + // sb.AppendLine("FROM UNNEST("); + // var fieldCount = batch.RowParameters[0].Count; + // for (int j = 0; j < fieldCount; j++) + // { + // if (j > 0) + // { + // sb.AppendLine(","); + // } + // sb.Append(" ARRAY["); + // for (int i = 0; i < batch.RowParameters.Count; i++) + // { + // if (fieldCount != batch.RowParameters[i].Count) + // { + // throw new LightOrmException("批量插入的列数量不一致"); + // } + // if (i > 0) + // { + // sb.Append(','); + // } + // var cell = batch.RowParameters[i][j].ValueName; + // sb.WithPrefix(cell, database); + // //var rowData = batch.RowParameters[i]; + // //foreach (var item in rowData) + // //{ + // // if (item.IsNewVersion) + // // { + // // sb.WithPrefix(item.ValueName, database).Append(" AS ").Append(NEW_VERSION_COLUMN); + // // } + // // else + // // { + // // sb.WithPrefix(item.ValueName, database).Append(" AS ").AppendEmphasis(item.ColumnName, database); + // // } + // // sb.Append(','); + // //} + // //sb.RemoveLast(1); + // //sb.AppendLine(); + // } + // sb.Append(']'); + // } + // sb.AppendLine(); + // sb.Append(") AS s("); + // foreach (var item in columns) + // { + // sb.AppendEmphasis(item.ColumnName, database); + // sb.Append(','); + // if (item.IsVersionColumn) + // { + // sb.Append(NEW_VERSION_COLUMN); + // sb.Append(','); + // } + // } + // sb.RemoveLast(1); + // sb.AppendLine(")"); + // } + // } + //} +} diff --git a/src/Providers/LightORM.Providers.PostgreSQL/LightORM.Providers.PostgreSQL.csproj b/src/Providers/LightORM.Providers.PostgreSQL/LightORM.Providers.PostgreSQL.csproj index ef46f895..c637afd3 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/LightORM.Providers.PostgreSQL.csproj +++ b/src/Providers/LightORM.Providers.PostgreSQL/LightORM.Providers.PostgreSQL.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.Writer.cs similarity index 91% rename from src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs rename to src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.Writer.cs index d9e92582..5340363d 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.Writer.cs @@ -1,14 +1,12 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; +using LightORM.Extension; using LightORM.Providers.PostgreSQL.Utils; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; -namespace LightORM.Providers.PostgreSQL.TableStructure; +namespace LightORM.Providers.PostgreSQL; -public class PostgreSQLTableWriter : LightORM.Implements.WriteTableFromType +partial class PostgreSQLTableHandler { public override IEnumerable BuildTableSql(PostgreSQLTableOptions option, DbTable table) { @@ -103,9 +101,13 @@ protected override string BuildColumn(PostgreSQLTableOptions option, DbColumn co string dataType = ConvertToDbType(option, column); // 处理长度限制 - if (dataType.Contains("CHAR") || dataType == "NUMERIC") + if (dataType == "NUMERIC") { - dataType = column.Length != null ? $"{dataType}({column.Length})" : dataType; + dataType = column.Length.HasValue ? $"{dataType}({column.Length})" : dataType; + } + if (dataType == "TEXT" && column.Length.HasValue) + { + dataType = $"VARCHAR({column.Length})"; } string notNull = column.NotNull || column.PrimaryKey ? " NOT NULL" : " NULL"; @@ -128,7 +130,7 @@ protected override string ConvertToDbType(PostgreSQLTableOptions option, DbColum return type.DataType.TransformType(); } - protected override string DbEmphasis(PostgreSQLTableOptions option, string name) => $"\"{name}\""; + protected override string DbEmphasis(PostgreSQLTableOptions option, string name) => adapter.SafeAttach(name); private static string FormatDefaultValue(object value, string dataType) { diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs index e265755a..d13237e3 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs @@ -1,16 +1,11 @@ using LightORM.DbStruct; using LightORM.Implements; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using LightORM.Providers.PostgreSQL.TableStructure; +using LightORM.Interfaces; namespace LightORM.Providers.PostgreSQL; -public sealed class PostgreSQLTableHandler(PostgreSQLTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class PostgreSQLTableHandler(PostgreSQLTableOptions tableOptions, IDatabaseAdapter adapter) + : BaseDatabaseHandler { public override PostgreSQLTableOptions Options => tableOptions; diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs index aa68795c..2a70b58d 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs @@ -30,12 +30,12 @@ public static PostgreSQLProvider Create(Action option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { - DbHandler = new PostgreSQLTableHandler(option.GenerateOption); var sqlMethodResolver = new PostgreSQLMethodResolver(); option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomPostgreSQL(sqlMethodResolver, option.GenerateOption); + DbHandler = new PostgreSQLTableHandler(option.GenerateOption, DatabaseAdapter); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? false; DbProviderFactory = option.NewFactory ?? Npgsql.NpgsqlFactory.Instance; } diff --git a/src/Providers/LightORM.Providers.SqlServer/LightORM.Providers.SqlServer.csproj b/src/Providers/LightORM.Providers.SqlServer/LightORM.Providers.SqlServer.csproj index 6c76830a..235fad16 100644 --- a/src/Providers/LightORM.Providers.SqlServer/LightORM.Providers.SqlServer.csproj +++ b/src/Providers/LightORM.Providers.SqlServer/LightORM.Providers.SqlServer.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs index 6f281373..2ddd1b6e 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs @@ -41,7 +41,7 @@ private SqlServerProvider(SqlServerVersion version option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomSqlServerAdapter(version, sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? SqlClientFactory.Instance; } diff --git a/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs similarity index 96% rename from src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs rename to src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs index 715e5b0b..2c50b43f 100644 --- a/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs @@ -1,13 +1,14 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LightORM.Providers.SqlServer.TableStructure; +namespace LightORM.Providers.SqlServer; -public class SqlServerTableWriter : LightORM.Implements.WriteTableFromType +partial class SqlServerTableHandler { public override IEnumerable BuildTableSql(SqlServerTableOptions option, DbTable table) { diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs index e2114483..b5866816 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs @@ -1,7 +1,6 @@ using LightORM; using LightORM.DbStruct; using LightORM.Implements; -using LightORM.Providers.SqlServer.TableStructure; using System; using System.Collections.Generic; using System.Linq; @@ -10,8 +9,8 @@ namespace LightORM.Providers.SqlServer; -public sealed class SqlServerTableHandler(SqlServerTableOptions tableOptions) - : BaseDatabaseHandler +public sealed partial class SqlServerTableHandler(SqlServerTableOptions tableOptions) + : BaseDatabaseHandler< SqlServerTableOptions> { public override SqlServerTableOptions Options => tableOptions; public override string GetTablesSql() diff --git a/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj b/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj index 0fec596a..ee8ed79b 100644 --- a/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj +++ b/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj @@ -1,5 +1,5 @@  - + enable enable diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs index 1ae9a4f0..40c7caf9 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs @@ -29,7 +29,7 @@ private SqliteProvider(DataBaseOption option) : base(option. option.SqlMethodConfiguration?.Invoke(sqlMethodResolver); DatabaseAdapter = new CustomSqliteAdapter(sqlMethodResolver, option.GenerateOption); DatabaseAdapter.AddKeyWord(option.Keyworks); - DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote; + DatabaseAdapter.UseIdentifierQuote = option.IsUseIdentifierQuote ?? true; DbProviderFactory = option.NewFactory ?? SQLiteFactory.Instance; } diff --git a/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs similarity index 96% rename from src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs rename to src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs index 9e0e4895..cc7048a8 100644 --- a/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs @@ -1,13 +1,14 @@ -using LightORM.DbStruct; +using LightORM; +using LightORM.DbStruct; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LightORM.Providers.Sqlite.TableStructure; +namespace LightORM.Providers.Sqlite; -public class SqliteTableWriter : LightORM.Implements.WriteTableFromType +partial class SqliteTableHandler { private readonly ThreadLocal useAutoIncrement = new ThreadLocal(() => false); diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs index 1717cb0f..5d242956 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs @@ -1,12 +1,11 @@ using LightORM.DbStruct; using LightORM.Implements; using System.Text; -using LightORM.Providers.Sqlite.TableStructure; namespace LightORM.Providers.Sqlite; -public sealed class SqliteTableHandler(SqliteTableOptions generateOption) - : BaseDatabaseHandler +public sealed partial class SqliteTableHandler(SqliteTableOptions generateOption) + : BaseDatabaseHandler { public override SqliteTableOptions Options => generateOption; diff --git a/test/LightORMTest.MySql/MSTestSettings.cs b/test/LightORMTest.MySql/MSTestSettings.cs index 8b7de71c..64316b22 100644 --- a/test/LightORMTest.MySql/MSTestSettings.cs +++ b/test/LightORMTest.MySql/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] \ No newline at end of file diff --git a/test/LightORMTest.Oracle/MSTestSettings.cs b/test/LightORMTest.Oracle/MSTestSettings.cs index 8b7de71c..64316b22 100644 --- a/test/LightORMTest.Oracle/MSTestSettings.cs +++ b/test/LightORMTest.Oracle/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] \ No newline at end of file diff --git a/test/LightORMTest.PostgreSQL/MSTestSettings.cs b/test/LightORMTest.PostgreSQL/MSTestSettings.cs index aaf278c8..21d16952 100644 --- a/test/LightORMTest.PostgreSQL/MSTestSettings.cs +++ b/test/LightORMTest.PostgreSQL/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] diff --git a/test/LightORMTest.PostgreSQL/ResultTest/JsonTest.cs b/test/LightORMTest.PostgreSQL/ResultTest/JsonTest.cs index b681d697..038313d4 100644 --- a/test/LightORMTest.PostgreSQL/ResultTest/JsonTest.cs +++ b/test/LightORMTest.PostgreSQL/ResultTest/JsonTest.cs @@ -17,23 +17,20 @@ protected override void Configura(IExpressionContextSetup option) [TestMethod] public override async Task TestJsonUpdateAsync() { - await PrepareJsonDataAsync(Db, async () => - { - await Db.Update().Set(j => SqlFn.JsonSet(j.JsonObject, "{City,Name}", "\"NewName\"")).Where(j => j.Id == 1).ExecuteAsync(); + await Db.Update().Set(j => SqlFn.JsonSet(j.JsonObject, "{City,Name}", "\"NewName\"")).Where(j => j.Id == 1).ExecuteAsync(TestContext.CancellationToken); - var updated = await Db.Select().Where(j => j.Id == 1).FirstAsync(); - Assert.IsNotNull(updated); - Assert.AreEqual("NewName", updated.JsonObject["City"]!["Name"]!.GetValue()); + var updated = await Db.Select().Where(j => j.Id == 1).FirstAsync(TestContext.CancellationToken); + Assert.IsNotNull(updated); + Assert.AreEqual("NewName", updated.JsonObject["City"]!["Name"]!.GetValue()); - var name = "NewName"; + var name = "NewName"; - await Db.Update().Set(j => j.Json!.NestJson!.Name, name).Where(j => j.Id == 5).ExecuteAsync(); + await Db.Update().Set(j => j.Json!.NestJson!.Name, name).Where(j => j.Id == 5).ExecuteAsync(TestContext.CancellationToken); - var nestJsonNameNew = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name); + var nestJsonNameNew = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name, TestContext.CancellationToken); - Assert.HasCount(1, nestJsonNameNew); - Assert.AreEqual("NewName", nestJsonNameNew[0]); - - }); + Assert.HasCount(1, nestJsonNameNew); + Assert.AreEqual("NewName", nestJsonNameNew[0]); } + } \ No newline at end of file diff --git a/test/LightORMTest/MSTestSettings.cs b/test/LightORMTest/MSTestSettings.cs index aaf278c8..21d16952 100644 --- a/test/LightORMTest/MSTestSettings.cs +++ b/test/LightORMTest/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] diff --git a/test/LightORMTest/Models/User.cs b/test/LightORMTest/Models/User.cs index 5d4572d3..8e3b7616 100644 --- a/test/LightORMTest/Models/User.cs +++ b/test/LightORMTest/Models/User.cs @@ -19,8 +19,12 @@ public class User public int Id { get; set; } [LightColumn(Name = "USER_ID", PrimaryKey = true, Comment = "用户ID")] public string UserId { get; set; } - [LightColumn(Name = "USER_NAME", Comment = "名称")] - public string UserName { get; set; } + [LightColumn(Name = "USER_NAME", Comment = "名称", Length = 128)] + public string UserName + { + get; + set; + } [LightColumn(Name = "PASSWORD", Comment = "密码")] public string Password { get; set; } [LightColumn(Name = "AGE", Comment = "年龄")] diff --git a/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs b/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs index 9404b5db..b09f7460 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.InitData.cs @@ -62,7 +62,7 @@ await Db.Insert([ { UserId = "test05", UserName = "Test5", - Age = 22, + Age = 21, IsLock = true, Password = "helloworld", Sign = SignType.Svip @@ -71,7 +71,7 @@ await Db.Insert([ { UserId = "test06", UserName = "Test6", - Age = 18, + Age = 17, IsLock = false, Password = "helloworld", Sign = SignType.Svip diff --git a/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs b/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs index b67bc775..3fd0930b 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs @@ -250,7 +250,7 @@ await Parallel.ForAsync(0, 20, async (i, ct) => try { using var scope = Db.CreateScoped(); - await scope.BeginTransactionAsync(IsolationLevel.RepeatableRead, TestContext.CancellationToken); + await scope.BeginTransactionAsync(IsolationLevel.ReadCommitted, TestContext.CancellationToken); // 读取当前值 var currentUser = await scope.Select() diff --git a/test/LightORMTest/ResultTest/ExecutionTest.cs b/test/LightORMTest/ResultTest/ExecutionTest.cs index c76d67a4..9a54e921 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.cs @@ -1,4 +1,5 @@ -using System.Diagnostics.CodeAnalysis; +using LightORM.Extension; +using System.Diagnostics.CodeAnalysis; using System.Text; namespace LightORMTest.ResultTest; @@ -11,7 +12,7 @@ public async Task Select_Result_Test() { // tolist var list1 = await Db.Select().OrderBy(u => u.Age).ToListAsync(TestContext.CancellationToken); - Assert.HasCount(4, list1); + Assert.HasCount(6, list1); Assert.AreEqual(8, list1[0].Age); Assert.AreEqual(9, list1[1].Age); Assert.AreEqual(11, list1[2].Age); @@ -102,19 +103,19 @@ public async Task Select_Result_Test() // select string column var list4 = await Db.Select().ToListAsync(u => u.UserName, TestContext.CancellationToken); - Assert.HasCount(4, list4); + Assert.HasCount(6, list4); Assert.AreEqual("Test1", list4[0]); Assert.AreEqual("Test2", list4[1]); // select int column var list5 = await Db.Select().ToListAsync(u => u.Age, TestContext.CancellationToken); - Assert.HasCount(4, list5); + Assert.HasCount(6, list5); Assert.AreEqual(9, list5[1]); Assert.AreEqual(8, list5[2]); // select anonymous type var list6 = await Db.Select().ToListAsync(u => new { u.UserId, u.UserName, u.Age }, TestContext.CancellationToken); - Assert.HasCount(4, list6); + Assert.HasCount(6, list6); Assert.AreEqual("test02", list6[1].UserId); Assert.AreEqual("Test2", list6[1].UserName); Assert.AreEqual(9, list6[1].Age); @@ -129,10 +130,10 @@ public async Task Select_Result_Test() AvgAge = g.Average(g.Tables.Age), MaxAge = g.Max(g.Tables.Age), MinAge = g.Min(g.Tables.Age), - }); + }, TestContext.CancellationToken); Assert.HasCount(2, list7); - Assert.IsTrue(list7.Any(r => r.IsLock == true && r.Total == 2 && r.AvgAge == 10.5 && r.MaxAge == 12 && r.MinAge == 9)); - Assert.IsTrue(list7.Any(r => r.IsLock == false && r.Total == 2 && r.AvgAge == 9.5 && r.MaxAge == 11 && r.MinAge == 8)); + Assert.IsTrue(list7.Any(r => r.IsLock == true && r.Total == 3 && r.AvgAge == 14 && r.MaxAge == 21 && r.MinAge == 9)); + Assert.IsTrue(list7.Any(r => r.IsLock == false && r.Total == 3 && r.AvgAge == 12 && r.MaxAge == 17 && r.MinAge == 8)); // select projection var dto = await Db.Select() @@ -165,17 +166,17 @@ public async Task Select_Single_Column() { var avatorData = await Db.Select().TagWith("SelectColumns then ExecuteScalarAsync").Where(u => u.UserId.EndsWith("01")).SelectColumns(u => u.Avator).ExecuteScalarAsync(TestContext.CancellationToken); Assert.IsNotNull(avatorData); - var avaStr = Encoding.UTF8.GetString(avatorData); + var avaStr = Encoding.UTF8.GetString(avatorData).Trim('\0'); Assert.AreEqual("test01", avaStr); avatorData = await Db.Select().TagWith("SelectColumns then FirstAsync").Where(u => u.UserId.EndsWith("01")).SelectColumns(u => u.Avator).FirstAsync(TestContext.CancellationToken); Assert.IsNotNull(avatorData); - avaStr = Encoding.UTF8.GetString(avatorData); + avaStr = Encoding.UTF8.GetString(avatorData).Trim('\0'); Assert.AreEqual("test01", avaStr); avatorData = await Db.Select().TagWith("FirstAsync").Where(u => u.UserId.EndsWith("01")).FirstAsync(u => u.Avator, TestContext.CancellationToken); Assert.IsNotNull(avatorData); - avaStr = Encoding.UTF8.GetString(avatorData); + avaStr = Encoding.UTF8.GetString(avatorData).Trim('\0'); Assert.AreEqual("test01", avaStr); } @@ -277,25 +278,25 @@ public async Task MultiResultTest() var u = await multi.ReadListAsync(); var r = await multi.ReadListAsync(); var ur = await multi.ReadListAsync(); - Assert.HasCount(4, u); - Assert.HasCount(2, r); - Assert.HasCount(4, ur); + Assert.HasCount(6, u); + Assert.HasCount(3, r); + Assert.HasCount(7, ur); } [TestMethod] public async Task SelectByAdo() { - var users = await Db.Ado.QueryListAsync(""" - select * from user - where age > @Age + var users = await Db.Ado.QueryListAsync($""" + select * from {CurrentDefaultProvider.DatabaseAdapter.AttachEmphasis("USER")} + where age > {CurrentDefaultProvider.DatabaseAdapter.Prefix}Age """, new { Age = 10 }, cancellationToken: TestContext.CancellationToken); - Assert.HasCount(2, users); + Assert.HasCount(4, users); - var users2 = await Db.Ado.Execute(""" - select * from user - where age > @Age + var users2 = await Db.Ado.Execute($""" + select * from {CurrentDefaultProvider.DatabaseAdapter.AttachEmphasis("USER")} + where age > {CurrentDefaultProvider.DatabaseAdapter.Prefix}Age """, new { Age = 10 }).ToListAsync(TestContext.CancellationToken); - Assert.HasCount(2, users2); + Assert.HasCount(4, users2); } [TestMethod] @@ -350,7 +351,7 @@ public async Task InsertOrUpdateBatchTest() var e2 = await Db.Insert(nr1, nr2).OrUpdate().ExecuteAsync(TestContext.CancellationToken); Assert.AreEqual(0, e1); if (DbType == DbBaseType.MySql) - Assert.AreEqual(2, e2); + Assert.AreEqual(4, e2); else Assert.AreEqual(2, e2); var nu1 = new Sales() @@ -375,7 +376,7 @@ public async Task InsertOrUpdateBatchTest() var e4 = await Db.Insert(nu1, nu2).OrUpdate().ExecuteAsync(TestContext.CancellationToken); Assert.AreEqual(0, e3); if (DbType == DbBaseType.MySql) - Assert.AreEqual(2, e4); + Assert.AreEqual(4, e4); else Assert.AreEqual(2, e4); } diff --git a/test/LightORMTest/ResultTest/JsonTest.cs b/test/LightORMTest/ResultTest/JsonTest.cs index f8ff0bc5..29c43342 100644 --- a/test/LightORMTest/ResultTest/JsonTest.cs +++ b/test/LightORMTest/ResultTest/JsonTest.cs @@ -38,90 +38,84 @@ private static JsonTestModel CreateJsonModel(int i) JsonObject = System.Text.Json.JsonSerializer.Deserialize(jsonString)! }; } - protected static async Task PrepareJsonDataAsync(IExpressionContext db, Func action) + [TestInitialize] + public async Task PrepareJsonDataAsync() { - db.Delete().FullDelete().Execute(); - await db.Insert(CreateJsonModel(1)).ExecuteAsync(); - await db.Insert(CreateJsonModel(2)).ExecuteAsync(); - await db.Insert(CreateJsonModel(3)).ExecuteAsync(); - await db.Insert(CreateJsonModel(4)).ExecuteAsync(); - await db.Insert(CreateJsonModel(5)).ExecuteAsync(); - await action(); - //db.Delete().FullDelete().Execute(); - } + try + { + await Db.CreateMainDbScoped().CreateTableAsync(cancellationToken: TestContext.CancellationToken); + } + catch (Exception) + { - [TestMethod] - public async Task CreateTable() - { - await Db.CreateMainDbScoped().CreateTableAsync(cancellationToken: TestContext.CancellationToken); + } + await Db.Delete().FullDelete().ExecuteAsync(TestContext.CancellationToken); + await Db.Insert(CreateJsonModel(1)).ExecuteAsync(TestContext.CancellationToken); + await Db.Insert(CreateJsonModel(2)).ExecuteAsync(TestContext.CancellationToken); + await Db.Insert(CreateJsonModel(3)).ExecuteAsync(TestContext.CancellationToken); + await Db.Insert(CreateJsonModel(4)).ExecuteAsync(TestContext.CancellationToken); + await Db.Insert(CreateJsonModel(5)).ExecuteAsync(TestContext.CancellationToken); + //db.Delete().FullDelete().Execute(); } [TestMethod] public async Task TestJsonSelectAsync() { - await PrepareJsonDataAsync(Db, async () => - { - var model = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(TestContext.CancellationToken); - Assert.HasCount(1, model); - Assert.IsNotNull(model[0].Json); - Assert.AreEqual("World2", model[0].Json!.Name); + var model = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(TestContext.CancellationToken); + Assert.HasCount(1, model); + Assert.IsNotNull(model[0].Json); + Assert.AreEqual("World2", model[0].Json!.Name); - var list = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(j => new - { - j.Id, - j.Json, - }, TestContext.CancellationToken); - Assert.HasCount(1, list); - Assert.IsNotNull(list[0].Json); - Assert.AreEqual("World2", list[0].Json!.Name); - - var dto = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(j => new JsonTestModelDto() - { - Id = j.Id, - Json = j.Json, - }, TestContext.CancellationToken); - Assert.HasCount(1, dto); - Assert.IsNotNull(dto[0].Json); - Assert.AreEqual("World2", dto[0].Json!.Name); - - var jsonObject = await Db.Select().Where(j => j.JsonObject["City"]!["Name"]!.GetValue() == "Dongguan3").FirstAsync(TestContext.CancellationToken); - Assert.IsNotNull(jsonObject); - Assert.AreEqual(21, jsonObject.JsonObject["Age"]!.GetValue()); + var list = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(j => new + { + j.Id, + j.Json, + }, TestContext.CancellationToken); + Assert.HasCount(1, list); + Assert.IsNotNull(list[0].Json); + Assert.AreEqual("World2", list[0].Json!.Name); + + var dto = await Db.Select().Where(j => j.Json!.Value == 22).ToListAsync(j => new JsonTestModelDto() + { + Id = j.Id, + Json = j.Json, + }, TestContext.CancellationToken); + Assert.HasCount(1, dto); + Assert.IsNotNull(dto[0].Json); + Assert.AreEqual("World2", dto[0].Json!.Name); - var jsonObjectArr = await Db.Select().Where(j => j.JsonObject["Values"]![1]!.GetValue() == 8).FirstAsync(TestContext.CancellationToken); - Assert.IsNotNull(jsonObjectArr); - Assert.AreEqual(22, jsonObjectArr.JsonObject["Age"]!.GetValue()); + var jsonObject = await Db.Select().Where(j => j.JsonObject["City"]!["Name"]!.GetValue() == "Dongguan3").FirstAsync(TestContext.CancellationToken); + Assert.IsNotNull(jsonObject); + Assert.AreEqual(21, jsonObject.JsonObject["Age"]!.GetValue()); - var nestJsonName = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name, TestContext.CancellationToken); + var jsonObjectArr = await Db.Select().Where(j => j.JsonObject["Values"]![1]!.GetValue() == 8).FirstAsync(TestContext.CancellationToken); + Assert.IsNotNull(jsonObjectArr); + Assert.AreEqual(22, jsonObjectArr.JsonObject["Age"]!.GetValue()); - Assert.HasCount(1, nestJsonName); - Assert.AreEqual("Nest Object5", nestJsonName[0]); + var nestJsonName = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name, TestContext.CancellationToken); - }); + Assert.HasCount(1, nestJsonName); + Assert.AreEqual("Nest Object5", nestJsonName[0]); } [TestMethod] public virtual async Task TestJsonUpdateAsync() { - await PrepareJsonDataAsync(Db, async () => - { - await Db.Update().Set(j => SqlFn.JsonSet(j.JsonObject, "$.City.Name", "NewName")) + await Db.Update().Set(j => SqlFn.JsonSet(j.JsonObject, "$.City.Name", "NewName")) .Where(j => j.Id == 1).ExecuteAsync(TestContext.CancellationToken); - var updated = await Db.Select().Where(j => j.Id == 1).FirstAsync(TestContext.CancellationToken); - Assert.IsNotNull(updated); - Assert.AreEqual("NewName", updated.JsonObject["City"]!["Name"]!.GetValue()); - - await Db.Update().Set(j => j.Json!.NestJson!.Name, "NewName") - .Where(j => j.Id == 5).ExecuteAsync(TestContext.CancellationToken); + var updated = await Db.Select().Where(j => j.Id == 1).FirstAsync(TestContext.CancellationToken); + Assert.IsNotNull(updated); + Assert.AreEqual("NewName", updated.JsonObject["City"]!["Name"]!.GetValue()); - var nestJsonNameNew = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name, TestContext.CancellationToken); + await Db.Update().Set(j => j.Json!.NestJson!.Name, "NewName") + .Where(j => j.Id == 5).ExecuteAsync(TestContext.CancellationToken); - Assert.HasCount(1, nestJsonNameNew); - Assert.AreEqual("NewName", nestJsonNameNew[0]); + var nestJsonNameNew = await Db.Select().Where(j => j.Id == 5).ToListAsync(j => j.Json!.NestJson!.Name, TestContext.CancellationToken); - }); + Assert.HasCount(1, nestJsonNameNew); + Assert.AreEqual("NewName", nestJsonNameNew[0]); } - public TestContext TestContext { get; set; } + public required TestContext TestContext { get; set; } } diff --git a/test/LightORMTest/TestBase.cs b/test/LightORMTest/TestBase.cs index 6e577bfb..2e0f8156 100644 --- a/test/LightORMTest/TestBase.cs +++ b/test/LightORMTest/TestBase.cs @@ -18,7 +18,7 @@ public class TestBase [NotNull] public virtual DbBaseType? DbType { get; } private readonly Dictionary sqlResults = []; - + protected IDatabaseProvider CurrentDefaultProvider => Db.Options.DatabaseProviders.First().Value; protected TestBase() { IServiceCollection services = new ServiceCollection(); From e6b8ecf96702cd4d159eef1235b94cda429ad17e Mon Sep 17 00:00:00 2001 From: MarvelTiter_yaoqinglin Date: Mon, 31 Aug 2026 10:54:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DatabaseUtils/App.xaml.cs | 5 +- DatabaseUtils/Helper/TypeMap.cs | 9 +- ...10\346\234\254\346\227\245\345\277\227.md" | 7 + src/LightORM/AssemblyInfo.cs | 1 + src/LightORM/Builder/DeleteBuilder.cs | 1 - src/LightORM/Builder/InsertBuilder.cs | 1 - .../ExpressionSql/ExpressionCoreSql.cs | 3 +- .../ExpressionSql/ExpressionCoreSqlBase.cs | 4 +- .../ExpressionSql/TransientContext.cs | 6 +- src/LightORM/Implements/WriteTableFromType.cs | 4 +- .../Interfaces/ExpSql/IExpSelectGroup.cs | 8 + .../ExpressionBuilder.ExternalHelper.cs | 48 +----- src/LightORM/SqlExecutor/SqlAdo.cs | 4 +- src/LightORM/Utils/TableColumnInfoEqual.cs | 12 +- .../SelectExtensionGenerator.cs | 1 - .../SelectInterfacesGenerator.cs | 1 - .../SelectProvidersGenerator.cs | 2 - .../DiagnosticDefinitions.cs | 3 - .../LightOrmAotAnalyzer.cs | 1 - .../PropertyScanResult.cs | 5 +- ...extGenerator.CreateInitColumnInfoMethod.cs | 5 +- .../TableContextGenerator.cs | 2 - .../CustomDamengAdapter.ValueFormat.cs | 6 +- .../DamengMethodResolver.cs | 5 - .../DamengTableHandler.Writer.cs | 5 - .../DamengTableHandler.cs | 1 - .../DamengTableOptions.cs | 8 +- .../CustomKingbaseESAdapter.BatchInsert.cs | 147 +++++++++++++++++ .../CustomKingbaseESAdapter.InsertOrUpdate.cs | 5 - .../KingbaseESTableOptions.cs | 8 +- .../CustomMySqlAdapter.BatchInsert.cs | 1 - .../CustomMySqlAdapter.InertOrUpdate.cs | 5 - .../MySqlMethodResolver.cs | 5 - .../MySqlTableHandler.Writer.cs | 4 - .../MySqlTableHandler.cs | 5 - .../MySqlTableOptions.cs | 8 +- .../CustomOracleAdapter.cs | 3 +- .../Extensions/IoCExtension.cs | 2 - .../OracleMethodResolver.cs | 1 - .../OracleTableHandler.Writer.cs | 5 - .../OracleTableHandler.cs | 5 - .../OracleTableOptions.cs | 8 +- .../CustomPostgreSQL.BatchInsert.cs | 8 - .../CustomPostgreSQL.InsertOrUpdate.cs | 5 - .../PostgreSQLTableOptions.cs | 8 +- .../PostgresSQLProvider.cs | 5 - .../Utils/FormatType.cs | 8 +- .../CustomSqlServerAdapter.BatchInsert.cs | 114 ++++++++++++++ .../SqlServerTableHandler.Writer.cs | 4 - .../SqlServerTableHandler.cs | 8 +- .../SqlServerTableOptions.cs | 8 +- .../CustomSqliteAdapter.BatchInsert.cs | 148 ++++++++++++++++++ .../CustomSqliteAdapter.InsertOrUpdate.cs | 74 +++++++++ .../CustomSqliteAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 1 - .../SqliteTableHandler.Writer.cs | 4 - .../SqliteTableHandler.cs | 1 - .../SqliteTableOptions.cs | 8 +- src/versions.props | 34 ++-- test.db | Bin 376832 -> 376832 bytes test/BenchmarkTest/Program.cs | 1 - test/BenchmarkTest/SqlBuild.cs | 4 - test/BenchmarkTest/StringBuilderPoolTest.cs | 3 - test/LightORMTest.Dameng/DatabaseType.cs | 6 +- test/LightORMTest.Dameng/GlobalUsings.cs | 5 - test/LightORMTest.Dameng/MSTestSettings.cs | 2 +- test/LightORMTest.Dameng/RepositoryTest.cs | 9 +- .../ResultTest/ExecutionTest.cs | 6 +- test/LightORMTest.Dameng/SelectResult.cs | 8 +- .../SqlGenerate/DeleteSql.cs | 9 +- .../SqlGenerate/SelectSql.cs | 4 +- .../SqlGenerate/UpdateSql.cs | 9 +- test/LightORMTest.MySql/GlobalUsings.cs | 5 - .../ResultTest/ExecutionTest.cs | 6 +- .../SqlGenerate/SelectSql_Json.cs | 6 +- test/LightORMTest.Oracle/DbMethodTest.cs | 4 +- test/LightORMTest.Oracle/GlobalUsings.cs | 4 - test/LightORMTest.Oracle/LinqTest.cs | 8 +- test/LightORMTest.Oracle/RepositoryTest.cs | 8 +- .../ResultTest/ExecutionTest.cs | 6 +- .../ScopedTest/TransactionTest.cs | 6 +- .../SqlGenerate/DeleteSql.cs | 8 +- .../SqlGenerate/InsertOrUpdateTest.cs | 6 +- .../SqlGenerate/InsertSql.cs | 9 +- .../SqlGenerate/SelectSql_Json.cs | 6 +- .../SqlGenerate/UpdateSql.cs | 6 +- .../SqlGenerate/WithOriginSql.cs | 8 +- test/LightORMTest.PostgreSQL/AdoTest.cs | 8 +- test/LightORMTest.PostgreSQL/GlobalUsings.cs | 4 - .../LightORMTest.PostgreSQL/RepositoryTest.cs | 8 +- .../ResultTest/ExecutionTest.cs | 6 +- test/LightORMTest.PostgreSQL/SelectResult.cs | 6 +- .../SqlGenerate/DeleteSql.cs | 8 +- .../SqlGenerate/SelectSql.cs | 4 +- .../SqlGenerate/SelectSql_Json.cs | 6 +- .../SqlGenerate/UpdateSql.cs | 8 +- test/LightORMTest.SqlServer/DbMethodTest.cs | 5 +- test/LightORMTest.SqlServer/GlobalUsings.cs | 4 - test/LightORMTest.SqlServer/MSTestSettings.cs | 2 +- test/LightORMTest.SqlServer/RepositoryTest.cs | 8 +- .../ResultTest/ExecutionTest.cs | 6 +- .../ResultTest/JsonTest.cs | 5 +- .../ResultTest/Select.cs | 4 - .../SqlGenerate/SelectSql_Json.cs | 6 +- test/LightORMTest.Sqlite/AdoTest.cs | 25 +++ test/LightORMTest.Sqlite/GlobalUsings.cs | 5 - test/LightORMTest.Sqlite/MSTestSettings.cs | 2 +- .../ResultTest/ExecutionTest.cs | 6 +- .../SqlGenerate/InsertSql.cs | 8 +- .../SqlGenerate/SelectSql_Json.cs | 6 +- test/LightORMTest/AdoTest.cs | 5 +- test/LightORMTest/BulkCopyTest.cs | 7 +- test/LightORMTest/ColumnCompareTest.cs | 6 - test/LightORMTest/CreateTableTest.cs | 6 +- test/LightORMTest/DbMethodTest.cs | 7 +- .../ExpressionTest/ConstantExpressionTest.cs | 5 - .../ExpressionConstantValueExtractTest.cs | 5 - .../ExpressionTest/FormatStringTest.cs | 4 - test/LightORMTest/ExpressionTest/IsNotTest.cs | 10 +- .../ExpressionTest/TypeSetFlatTest.cs | 3 - test/LightORMTest/LinqTest.cs | 5 - test/LightORMTest/Models/JsonTestModel.cs | 6 +- test/LightORMTest/Models/Product.cs | 5 +- test/LightORMTest/Models/Sales.cs | 6 +- .../ReadParameter/DbParameterReadTest.cs | 3 - .../ReflectTest/TableColumnTest.cs | 5 - test/LightORMTest/RepositoryTest.cs | 5 - .../ResolverTest/ValueResolveTest.cs | 4 - .../ResultTest/ExecutionTest.Trans.cs | 5 +- test/LightORMTest/ResultTest/JsonTest.cs | 5 +- .../ScopedTest/TransactionTest.cs | 7 +- .../SqlGenerate/InsertOrUpdateTest.cs | 6 +- test/LightORMTest/SqlGenerate/InsertSql.cs | 8 +- .../SqlGenerate/SelectSql.Group.cs | 8 +- .../SqlGenerate/SelectSql_Json.cs | 6 +- test/LightORMTest/SqlGenerate/UpdateSql.cs | 7 +- .../LightORMTest/SqlGenerate/WithOriginSql.cs | 8 +- test/LightORMTest/SwitchDatabaseTest.cs | 7 - test/LightORMTest/TestBase.cs | 2 - test/LightORMTest/TestTableContext.cs | 9 +- test/TestProject1/DataHelper.cs | 8 +- .../ExpressionTest/ConditionalTest.cs | 5 - .../ExpressionTest/ConstraintTest.cs | 7 +- .../ExpressionTest/SelectExpressionTest.cs | 8 +- test/TestProject1/FlatSqlTest/SelectTest.cs | 8 +- test/TestProject1/Models/Product.cs | 5 +- test/TestProject1/Models/RunLog.cs | 2 - test/TestProject1/Other.cs | 6 +- test/TestProject1/ResultTest/SelectResult.cs | 9 +- .../SqlFunctionTest/SqlFunTest.cs | 9 +- test/TestProject1/SqlTest/SelectResult.cs | 8 +- test/TestProject1/StringBuilderHelperTest.cs | 4 - test/TestProject1/TestBase.cs | 1 - test/TestProject1/TestTableContext.cs | 10 +- test/TestProject1/TypeSetFlatTest.cs | 7 - test/TestWeb/Models/Product.cs | 5 +- test/TestWeb/Models/Role.cs | 4 +- test/TestWeb/Models/RunLog.cs | 2 - test/TestWeb/Services.cs | 3 +- 159 files changed, 637 insertions(+), 771 deletions(-) create mode 100644 src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.BatchInsert.cs create mode 100644 src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.BatchInsert.cs create mode 100644 src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.BatchInsert.cs create mode 100644 src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.InsertOrUpdate.cs create mode 100644 test/LightORMTest.Sqlite/AdoTest.cs diff --git a/DatabaseUtils/App.xaml.cs b/DatabaseUtils/App.xaml.cs index 87f93e72..7405e651 100644 --- a/DatabaseUtils/App.xaml.cs +++ b/DatabaseUtils/App.xaml.cs @@ -1,7 +1,4 @@ -using System.Configuration; -using System.Data; -using System.IO; -using System.Windows; +using System.Windows; namespace DatabaseUtils { diff --git a/DatabaseUtils/Helper/TypeMap.cs b/DatabaseUtils/Helper/TypeMap.cs index 2af891a8..d483fbec 100644 --- a/DatabaseUtils/Helper/TypeMap.cs +++ b/DatabaseUtils/Helper/TypeMap.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DatabaseUtils.Helper +namespace DatabaseUtils.Helper { public class TypeMap diff --git "a/doc/\347\211\210\346\234\254\346\227\245\345\277\227.md" "b/doc/\347\211\210\346\234\254\346\227\245\345\277\227.md" index da1dc538..c6df1cf3 100644 --- "a/doc/\347\211\210\346\234\254\346\227\245\345\277\227.md" +++ "b/doc/\347\211\210\346\234\254\346\227\245\345\277\227.md" @@ -1,5 +1,12 @@ # 版本功能更新记录 +## v2026.08.31 +- ⚡️批量插入或更新(添加Sqlite支持) +- 🛠Delete导航删除使用更通用的写法 +- 🛠PostgreSQL默认不使用QuoteIdentifiers +- 🐞修复TransientContext传递错误的Ado +- 🐞修复生成器读取标签属性错误 + ## v2026.08.26 - 🐞修复`ExecuteResult`中的DataReader重复Close - 🐞修复实体映射处理匿名类型中的class类型 diff --git a/src/LightORM/AssemblyInfo.cs b/src/LightORM/AssemblyInfo.cs index eb4567af..32f9f37d 100644 --- a/src/LightORM/AssemblyInfo.cs +++ b/src/LightORM/AssemblyInfo.cs @@ -6,6 +6,7 @@ [assembly: InternalsVisibleTo("InjectTest")] [assembly: InternalsVisibleTo("TestProject1")] [assembly: InternalsVisibleTo("LightORMTest")] +[assembly: InternalsVisibleTo("LightORMTest.Sqlite")] [assembly: InternalsVisibleTo("LightORMTest.PostgreSQL")] [assembly: InternalsVisibleTo("BenchmarkTest")] diff --git a/src/LightORM/Builder/DeleteBuilder.cs b/src/LightORM/Builder/DeleteBuilder.cs index a5a9091a..2bd475a0 100644 --- a/src/LightORM/Builder/DeleteBuilder.cs +++ b/src/LightORM/Builder/DeleteBuilder.cs @@ -1,6 +1,5 @@ using LightORM.Extension; using System.Diagnostics.CodeAnalysis; -using System.Text; namespace LightORM.Builder; //#if NET8_0_OR_GREATER diff --git a/src/LightORM/Builder/InsertBuilder.cs b/src/LightORM/Builder/InsertBuilder.cs index 8e60e63b..7eed6ca5 100644 --- a/src/LightORM/Builder/InsertBuilder.cs +++ b/src/LightORM/Builder/InsertBuilder.cs @@ -1,5 +1,4 @@ using LightORM.Extension; -using System.Text; namespace LightORM.Builder; diff --git a/src/LightORM/ExpressionSql/ExpressionCoreSql.cs b/src/LightORM/ExpressionSql/ExpressionCoreSql.cs index 798e3c0b..17073dac 100644 --- a/src/LightORM/ExpressionSql/ExpressionCoreSql.cs +++ b/src/LightORM/ExpressionSql/ExpressionCoreSql.cs @@ -1,5 +1,4 @@ -using System.Collections.Concurrent; -using System.Threading; +using System.Threading; using LightORM.DbStruct; namespace LightORM.ExpressionSql; diff --git a/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs b/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs index 13ccbded..108f1815 100644 --- a/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs +++ b/src/LightORM/ExpressionSql/ExpressionCoreSqlBase.cs @@ -1,6 +1,4 @@ -using LightORM.DbStruct; -using LightORM.Providers; -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using System.Threading; namespace LightORM.ExpressionSql; diff --git a/src/LightORM/ExpressionSql/TransientContext.cs b/src/LightORM/ExpressionSql/TransientContext.cs index a5f18cbf..f969ff40 100644 --- a/src/LightORM/ExpressionSql/TransientContext.cs +++ b/src/LightORM/ExpressionSql/TransientContext.cs @@ -1,8 +1,4 @@ -using System.Collections.Concurrent; -using System.Diagnostics.CodeAnalysis; -using System.Threading; - -namespace LightORM; +namespace LightORM; internal sealed class TransientContext :ExpressionCoreSqlBase, ITransientContext { diff --git a/src/LightORM/Implements/WriteTableFromType.cs b/src/LightORM/Implements/WriteTableFromType.cs index 5bf77fe6..d471e99e 100644 --- a/src/LightORM/Implements/WriteTableFromType.cs +++ b/src/LightORM/Implements/WriteTableFromType.cs @@ -1,6 +1,4 @@ -using LightORM.DbStruct; - -namespace LightORM.Implements; +namespace LightORM.Implements; public abstract class WriteTableFromType where TOption : TableOptions { diff --git a/src/LightORM/Interfaces/ExpSql/IExpSelectGroup.cs b/src/LightORM/Interfaces/ExpSql/IExpSelectGroup.cs index 7f262707..55caaf7d 100644 --- a/src/LightORM/Interfaces/ExpSql/IExpSelectGroup.cs +++ b/src/LightORM/Interfaces/ExpSql/IExpSelectGroup.cs @@ -144,6 +144,14 @@ public interface IExpSelectGrouping /// /// double Average(bool exp, TColumn column); + /// + /// + /// + /// + /// + /// + /// + T Round(T value, int length); TColumn Max(TColumn column); TColumn Max(bool exp, TColumn column); TColumn Min(TColumn column); diff --git a/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs b/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs index ec45d2cb..f915f8be 100644 --- a/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs +++ b/src/LightORM/SqlExecutor/ExpressionBuilder.ExternalHelper.cs @@ -5,27 +5,14 @@ namespace LightORM.SqlExecutor; internal partial class ExpressionBuilder { - private readonly record struct NumberRange(double Min, double Max); - private static readonly Dictionary numericRanges = new() - { - { typeof(byte), new(byte.MinValue, byte.MaxValue) }, - { typeof(sbyte), new(sbyte.MinValue, sbyte.MaxValue) }, - { typeof(short),new (short.MinValue, short.MaxValue) }, - { typeof(ushort), new(ushort.MinValue, ushort.MaxValue) }, - { typeof(int), new(int.MinValue, int.MaxValue) }, - { typeof(uint),new (uint.MinValue, uint.MaxValue) }, - { typeof(long),new (long.MinValue, long.MaxValue) }, - { typeof(ulong),new (ulong.MinValue, ulong.MaxValue) }, - { typeof(float),new (float.MinValue, float.MaxValue) }, - { typeof(double),new (double.MinValue, double.MaxValue) }, - }; - static Type GetSafeIntermediateType(Type sourceType, Type targetType) { if (!sourceType.IsNumber() || !targetType.IsNumber()) { return sourceType; } + sourceType = GetUnderlyingType(sourceType).Type; + targetType = GetUnderlyingType(targetType).Type; // 特殊处理 decimal if (sourceType == typeof(decimal) || targetType == typeof(decimal)) @@ -33,12 +20,7 @@ static Type GetSafeIntermediateType(Type sourceType, Type targetType) return HandleDecimalConversion(sourceType, targetType); } - if (IsSafeNumericConversion(sourceType, targetType)) - { - return targetType; - } - - return GetTypeWithLargerRange(sourceType, targetType); + return sourceType; static Type HandleDecimalConversion(Type sourceType, Type targetType) { @@ -90,30 +72,6 @@ static Type HandleDecimalConversion(Type sourceType, Type targetType) return typeof(decimal); } - - static bool IsSafeNumericConversion(Type sourceType, Type targetType) - { - - if (!numericRanges.TryGetValue(sourceType, out var sourceRange) || - !numericRanges.TryGetValue(targetType, out var targetRange)) - return false; - - // 源类型的范围必须在目标类型范围内 - return sourceRange.Min >= targetRange.Min && sourceRange.Max <= targetRange.Max; - } - - static Type GetTypeWithLargerRange(Type type1, Type type2) - { - if (!numericRanges.TryGetValue(type1, out var range1) || - !numericRanges.TryGetValue(type2, out var range2)) - return type1; - - // 比较范围大小 - double size1 = range1.Max - range1.Min; - double size2 = range2.Max - range2.Min; - - return size1 >= size2 ? type1 : type2; - } } private static ConcurrentDictionary JsonMaps { get; } = []; diff --git a/src/LightORM/SqlExecutor/SqlAdo.cs b/src/LightORM/SqlExecutor/SqlAdo.cs index 481dfd7d..4c6258d5 100644 --- a/src/LightORM/SqlExecutor/SqlAdo.cs +++ b/src/LightORM/SqlExecutor/SqlAdo.cs @@ -1,6 +1,4 @@ -using LightORM.Performances; -using System.Collections.Concurrent; -using System.Data.Common; +using System.Data.Common; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Threading; diff --git a/src/LightORM/Utils/TableColumnInfoEqual.cs b/src/LightORM/Utils/TableColumnInfoEqual.cs index 7094873d..ecb0229e 100644 --- a/src/LightORM/Utils/TableColumnInfoEqual.cs +++ b/src/LightORM/Utils/TableColumnInfoEqual.cs @@ -1,14 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Linq; -using System.Numerics; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Utils; +namespace LightORM.Utils; internal class TableColumnInfoEqual : IEqualityComparer { diff --git a/src/LightOrmExtensionGenerator/SelectExtensionGenerator.cs b/src/LightOrmExtensionGenerator/SelectExtensionGenerator.cs index 8436944b..9a2c2b3e 100644 --- a/src/LightOrmExtensionGenerator/SelectExtensionGenerator.cs +++ b/src/LightOrmExtensionGenerator/SelectExtensionGenerator.cs @@ -1,6 +1,5 @@ using Generators.Shared; using Microsoft.CodeAnalysis; -using System; using System.Linq; namespace LightOrmExtensionGenerator diff --git a/src/LightOrmExtensionGenerator/SelectInterfacesGenerator.cs b/src/LightOrmExtensionGenerator/SelectInterfacesGenerator.cs index 3041e2b8..8ca73da7 100644 --- a/src/LightOrmExtensionGenerator/SelectInterfacesGenerator.cs +++ b/src/LightOrmExtensionGenerator/SelectInterfacesGenerator.cs @@ -1,7 +1,6 @@ using Generators.Shared; using Microsoft.CodeAnalysis; using System.Collections.Generic; -using System.Drawing; using System.Linq; namespace LightOrmExtensionGenerator diff --git a/src/LightOrmExtensionGenerator/SelectProvidersGenerator.cs b/src/LightOrmExtensionGenerator/SelectProvidersGenerator.cs index d02feaaa..66d055fc 100644 --- a/src/LightOrmExtensionGenerator/SelectProvidersGenerator.cs +++ b/src/LightOrmExtensionGenerator/SelectProvidersGenerator.cs @@ -1,8 +1,6 @@ using Generators.Shared; using Microsoft.CodeAnalysis; -using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; namespace LightOrmExtensionGenerator diff --git a/src/LightOrmTableContextGenerator/DiagnosticDefinitions.cs b/src/LightOrmTableContextGenerator/DiagnosticDefinitions.cs index 69423b42..227567ce 100644 --- a/src/LightOrmTableContextGenerator/DiagnosticDefinitions.cs +++ b/src/LightOrmTableContextGenerator/DiagnosticDefinitions.cs @@ -1,7 +1,4 @@ using Microsoft.CodeAnalysis; -using System; -using System.Collections.Generic; -using System.Text; namespace LightOrmTableContextGenerator; diff --git a/src/LightOrmTableContextGenerator/LightOrmAotAnalyzer.cs b/src/LightOrmTableContextGenerator/LightOrmAotAnalyzer.cs index 70238eb3..0cac3cfe 100644 --- a/src/LightOrmTableContextGenerator/LightOrmAotAnalyzer.cs +++ b/src/LightOrmTableContextGenerator/LightOrmAotAnalyzer.cs @@ -1,7 +1,6 @@ using Generators.Shared; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -using System.Diagnostics; using System.Linq; using System.Threading; diff --git a/src/LightOrmTableContextGenerator/PropertyScanResult.cs b/src/LightOrmTableContextGenerator/PropertyScanResult.cs index f5e81100..b11fc8cc 100644 --- a/src/LightOrmTableContextGenerator/PropertyScanResult.cs +++ b/src/LightOrmTableContextGenerator/PropertyScanResult.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.CodeAnalysis; +using Microsoft.CodeAnalysis; namespace LightOrmTableContextGenerator; diff --git a/src/LightOrmTableContextGenerator/TableContextGenerator.CreateInitColumnInfoMethod.cs b/src/LightOrmTableContextGenerator/TableContextGenerator.CreateInitColumnInfoMethod.cs index 9bd837a3..c5c7d611 100644 --- a/src/LightOrmTableContextGenerator/TableContextGenerator.CreateInitColumnInfoMethod.cs +++ b/src/LightOrmTableContextGenerator/TableContextGenerator.CreateInitColumnInfoMethod.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; +using System.Collections.Generic; using Generators.Shared; using Generators.Shared.Builder; using Microsoft.CodeAnalysis; diff --git a/src/LightOrmTableContextGenerator/TableContextGenerator.cs b/src/LightOrmTableContextGenerator/TableContextGenerator.cs index 2c50e0c8..0e615931 100644 --- a/src/LightOrmTableContextGenerator/TableContextGenerator.cs +++ b/src/LightOrmTableContextGenerator/TableContextGenerator.cs @@ -3,10 +3,8 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Reflection; namespace LightOrmTableContextGenerator; diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs index 372bea5d..d97333d3 100644 --- a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text; namespace LightORM.Providers.Dameng; diff --git a/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs b/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs index 9df6bbe4..3b104e53 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs @@ -1,12 +1,7 @@ using LightORM.Extension; using LightORM.Implements; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Dameng; diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs index ecac5d53..6fe5d377 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.Writer.cs @@ -1,10 +1,5 @@ using LightORM; using LightORM.DbStruct; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Dameng; diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs index af6ec905..2599175c 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs @@ -1,6 +1,5 @@ using LightORM.DbStruct; using LightORM.Implements; -using System.Text; namespace LightORM.Providers.Dameng; diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs index 49eb4bdd..05490a9c 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.Dameng; +namespace LightORM.Providers.Dameng; public record DamengTableOptions : TableOptions { diff --git a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.BatchInsert.cs new file mode 100644 index 00000000..9040f902 --- /dev/null +++ b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.BatchInsert.cs @@ -0,0 +1,147 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; + +namespace LightORM.Providers.KingbaseES; + +partial class CustomKingbaseESAdapter +{ + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) + { + HandleBatchUpsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void HandleBatchUpsert(BatchActionContext> context) + { + var builder = context.Builder; + var batchs = context.Batchs; + var database = context.ScopedAdapter; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("INSERT INTO "); + //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + sb.AppendTableName(database, context.Builder.MainTable, false); + sb.Append('('); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + BuildSource(batch); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + sb.Append("ON CONFLICT ("); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + sb.AppendEmphasis(k.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + if (builder.IgnoreOnConflict) + { + sb.Append("DO NOTHING"); + } + else + { + sb.AppendLine("DO UPDATE SET"); + bool f1 = true; + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (!f1) + { + sb.AppendLine(","); + } + if (kv.IsVersionColumn) + { + sb.Append(" "); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = CASE"); + foreach (var item in batch.RowParameters) + { + bool first = true; + SimpleColumn versionCol = default; + foreach (var cell in item) + { + if (cell.IsNewVersion) + versionCol = cell; + if (!cell.IsPrimaryKey) + continue; + if (first) + { + sb.AppendLine(); + sb.Append(" WHEN EXCLUDED."); + } + else + sb.Append(" AND EXCLUDED."); + sb.AppendEmphasis(cell.ColumnName, database).Append(" = ").WithPrefix(cell.ValueName, database); + first = false; + } + sb.Append(" THEN ").WithPrefix(versionCol.ValueName, database); + } + sb.AppendLine(); + sb.Append(" END "); + } + else + { + sb.Append(" "); + // EXCLUDED 是 PostgreSQL 在 INSERT ... ON CONFLICT 语句中的一个特殊关键字,代表尝试插入的那行新数据。 + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database); + } + f1 = false; + } + sb.AppendLine(); + foreach (var kv in columns) + { + if (!kv.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.AppendTableName(database, context.Builder.MainTable, false) + .Append('.') + .AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database).Append(' '); + } + } + batch.Sql = sb.ToString(); + + void BuildSource(BatchSqlInfo batch) + { + sb.AppendLine("VALUES"); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + if (i > 0) + { + sb.AppendLine(","); + } + sb.Append(" ("); + var rowData = batch.RowParameters[i]; + foreach (var item in rowData) + { + if (item.IsNewVersion) + { + continue; + } + sb.WithPrefix(item.ValueName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.Append(')'); + } + sb.AppendLine(); + } + } + } +} diff --git a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs index 03bc7cf3..4f4e3969 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs @@ -1,11 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.KingbaseES; diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs index 84e1e80b..bcb09af7 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.KingbaseES; +namespace LightORM.Providers.KingbaseES; public record KingbaseESTableOptions : TableOptions { diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs index d908416c..63b0d216 100644 --- a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.BatchInsert.cs @@ -2,7 +2,6 @@ using LightORM.Extension; using LightORM.Models; using LightORM.Utils; -using System.Reflection; using System.Text; namespace LightORM.Providers.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs index b66acc26..60a83679 100644 --- a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs @@ -1,11 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/MySqlMethodResolver.cs b/src/Providers/LightORM.Providers.MySql/MySqlMethodResolver.cs index f4190d16..c621e1d5 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlMethodResolver.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlMethodResolver.cs @@ -1,11 +1,6 @@ using LightORM.Extension; using LightORM.Implements; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs index 14ac91a5..b078071f 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.Writer.cs @@ -1,10 +1,6 @@ using LightORM; using LightORM.DbStruct; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs index a0435fcf..9cc99cec 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs @@ -1,10 +1,5 @@ using LightORM.DbStruct; using LightORM.Implements; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.MySql; diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs index c91a03ea..febd23de 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.MySql; +namespace LightORM.Providers.MySql; public record MySqlTableOptions : TableOptions { diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs index a5c4e982..c8ec8ca0 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs @@ -1,5 +1,4 @@ -using LightORM.Builder; -using LightORM.Extension; +using LightORM.Extension; using LightORM.Implements; using LightORM.Interfaces; using LightORM.Models; diff --git a/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs index 77384eca..d270979d 100644 --- a/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs @@ -1,7 +1,5 @@ using LightORM.Interfaces; using LightORM.Models; -using Oracle.ManagedDataAccess.Client; -using LightORM.Providers.Oracle; namespace LightORM.Providers.Oracle.Extensions; public static class IoCExtension diff --git a/src/Providers/LightORM.Providers.Oracle/OracleMethodResolver.cs b/src/Providers/LightORM.Providers.Oracle/OracleMethodResolver.cs index 570b2e00..8f66253c 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleMethodResolver.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleMethodResolver.cs @@ -1,6 +1,5 @@ using LightORM.Extension; using LightORM.Implements; -using System; using System.Linq.Expressions; namespace LightORM.Providers.Oracle; diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs index ddbcb1d7..ed32a65f 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.Writer.cs @@ -1,10 +1,5 @@ using LightORM; using LightORM.DbStruct; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Oracle; diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs index 589496a5..86d5dbf1 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs @@ -1,10 +1,5 @@ using LightORM.DbStruct; using LightORM.Implements; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Oracle; diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs index c7067cb2..22bb54ec 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.Oracle; +namespace LightORM.Providers.Oracle; public record OracleTableOptions : TableOptions { diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs index 29323e74..de3748d4 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.BatchInsert.cs @@ -2,19 +2,11 @@ using LightORM.Extension; using LightORM.Models; using LightORM.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.PostgreSQL; partial class CustomPostgreSQL { - const string NEW_VERSION_COLUMN = "NewVersionValue"; - public override void HandleBatchInsert(BatchActionContext> context) { if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs index 5e44ae90..7577504c 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs @@ -1,11 +1,6 @@ using LightORM.Builder; using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.PostgreSQL; diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs index 7d70d283..408ec851 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.PostgreSQL; +namespace LightORM.Providers.PostgreSQL; public record PostgreSQLTableOptions: TableOptions { diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs index 2a70b58d..f8cd8dff 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs @@ -1,11 +1,6 @@ using LightORM.Interfaces; -using System; -using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using LightORM.Implements; using LightORM.Models; diff --git a/src/Providers/LightORM.Providers.PostgreSQL/Utils/FormatType.cs b/src/Providers/LightORM.Providers.PostgreSQL/Utils/FormatType.cs index 7301d540..728509e4 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/Utils/FormatType.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/Utils/FormatType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.PostgreSQL.Utils +namespace LightORM.Providers.PostgreSQL.Utils { internal static class FormatType { diff --git a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.BatchInsert.cs new file mode 100644 index 00000000..9f6ca32f --- /dev/null +++ b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.BatchInsert.cs @@ -0,0 +1,114 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; + +namespace LightORM.Providers.SqlServer; + +partial class CustomSqlServerAdapter +{ + const string NEW_VERSION_COLUMN = "NewVersionValue"; + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.IgnoreOnConflict || context.Builder.UpdateOnConflict) + { + HandleBatchUpsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void HandleBatchUpsert(BatchActionContext> context) + { + var builder = context.Builder; + var database = context.ScopedAdapter; + var columns = context.TargetColumns; + var batchs = context.Batchs; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("MERGE INTO ").AppendTableName(database, context.Builder.MainTable, false).AppendLine(" t"); + sb.Append("USING ("); + for (int r = 0; r < batch.RowParameters.Count; r++) + { + List? row = batch.RowParameters[r]; + sb.AppendLine(); + if (r > 0) + { + sb.AppendLine(" UNION ALL"); + } + sb.Append(" SELECT "); + for (int i = 0; i < row.Count; i++) + { + if (i > 0) + { + sb.Append(','); + } + SimpleColumn cell = row[i]; + if (cell.IsNewVersion) + { + sb.WithPrefix(cell.ValueName, database).Append(" AS ").Append(NEW_VERSION_COLUMN); + } + else + { + sb.WithPrefix(cell.ValueName, database).Append(" AS ").AppendEmphasis(cell.ColumnName, database); + } + } + } + sb.AppendLine(); + sb.AppendLine(") s"); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + if (i == 0) + sb.Append("ON (t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + else + sb.Append(" AND t.").AppendEmphasis(k.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(k.ColumnName, database); + } + sb.AppendLine(")"); + if (!builder.IgnoreOnConflict) + { + sb.Append("WHEN MATCHED "); + foreach (var item in columns) + { + if (!item.IsVersionColumn) + continue; + sb.Append("AND (t.").AppendEmphasis(item.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(item.ColumnName, database); + sb.Append(')'); + break; + } + sb.AppendLine(" THEN"); + sb.Append(" UPDATE SET"); + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (kv.IsVersionColumn) + { + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").Append(NEW_VERSION_COLUMN).Append(','); + } + else + { + sb.Append(' '); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("s.").AppendEmphasis(kv.ColumnName, database).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(); + } + sb.AppendLine("WHEN NOT MATCHED THEN"); + sb.Append(" INSERT (") + .AppendEntryColumns(columns, database) + .Append(") VALUES (") + .AppendEntryColumns(columns, database, "s.") + .Append(");"); + batch.Sql = sb.ToString(); + } + + } +} diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs index 2c50b43f..32b529d0 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.Writer.cs @@ -1,10 +1,6 @@ using LightORM; using LightORM.DbStruct; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.SqlServer; diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs index b5866816..5dc90b9e 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs @@ -1,11 +1,5 @@ -using LightORM; -using LightORM.DbStruct; +using LightORM.DbStruct; using LightORM.Implements; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.SqlServer; diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs index d6ba9912..d43d1d10 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.SqlServer; +namespace LightORM.Providers.SqlServer; public record SqlServerTableOptions : TableOptions { diff --git a/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.BatchInsert.cs new file mode 100644 index 00000000..5a17c6a9 --- /dev/null +++ b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.BatchInsert.cs @@ -0,0 +1,148 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; +using LightORM.Utils; + +namespace LightORM.Providers.Sqlite; + +partial class CustomSqliteAdapter +{ + + public override void HandleBatchInsert(BatchActionContext> context) + { + if (context.Builder.UpdateOnConflict || context.Builder.IgnoreOnConflict) + { + HandleBatchUpsert(context); + } + else + { + base.HandleBatchInsert(context); + } + } + + private static void HandleBatchUpsert(BatchActionContext> context) + { + var builder = context.Builder; + var batchs = context.Batchs; + var database = context.ScopedAdapter; + var columns = context.TargetColumns; + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + builder.WriteTags(sb); + sb.Append("INSERT INTO "); + //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + sb.AppendTableName(database, context.Builder.MainTable, false); + sb.Append('('); + foreach (var item in columns) + { + sb.AppendEmphasis(item.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + BuildSource(batch); + var whereKey = columns.Where(c => c.IsPrimaryKey).ToArray(); + sb.Append("ON CONFLICT ("); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + sb.AppendEmphasis(k.ColumnName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + if (builder.IgnoreOnConflict) + { + sb.Append("DO NOTHING"); + } + else + { + sb.AppendLine("DO UPDATE SET"); + bool f1 = true; + foreach (var kv in columns) + { + if (kv.IsPrimaryKey) + continue; + if (!f1) + { + sb.AppendLine(","); + } + if (kv.IsVersionColumn) + { + sb.Append(" "); + sb.AppendEmphasis(kv.ColumnName, database).Append(" = CASE"); + foreach (var item in batch.RowParameters) + { + bool first = true; + SimpleColumn versionCol = default; + foreach (var cell in item) + { + if (cell.IsNewVersion) + versionCol = cell; + if (!cell.IsPrimaryKey) + continue; + if (first) + { + sb.AppendLine(); + sb.Append(" WHEN EXCLUDED."); + } + else + sb.Append(" AND EXCLUDED."); + sb.AppendEmphasis(cell.ColumnName, database).Append(" = ").WithPrefix(cell.ValueName, database); + first = false; + } + sb.Append(" THEN ").WithPrefix(versionCol.ValueName, database); + } + sb.AppendLine(); + sb.Append(" END "); + } + else + { + sb.Append(" "); + // EXCLUDED 是 PostgreSQL 在 INSERT ... ON CONFLICT 语句中的一个特殊关键字,代表尝试插入的那行新数据。 + sb.AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database); + } + f1 = false; + } + sb.AppendLine(); + foreach (var kv in columns) + { + if (!kv.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.AppendTableName(database, context.Builder.MainTable, false) + .Append('.') + .AppendEmphasis(kv.ColumnName, database).Append(" = ").Append("EXCLUDED.").AppendEmphasis(kv.ColumnName, database).Append(' '); + } + } + batch.Sql = sb.ToString(); + + void BuildSource(BatchSqlInfo batch) + { + sb.AppendLine("VALUES"); + for (int i = 0; i < batch.RowParameters.Count; i++) + { + if (i > 0) + { + sb.AppendLine(","); + } + sb.Append(" ("); + var rowData = batch.RowParameters[i]; + foreach (var item in rowData) + { + if (item.IsNewVersion) + { + continue; + } + sb.WithPrefix(item.ValueName, database); + sb.Append(','); + } + sb.RemoveLast(1); + sb.Append(')'); + } + sb.AppendLine(); + } + } + } +} diff --git a/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.InsertOrUpdate.cs new file mode 100644 index 00000000..8b11e712 --- /dev/null +++ b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.InsertOrUpdate.cs @@ -0,0 +1,74 @@ +using LightORM.Builder; +using LightORM.Extension; +using LightORM.Models; + +namespace LightORM.Providers.Sqlite; + +partial class CustomSqliteAdapter +{ + public override void HandleInsertOrUpdate(UpsertContext context) + { + var database = context.ScopedAdapter; + var columnValueMaps = context.ColumnValueMap; + var sb = context.Sql; + sb.Append("INSERT INTO "); + //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); + sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); + sb.Append('('); + sb.AppendEntryColumns(columnValueMaps.Values); + sb.AppendLine(")"); + sb.AppendLine("VALUES"); + sb.Append('('); + sb.AppendEntryValues(columnValueMaps.Values); + sb.AppendLine(")"); + var whereKey = columnValueMaps.Where(c => c.Key.IsPrimaryKey).ToArray(); + sb.Append("ON CONFLICT ("); + for (int i = 0; i < whereKey.Length; i++) + { + var k = whereKey[i]; + sb.Append(k.Value.Column); + sb.Append(','); + } + sb.RemoveLast(1); + sb.AppendLine(")"); + if (context.IgnoreWhenMap) + { + sb.Append("DO NOTHING"); + } + else + { + sb.Append("DO UPDATE SET"); + foreach (var kv in columnValueMaps) + { + if (kv.Key.IsPrimaryKey) + continue; + if (kv.Key.IsVersionColumn) + { + var oldVersion = context.Parameters[kv.Key.PropertyName]; + var newVersion = SqlBuilder.VersionPlus(oldVersion); + var verionName = $"{kv.Key.PropertyName}_n"; + context.Parameters[verionName] = newVersion; + sb.Append(' '); + sb.Append(kv.Value.Column).Append(" = ").WithPrefix(verionName, database).Append(','); + } + else + { + sb.Append(' '); + // EXCLUDED 是 PostgreSQL 在 INSERT ... ON CONFLICT 语句中的一个特殊关键字,代表尝试插入的那行新数据。 + sb.Append(kv.Value.Column).Append(" = ").Append("EXCLUDED.").Append(kv.Value.Column).Append(','); + } + } + sb.RemoveLast(1); + sb.AppendLine(); + foreach (var kv in columnValueMaps) + { + if (!kv.Key.IsVersionColumn) + continue; + sb.Append(" WHERE "); + sb.AppendTableName(database, context.Builder.MainTable, false) + .Append('.') + .Append(kv.Value.Column).Append(" = ").Append("EXCLUDED.").Append(kv.Value.Column).Append(' '); + } + } + } +} diff --git a/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs index 02df99f7..58c5c159 100644 --- a/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs +++ b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs @@ -6,7 +6,7 @@ namespace LightORM.Providers.Sqlite; -internal sealed class CustomSqliteAdapter(ISqlMethodResolver methodResolver, SqliteTableOptions options) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomSqliteAdapter(ISqlMethodResolver methodResolver, SqliteTableOptions options) : CustomDatabaseAdapter(methodResolver) { /// /// 测试用 diff --git a/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs index 73e784cc..143b94f7 100644 --- a/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs @@ -1,6 +1,5 @@ using LightORM.Interfaces; using LightORM.Models; -using System.Data.SQLite; namespace LightORM.Providers.Sqlite.Extensions; diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs index cc7048a8..37cdb8d7 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.Writer.cs @@ -1,10 +1,6 @@ using LightORM; using LightORM.DbStruct; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Sqlite; diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs index 5d242956..5405ce32 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs @@ -1,6 +1,5 @@ using LightORM.DbStruct; using LightORM.Implements; -using System.Text; namespace LightORM.Providers.Sqlite; diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs index 9aed4b17..691749a3 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORM.Providers.Sqlite; +namespace LightORM.Providers.Sqlite; public record SqliteTableOptions : TableOptions { diff --git a/src/versions.props b/src/versions.props index 1bbec9c9..39d28835 100644 --- a/src/versions.props +++ b/src/versions.props @@ -1,46 +1,46 @@  - 2026.08.26.1 + 2026.08.31.1 - 2026.08.26.1 + 2026.08.31.1 - 2026.08.26.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 - 2026.08.21.1 + 2026.08.31.1 \ No newline at end of file diff --git a/test.db b/test.db index 5c3ec5de994bdcbd57546bce58e3a90bd6d00b48..0d1c7edce261577597f5b4b34c422730f5572495 100644 GIT binary patch delta 4457 zcmd^CYj6|S72dlmX{EJxulx|Qz(x|PNeM4WmJO5ub{qjN#x}O0&}o8cVWvzC4g{Ju zEnORd2@hkNHI^OQI5fO6fUyyNAYPreKN^xw)8;j43KLrIN}7~Oeq_>i`lCJju(WtG zY11G1Q_bAnv)}!`d+t4Z&b_OqCP!0~qkVc-!AAr^dgT!ZCl&Q`SZ2=t>ZgSJhCGxN z{iop}GSJ0@SNN;RWty|n!kdgy_y>(K zriawNqEeHi+^h60H0N5a=3y0YUbI}OH9w9l!q3dD#uX;Vy178g7v@`Lco<8AMxvjf z9d-~m+nVHBaEMN{Am+EGev&LjSt&!|Y zXh%T-YTls?xV|=2vl&9Lvb-Xsw+)ZRTi+#YW^;uemZMff%-h*%LN%8|LF}RrnWZFp zQkcWeL|k+=y8@vS;YDs1%7|X%HlZvNW(fQ?zJPy&9VclPT1rs zK(zwznu}_Li*Q{hyyuz^IXO8LbUd6<_ zDZ7YxCuIkTw^Mc@@m9(X5PwM7e&Y8mB)EyYOyIltC|-~AxW90hx#zjX9Lc`MwzJ=s z_Y(L;b8UqzAG8{r-ZkpV{e_EtKIKw8ajRDx9u~*<$Il%U2ab!!Vu}4%rNga>u`7$k zwy{MSpjxM>iqfj0iSfR~@l&9ZPM;OeTuYuj6hGe~9cdDKFN1KAEM!u`pe*E7e?e(% zSnP{}Qf!ULj*rFk${;9%mefQG(=H3e>vzO4*`;{qRq1LJgsK7l3PH8Z463J7 zmVJq+%6U!WFo8e8AK=&VC_aljaTxD}YTAHTXPYUfM|siy+P%+i+g-YK$M&6=rkqYS zxhorY@7U6SO_M;81{f!Spb7}1D=Kqnyia!XNBkO&;?uYd@5B4RO%<-N8=M|A)r~pR z;B=~Ju{sK!Ml?sJG@^Mj3el=c7XOZ*@GAs<1%Ie)3@wdsE4=3OOHil{ScX0+oIgvU(6-_iQSwMz!1@Ea@WY{6Bl5f+5AILYm(00m0hI53g zrvhX+TaaWhOJD}zmMJV4m{kzAF@(LqjuFdRs(rqoG;lWFcT}A&JQw;YUlWmRxvuESw*Nrvx2By zvkFn0W(Cl3&GMsG7JmjG2k#U3eLSIr!S;){aQ?eClJb((p_;YjwYBg8Sc|%$lR@&w z$_qaqvLPmlKK$3ht3#x1`6!WR^$=DMjL?A_@G4w@DeeJxhwJBl!foP$oSprQeUBYs z1$Gx(#roJx>&MpLS}$6UShrhO!H3F&4E}4#Ux28X1+OYzQ; z#DR`LBk9fqRsm^AoV^2E5$s;^u9jryV7#|GdGlrIzr%X@ppv3@;+ zI*@Mz2CPGQahIj*UBHw2TE!!$E)k#S%@RN zaOj3OiY*5dCwj!TGh*A2c(YAiDVpcDs*}`6!^3iV=osWpcZQy!oR<+jgW?lzMo*Cs z(`#q-6mp~6@(4pc3UzJ_6>f8y0n31s7Op+9MEI6;_^8wugOJmD1{~rrRhhw0Qm6xN z(-ew)PU{9?FL{l?n5%`nFMh5~yb+sHD~2JjK~E9~4~w^NO(9WkFQt)qrR<~;IZ3Cm zX!%c=H|-A?iKA^(NChMeG@sPU_j4%$;yx+wx_KN$aJ#t!+|&4Dd>wY**YSD$7|DIY z-N!k2GhU15;HCH^oN&81J4bO#xHa5k+y(9pF2;4iX7MYQSB@0@9+0O))S926L)0Rl zu0zzKcIptdh;wrcP8XU|v<`))f=Ze4k!d#c(Rbka3Y87PY5H;x;J)$JJC55O-&9_F>lVA2H zZz^&Yt0#X7fpDoOzp@l9NsW^O$-z`I(x5}s?4$IEl4_(4zB1JPMLihMSW5|NDIr@* zsFo7LXo-=wp_LJHwb7Md1qrqe+FEGef>sBu7FrFo%E(jI#*d8h|6n{8TxWb^=f45J CGYm@r delta 3856 zcmb7{4Qw1o6@Yi{|JHY&bDhiCZsI$~bs%+aGr#-iroPm18@nNKVkfjxq!7SJX%Z)n zT|uG3K8sip6~fWB97vU_il3yau&bPEO9i1yNT85FQ;C2?szOm?ThJhckdUaLyuCZj zZR)kep62e|%zX1^-n=*Sc6vH9J)N0ryRY+milQ8YaumuSlxHsOWDIJxFOMf9s|pU? zRuZp7H1%%cOKL*B8b1`j9UF?PjTd4~$?ehKgl>m_;(p22=HE1l+IxsJFRs&$I?L^J6$DvnQ{`0VM?!w2{GyCveh z9h(S06v_0YYfQL_x(!kFP7Um|oG-@PQONmL`~tFJN*&H_701Jgm#ZDhch#N%+T-j< zwxdLOU$PgWUgu)tHl&tcZF~|XLinhHe~qu;XYtW;N6x~j?Zsq5X>H9QtSGV0;(q7J zY!`amnaXyfLFZNY9&mn}%>#H-!GFiA_#J$++;r|uTxbZk1|~-*CW%mPtjS!tz9uu} z7i%(At|h^0A-t&IzvA2YI$nfPet@0Dg9l*jvRnH*d<~bO_Pf|AA3x9l-2?b71>ePQ zLFG^J?k#~}NB8j4=SI)(`TUuaW2=i7R^GV0GXL_*-0Yo8-)=&|Ot#XnR;5;k0FU?w zUM)A>dI|=>-~?dCIx6&>fgL zS-!RKV>~q(52gb{git4R`_sYwEzu1Or7s!0qz zRg)+>=^9!|xnI?1DV0Kh!{xx6@8R|vsX(wZFw}qeQv<`p0|yTbqe5JmgmQRjO5D zQ?5~iGg`XT6Wr7=SbW6Q)z#OUE}b}wa(R}gEYC@fGMfmSni`>!8Wvl=ICtmkFYP@$ zHab|`vkt&&pMdZe%(qUVTZOT%55E_6zztVeo%5dm}Knr;|WGQA#o z_+tpoGoGWwX3`cy6O?cwje2DF`Up&nTDBmX#Uv4y2YF~6gu?QPO>~Op$e zN8IIGHnTKNg&^FseEVL6Sb1VpEC&0cYbG%`l^!EoA4811yD#7(#1^_HnWUV0EM~5U z=s7Auh0TO!NJ9w2qs8z?s7-}NgrSRiBM%hy3bLo>V>=lvB+oz#g-x-g(3nZ3&g-{D z`X~W{gO_QhFinGc<|TX)E^J1@>rHCvqFxL4M>y=i8$T4BxgKG@2!jZP)q{zd=|QM3 z0xrf(O&XF5PV2Q0f5fyU2QAVxbdQ!@{)p~c%&;WUO^+7MACVB38q+yU%oFxLlGW3g@iNX5utEghCqzb_pdA%tm` zpz%`}6-l_We9Yu^Zg70cXGGuDIVHfk3t(_Nh+27joNr2+L6eE^yZ^;RJ^Z))Qi_{s@O;0SZ6*xn1a)oyYpH>d<}=){!qF5OD8+`t*{%1%c!!{Dg7Rr7BT$B+9EQ?d+B+2f QbNC2|N0!8)@Qtzm09Z~BLjV8( diff --git a/test/BenchmarkTest/Program.cs b/test/BenchmarkTest/Program.cs index bcfab183..1f26c35e 100644 --- a/test/BenchmarkTest/Program.cs +++ b/test/BenchmarkTest/Program.cs @@ -1,6 +1,5 @@ // See https://aka.ms/new-console-template for more information using BenchmarkTest; -using LightORM.Providers.Sqlite.Extensions; Console.WriteLine("Hello, World!"); BenchmarkDotNet.Running.BenchmarkRunner.Run(); diff --git a/test/BenchmarkTest/SqlBuild.cs b/test/BenchmarkTest/SqlBuild.cs index 4f3e4e25..cae9620e 100644 --- a/test/BenchmarkTest/SqlBuild.cs +++ b/test/BenchmarkTest/SqlBuild.cs @@ -1,11 +1,7 @@ using BenchmarkDotNet.Attributes; -using BenchmarkDotNet.Jobs; using BenchmarkTest.Models; using LightORM; using LightORM.Providers.Sqlite.Extensions; -using System; -using System.Collections.Generic; -using System.Text; namespace BenchmarkTest; diff --git a/test/BenchmarkTest/StringBuilderPoolTest.cs b/test/BenchmarkTest/StringBuilderPoolTest.cs index 67217889..a479798b 100644 --- a/test/BenchmarkTest/StringBuilderPoolTest.cs +++ b/test/BenchmarkTest/StringBuilderPoolTest.cs @@ -2,9 +2,6 @@ using BenchmarkDotNet.Jobs; using LightORM; using LightORM.Providers.Sqlite.Extensions; -using System; -using System.Collections.Generic; -using System.Text; namespace BenchmarkTest; diff --git a/test/LightORMTest.Dameng/DatabaseType.cs b/test/LightORMTest.Dameng/DatabaseType.cs index 529119d5..80c4ba76 100644 --- a/test/LightORMTest.Dameng/DatabaseType.cs +++ b/test/LightORMTest.Dameng/DatabaseType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Dameng +namespace LightORMTest.Dameng { internal class DatabaseType { diff --git a/test/LightORMTest.Dameng/GlobalUsings.cs b/test/LightORMTest.Dameng/GlobalUsings.cs index a0df4344..4cf9199e 100644 --- a/test/LightORMTest.Dameng/GlobalUsings.cs +++ b/test/LightORMTest.Dameng/GlobalUsings.cs @@ -1,10 +1,5 @@ global using LightORM; global using LightORM.Interfaces; -global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Text; -global using System.Threading.Tasks; global using LightORM.Providers.Dameng.Extensions; namespace LightORMTest.Dameng diff --git a/test/LightORMTest.Dameng/MSTestSettings.cs b/test/LightORMTest.Dameng/MSTestSettings.cs index aaf278c8..21d16952 100644 --- a/test/LightORMTest.Dameng/MSTestSettings.cs +++ b/test/LightORMTest.Dameng/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] diff --git a/test/LightORMTest.Dameng/RepositoryTest.cs b/test/LightORMTest.Dameng/RepositoryTest.cs index 51460f9c..8fbf4c0f 100644 --- a/test/LightORMTest.Dameng/RepositoryTest.cs +++ b/test/LightORMTest.Dameng/RepositoryTest.cs @@ -1,11 +1,4 @@ -using LightORMTest.Dameng; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Dameng; +namespace LightORMTest.Dameng; [TestClass] public class RepositoryTest : LightORMTest.RepositoryTest diff --git a/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs b/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs index 9cb53cf1..3574cee8 100644 --- a/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.Dameng/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Dameng.ResultTest; +namespace LightORMTest.Dameng.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.Dameng/SelectResult.cs b/test/LightORMTest.Dameng/SelectResult.cs index 50eb18f2..80952acd 100644 --- a/test/LightORMTest.Dameng/SelectResult.cs +++ b/test/LightORMTest.Dameng/SelectResult.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Dameng; +namespace LightORMTest.Dameng; [TestClass] public class SelectResult : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.Dameng/SqlGenerate/DeleteSql.cs b/test/LightORMTest.Dameng/SqlGenerate/DeleteSql.cs index f242014d..4908393e 100644 --- a/test/LightORMTest.Dameng/SqlGenerate/DeleteSql.cs +++ b/test/LightORMTest.Dameng/SqlGenerate/DeleteSql.cs @@ -1,11 +1,4 @@ -using LightORMTest.Dameng; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Dameng.SqlGenerate; +namespace LightORMTest.Dameng.SqlGenerate; [TestClass] public class DeleteSql:LightORMTest.SqlGenerate.DeleteSql diff --git a/test/LightORMTest.Dameng/SqlGenerate/SelectSql.cs b/test/LightORMTest.Dameng/SqlGenerate/SelectSql.cs index e3d16d54..2e428c2d 100644 --- a/test/LightORMTest.Dameng/SqlGenerate/SelectSql.cs +++ b/test/LightORMTest.Dameng/SqlGenerate/SelectSql.cs @@ -1,6 +1,4 @@ -using LightORMTest.Dameng; - -namespace LightORMTest.Dameng.SqlGenerate; +namespace LightORMTest.Dameng.SqlGenerate; [TestClass] public class SelectSql : LightORMTest.SqlGenerate.SelectSql diff --git a/test/LightORMTest.Dameng/SqlGenerate/UpdateSql.cs b/test/LightORMTest.Dameng/SqlGenerate/UpdateSql.cs index d950c2a7..7b436516 100644 --- a/test/LightORMTest.Dameng/SqlGenerate/UpdateSql.cs +++ b/test/LightORMTest.Dameng/SqlGenerate/UpdateSql.cs @@ -1,11 +1,4 @@ -using LightORMTest.Dameng; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Dameng.SqlGenerate; +namespace LightORMTest.Dameng.SqlGenerate; [TestClass] public class UpdateSql: LightORMTest.SqlGenerate.UpdateSql diff --git a/test/LightORMTest.MySql/GlobalUsings.cs b/test/LightORMTest.MySql/GlobalUsings.cs index 0b099d3c..dac9db7d 100644 --- a/test/LightORMTest.MySql/GlobalUsings.cs +++ b/test/LightORMTest.MySql/GlobalUsings.cs @@ -1,10 +1,5 @@ global using LightORM; global using LightORM.Interfaces; -global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Text; -global using System.Threading.Tasks; global using LightORM.Providers.MySql.Extensions; namespace LightORMTest.MySql diff --git a/test/LightORMTest.MySql/ResultTest/ExecutionTest.cs b/test/LightORMTest.MySql/ResultTest/ExecutionTest.cs index cccef867..f9e6d467 100644 --- a/test/LightORMTest.MySql/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.MySql/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.MySql.ResultTest; +namespace LightORMTest.MySql.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.MySql/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest.MySql/SqlGenerate/SelectSql_Json.cs index faf1371b..3cc6f672 100644 --- a/test/LightORMTest.MySql/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest.MySql/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.MySql.SqlGenerate; +namespace LightORMTest.MySql.SqlGenerate; [TestClass] public class SelectSql_Json : LightORMTest.SqlGenerate.SelectSql_Json diff --git a/test/LightORMTest.Oracle/DbMethodTest.cs b/test/LightORMTest.Oracle/DbMethodTest.cs index 9d4f6c25..ad2a2705 100644 --- a/test/LightORMTest.Oracle/DbMethodTest.cs +++ b/test/LightORMTest.Oracle/DbMethodTest.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.DataAnnotations; - -namespace LightORMTest.Oracle; +namespace LightORMTest.Oracle; [TestClass] public class DbMethodTest : LightORMTest.DbMethodTest diff --git a/test/LightORMTest.Oracle/GlobalUsings.cs b/test/LightORMTest.Oracle/GlobalUsings.cs index bbcd6e2f..93f7a741 100644 --- a/test/LightORMTest.Oracle/GlobalUsings.cs +++ b/test/LightORMTest.Oracle/GlobalUsings.cs @@ -1,10 +1,6 @@ global using LightORM; global using LightORM.Interfaces; -global using System; global using System.Collections.Generic; -global using System.Linq; -global using System.Text; -global using System.Threading.Tasks; global using LightORM.Providers.Oracle.Extensions; namespace LightORMTest.Oracle diff --git a/test/LightORMTest.Oracle/LinqTest.cs b/test/LightORMTest.Oracle/LinqTest.cs index 337e96cc..8a66ebe9 100644 --- a/test/LightORMTest.Oracle/LinqTest.cs +++ b/test/LightORMTest.Oracle/LinqTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Oracle; +namespace LightORMTest.Oracle; [TestClass] public class LinqTest : LightORMTest.LinqTest diff --git a/test/LightORMTest.Oracle/RepositoryTest.cs b/test/LightORMTest.Oracle/RepositoryTest.cs index 50d7db10..3f4de614 100644 --- a/test/LightORMTest.Oracle/RepositoryTest.cs +++ b/test/LightORMTest.Oracle/RepositoryTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Oracle; +namespace LightORMTest.Oracle; [TestClass] public class RepositoryTest : LightORMTest.RepositoryTest diff --git a/test/LightORMTest.Oracle/ResultTest/ExecutionTest.cs b/test/LightORMTest.Oracle/ResultTest/ExecutionTest.cs index c7720a6f..178b7495 100644 --- a/test/LightORMTest.Oracle/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.Oracle/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Oracle.ResultTest; +namespace LightORMTest.Oracle.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.Oracle/ScopedTest/TransactionTest.cs b/test/LightORMTest.Oracle/ScopedTest/TransactionTest.cs index 25b336f7..421ee6ae 100644 --- a/test/LightORMTest.Oracle/ScopedTest/TransactionTest.cs +++ b/test/LightORMTest.Oracle/ScopedTest/TransactionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Oracle.ScopedTest; +namespace LightORMTest.Oracle.ScopedTest; [TestClass] public class TransactionTest: LightORMTest.ScopedTest.TransactionTest diff --git a/test/LightORMTest.Oracle/SqlGenerate/DeleteSql.cs b/test/LightORMTest.Oracle/SqlGenerate/DeleteSql.cs index 30b20bbe..ce60ad67 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/DeleteSql.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/DeleteSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class DeleteSql : LightORMTest.SqlGenerate.DeleteSql diff --git a/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs index b60989f1..2d9cf6ef 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class InsertOrUpdateTest : LightORMTest.SqlGenerate.InsertOrUpdateTest diff --git a/test/LightORMTest.Oracle/SqlGenerate/InsertSql.cs b/test/LightORMTest.Oracle/SqlGenerate/InsertSql.cs index d2f4b511..4faa1e17 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/InsertSql.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/InsertSql.cs @@ -1,11 +1,4 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class InsertSql : LightORMTest.SqlGenerate.InsertSql diff --git a/test/LightORMTest.Oracle/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest.Oracle/SqlGenerate/SelectSql_Json.cs index 7e35d457..385ec1e0 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class SelectSql_Json : LightORMTest.SqlGenerate.SelectSql_Json diff --git a/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs b/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs index 864c9048..e873863c 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/UpdateSql.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class UpdateSql : LightORMTest.SqlGenerate.UpdateSql diff --git a/test/LightORMTest.Oracle/SqlGenerate/WithOriginSql.cs b/test/LightORMTest.Oracle/SqlGenerate/WithOriginSql.cs index 85a1491c..5b964a7c 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/WithOriginSql.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/WithOriginSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Oracle.SqlGenerate; +namespace LightORMTest.Oracle.SqlGenerate; [TestClass] public class WithOriginSql : LightORMTest.SqlGenerate.WithOriginSql diff --git a/test/LightORMTest.PostgreSQL/AdoTest.cs b/test/LightORMTest.PostgreSQL/AdoTest.cs index 7236149a..f9ba608a 100644 --- a/test/LightORMTest.PostgreSQL/AdoTest.cs +++ b/test/LightORMTest.PostgreSQL/AdoTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.PostgreSQL; +namespace LightORMTest.PostgreSQL; [TestClass] public class AdoTest : LightORMTest.AdoTest diff --git a/test/LightORMTest.PostgreSQL/GlobalUsings.cs b/test/LightORMTest.PostgreSQL/GlobalUsings.cs index fc8f402a..1b731550 100644 --- a/test/LightORMTest.PostgreSQL/GlobalUsings.cs +++ b/test/LightORMTest.PostgreSQL/GlobalUsings.cs @@ -1,9 +1,5 @@ global using LightORM; global using LightORM.Interfaces; -global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Text; global using System.Threading.Tasks; global using LightORM.Providers.PostgreSQL.Extensions; diff --git a/test/LightORMTest.PostgreSQL/RepositoryTest.cs b/test/LightORMTest.PostgreSQL/RepositoryTest.cs index d08ac7d0..16e4dc4d 100644 --- a/test/LightORMTest.PostgreSQL/RepositoryTest.cs +++ b/test/LightORMTest.PostgreSQL/RepositoryTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.PostgreSQL; +namespace LightORMTest.PostgreSQL; [TestClass] public class RepositoryTest : LightORMTest.RepositoryTest diff --git a/test/LightORMTest.PostgreSQL/ResultTest/ExecutionTest.cs b/test/LightORMTest.PostgreSQL/ResultTest/ExecutionTest.cs index 6ba782a6..709580aa 100644 --- a/test/LightORMTest.PostgreSQL/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.PostgreSQL/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.PostgreSQL.ResultTest; +namespace LightORMTest.PostgreSQL.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.PostgreSQL/SelectResult.cs b/test/LightORMTest.PostgreSQL/SelectResult.cs index 0cb24106..5fc71229 100644 --- a/test/LightORMTest.PostgreSQL/SelectResult.cs +++ b/test/LightORMTest.PostgreSQL/SelectResult.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.PostgreSQL; +namespace LightORMTest.PostgreSQL; [TestClass] public class SelectResult : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/DeleteSql.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/DeleteSql.cs index 2aa5aa97..ec456d7c 100644 --- a/test/LightORMTest.PostgreSQL/SqlGenerate/DeleteSql.cs +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/DeleteSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.PostgreSQL.SqlGenerate; +namespace LightORMTest.PostgreSQL.SqlGenerate; [TestClass] public class DeleteSql:LightORMTest.SqlGenerate.DeleteSql diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs index 5b926bd1..1021b77c 100644 --- a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql.cs @@ -1,6 +1,4 @@ -using LightORM.Providers.Oracle.Extensions; - -namespace LightORMTest.PostgreSQL.SqlGenerate; +namespace LightORMTest.PostgreSQL.SqlGenerate; [TestClass] public class SelectSql : LightORMTest.SqlGenerate.SelectSql diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql_Json.cs index 0882e7c8..23953a49 100644 --- a/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.PostgreSQL.SqlGenerate; +namespace LightORMTest.PostgreSQL.SqlGenerate; [TestClass] public class SelectSql_Json : LightORMTest.SqlGenerate.SelectSql_Json diff --git a/test/LightORMTest.PostgreSQL/SqlGenerate/UpdateSql.cs b/test/LightORMTest.PostgreSQL/SqlGenerate/UpdateSql.cs index a8d507e4..99f0c563 100644 --- a/test/LightORMTest.PostgreSQL/SqlGenerate/UpdateSql.cs +++ b/test/LightORMTest.PostgreSQL/SqlGenerate/UpdateSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.PostgreSQL.SqlGenerate; +namespace LightORMTest.PostgreSQL.SqlGenerate; [TestClass] public class UpdateSql: LightORMTest.SqlGenerate.UpdateSql diff --git a/test/LightORMTest.SqlServer/DbMethodTest.cs b/test/LightORMTest.SqlServer/DbMethodTest.cs index 73bbf307..93dc87f1 100644 --- a/test/LightORMTest.SqlServer/DbMethodTest.cs +++ b/test/LightORMTest.SqlServer/DbMethodTest.cs @@ -1,7 +1,4 @@ -using LightORMTest.Models; -using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext; - -namespace LightORMTest.SqlServer; +namespace LightORMTest.SqlServer; [TestClass] public class DbMethodTest : LightORMTest.DbMethodTest diff --git a/test/LightORMTest.SqlServer/GlobalUsings.cs b/test/LightORMTest.SqlServer/GlobalUsings.cs index 4c5ee111..51c29c31 100644 --- a/test/LightORMTest.SqlServer/GlobalUsings.cs +++ b/test/LightORMTest.SqlServer/GlobalUsings.cs @@ -1,10 +1,6 @@ global using LightORM; global using LightORM.Interfaces; global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Text; -global using System.Threading.Tasks; global using LightORM.Providers.SqlServer.Extensions; public static class ConnectString diff --git a/test/LightORMTest.SqlServer/MSTestSettings.cs b/test/LightORMTest.SqlServer/MSTestSettings.cs index 8b7de71c..64316b22 100644 --- a/test/LightORMTest.SqlServer/MSTestSettings.cs +++ b/test/LightORMTest.SqlServer/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] \ No newline at end of file diff --git a/test/LightORMTest.SqlServer/RepositoryTest.cs b/test/LightORMTest.SqlServer/RepositoryTest.cs index 244a3863..28410e97 100644 --- a/test/LightORMTest.SqlServer/RepositoryTest.cs +++ b/test/LightORMTest.SqlServer/RepositoryTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.SqlServer; +namespace LightORMTest.SqlServer; [TestClass] public class RepositoryTest : LightORMTest.RepositoryTest diff --git a/test/LightORMTest.SqlServer/ResultTest/ExecutionTest.cs b/test/LightORMTest.SqlServer/ResultTest/ExecutionTest.cs index 53e55e5c..c721e714 100644 --- a/test/LightORMTest.SqlServer/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.SqlServer/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.SqlServer.ResultTest; +namespace LightORMTest.SqlServer.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.SqlServer/ResultTest/JsonTest.cs b/test/LightORMTest.SqlServer/ResultTest/JsonTest.cs index ae3c6155..ea74ea0b 100644 --- a/test/LightORMTest.SqlServer/ResultTest/JsonTest.cs +++ b/test/LightORMTest.SqlServer/ResultTest/JsonTest.cs @@ -1,7 +1,4 @@ - -using LightORMTest.Models; - -namespace LightORMTest.SqlServer.ResultTest; +namespace LightORMTest.SqlServer.ResultTest; [TestClass] public class JsonTest : LightORMTest.ResultTest.JsonTest diff --git a/test/LightORMTest.SqlServer/ResultTest/Select.cs b/test/LightORMTest.SqlServer/ResultTest/Select.cs index 3b2128ea..cd23497e 100644 --- a/test/LightORMTest.SqlServer/ResultTest/Select.cs +++ b/test/LightORMTest.SqlServer/ResultTest/Select.cs @@ -1,8 +1,4 @@ using LightORMTest.Models; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Text; namespace LightORMTest.SqlServer.ResultTest; diff --git a/test/LightORMTest.SqlServer/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest.SqlServer/SqlGenerate/SelectSql_Json.cs index 8a0408ea..800dde15 100644 --- a/test/LightORMTest.SqlServer/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest.SqlServer/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.SqlServer.SqlGenerate; +namespace LightORMTest.SqlServer.SqlGenerate; [TestClass] public class SelectSql_Json : LightORMTest.SqlGenerate.SelectSql_Json diff --git a/test/LightORMTest.Sqlite/AdoTest.cs b/test/LightORMTest.Sqlite/AdoTest.cs new file mode 100644 index 00000000..477a330d --- /dev/null +++ b/test/LightORMTest.Sqlite/AdoTest.cs @@ -0,0 +1,25 @@ +using LightORMTest.Models; + +namespace LightORMTest.Sqlite; + +[TestClass] +public class AdoTest : LightORMTest.AdoTest +{ + public override DbBaseType DbType => DbBaseType.Sqlite; + + protected override void Configura(IExpressionContextSetup option) + { + option.UseSqlite(ConnectString.Value); + option.UseSqlite("Memory", "Data Source=:memory:;Version=3;New=True;"); + option.UseInterceptor(); + } + + + [TestMethod] + public void TransientContextTest() + { + var ctx = Db.SwitchDatabase("Memory"); + var str = ctx.Ado.Connection.Connection.ConnectionString; + Console.WriteLine(str); + } +} diff --git a/test/LightORMTest.Sqlite/GlobalUsings.cs b/test/LightORMTest.Sqlite/GlobalUsings.cs index 45cd2785..8d6c7f02 100644 --- a/test/LightORMTest.Sqlite/GlobalUsings.cs +++ b/test/LightORMTest.Sqlite/GlobalUsings.cs @@ -1,10 +1,5 @@ global using LightORM; global using LightORM.Interfaces; -global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Text; -global using System.Threading.Tasks; global using LightORM.Providers.Sqlite.Extensions; public static class ConnectString diff --git a/test/LightORMTest.Sqlite/MSTestSettings.cs b/test/LightORMTest.Sqlite/MSTestSettings.cs index 8b7de71c..64316b22 100644 --- a/test/LightORMTest.Sqlite/MSTestSettings.cs +++ b/test/LightORMTest.Sqlite/MSTestSettings.cs @@ -1 +1 @@ -[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] \ No newline at end of file +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 1)] \ No newline at end of file diff --git a/test/LightORMTest.Sqlite/ResultTest/ExecutionTest.cs b/test/LightORMTest.Sqlite/ResultTest/ExecutionTest.cs index c35de5d1..f09cf649 100644 --- a/test/LightORMTest.Sqlite/ResultTest/ExecutionTest.cs +++ b/test/LightORMTest.Sqlite/ResultTest/ExecutionTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Sqlite.ResultTest; +namespace LightORMTest.Sqlite.ResultTest; [TestClass] public class ExecutionTest : LightORMTest.ResultTest.ExecutionTest diff --git a/test/LightORMTest.Sqlite/SqlGenerate/InsertSql.cs b/test/LightORMTest.Sqlite/SqlGenerate/InsertSql.cs index d712af9c..b1f91ee3 100644 --- a/test/LightORMTest.Sqlite/SqlGenerate/InsertSql.cs +++ b/test/LightORMTest.Sqlite/SqlGenerate/InsertSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.Sqlite.SqlGenerate; +namespace LightORMTest.Sqlite.SqlGenerate; [TestClass] public class InsertSql : LightORMTest.SqlGenerate.InsertSql diff --git a/test/LightORMTest.Sqlite/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest.Sqlite/SqlGenerate/SelectSql_Json.cs index 635220f4..11d50a7f 100644 --- a/test/LightORMTest.Sqlite/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest.Sqlite/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Sqlite.SqlGenerate; +namespace LightORMTest.Sqlite.SqlGenerate; [TestClass] public class SelectSql_Json : LightORMTest.SqlGenerate.SelectSql_Json diff --git a/test/LightORMTest/AdoTest.cs b/test/LightORMTest/AdoTest.cs index 3c0094a2..4f9e482d 100644 --- a/test/LightORMTest/AdoTest.cs +++ b/test/LightORMTest/AdoTest.cs @@ -1,6 +1,4 @@ -using System.Threading.Tasks; - -namespace LightORMTest; +namespace LightORMTest; public class AdoTest : TestBase { @@ -20,4 +18,5 @@ private async ValueTask Update(int i, CancellationToken cancellationToken) Console.WriteLine($"任务{i} -> 结果:{r.Count}"); await scope.CommitAllTransactionAsync(); } + } diff --git a/test/LightORMTest/BulkCopyTest.cs b/test/LightORMTest/BulkCopyTest.cs index d8c16d24..4fa8d406 100644 --- a/test/LightORMTest/BulkCopyTest.cs +++ b/test/LightORMTest/BulkCopyTest.cs @@ -1,9 +1,4 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest; +namespace LightORMTest; public class BulkCopyTest : TestBase { diff --git a/test/LightORMTest/ColumnCompareTest.cs b/test/LightORMTest/ColumnCompareTest.cs index 5d05e701..85659140 100644 --- a/test/LightORMTest/ColumnCompareTest.cs +++ b/test/LightORMTest/ColumnCompareTest.cs @@ -1,11 +1,5 @@ using LightORM.Cache; using LightORM.Extension; -using LightORM.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest; diff --git a/test/LightORMTest/CreateTableTest.cs b/test/LightORMTest/CreateTableTest.cs index dbb506e3..c3b363e7 100644 --- a/test/LightORMTest/CreateTableTest.cs +++ b/test/LightORMTest/CreateTableTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Text; namespace LightORMTest; diff --git a/test/LightORMTest/DbMethodTest.cs b/test/LightORMTest/DbMethodTest.cs index 5b6a88e7..35bb5ab6 100644 --- a/test/LightORMTest/DbMethodTest.cs +++ b/test/LightORMTest/DbMethodTest.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; +using System.Linq.Expressions; namespace LightORMTest; diff --git a/test/LightORMTest/ExpressionTest/ConstantExpressionTest.cs b/test/LightORMTest/ExpressionTest/ConstantExpressionTest.cs index b81a8c31..08f733c0 100644 --- a/test/LightORMTest/ExpressionTest/ConstantExpressionTest.cs +++ b/test/LightORMTest/ExpressionTest/ConstantExpressionTest.cs @@ -1,10 +1,5 @@ using LightORM.Utils; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest.ExpressionTest; diff --git a/test/LightORMTest/ExpressionTest/ExpressionConstantValueExtractTest.cs b/test/LightORMTest/ExpressionTest/ExpressionConstantValueExtractTest.cs index 61842706..d191a588 100644 --- a/test/LightORMTest/ExpressionTest/ExpressionConstantValueExtractTest.cs +++ b/test/LightORMTest/ExpressionTest/ExpressionConstantValueExtractTest.cs @@ -1,10 +1,5 @@ using LightORM.Utils; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest.ExpressionVisitTest; diff --git a/test/LightORMTest/ExpressionTest/FormatStringTest.cs b/test/LightORMTest/ExpressionTest/FormatStringTest.cs index e51b6706..8400d668 100644 --- a/test/LightORMTest/ExpressionTest/FormatStringTest.cs +++ b/test/LightORMTest/ExpressionTest/FormatStringTest.cs @@ -1,9 +1,5 @@ using LightORM.Providers.Sqlite; -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; -using System.Text; namespace LightORMTest.ExpressionTest; diff --git a/test/LightORMTest/ExpressionTest/IsNotTest.cs b/test/LightORMTest/ExpressionTest/IsNotTest.cs index fc8918e5..d984dafe 100644 --- a/test/LightORMTest/ExpressionTest/IsNotTest.cs +++ b/test/LightORMTest/ExpressionTest/IsNotTest.cs @@ -1,12 +1,4 @@ -using LightORM.Interfaces.ExpSql; -using LightORM.Providers.Sqlite; -using LightORM.Utils.Vistors; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text; - -namespace LightORMTest.ExpressionTest; +namespace LightORMTest.ExpressionTest; [TestClass] public class IsNotTest diff --git a/test/LightORMTest/ExpressionTest/TypeSetFlatTest.cs b/test/LightORMTest/ExpressionTest/TypeSetFlatTest.cs index 1d78d44c..b3e1c7b8 100644 --- a/test/LightORMTest/ExpressionTest/TypeSetFlatTest.cs +++ b/test/LightORMTest/ExpressionTest/TypeSetFlatTest.cs @@ -2,10 +2,7 @@ using LightORM.Interfaces.ExpSql; using LightORM.Providers.Sqlite.Extensions; using LightORM.Utils.Vistors; -using System; -using System.Collections.Generic; using System.Linq.Expressions; -using System.Text; namespace LightORMTest.ExpressionTest; diff --git a/test/LightORMTest/LinqTest.cs b/test/LightORMTest/LinqTest.cs index b780d80f..0754b66b 100644 --- a/test/LightORMTest/LinqTest.cs +++ b/test/LightORMTest/LinqTest.cs @@ -1,9 +1,4 @@ using LightORM.Repository; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest; diff --git a/test/LightORMTest/Models/JsonTestModel.cs b/test/LightORMTest/Models/JsonTestModel.cs index 04220d7c..e3f13c4b 100644 --- a/test/LightORMTest/Models/JsonTestModel.cs +++ b/test/LightORMTest/Models/JsonTestModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.Json; -using System.Text.Json.Nodes; +using System.Text.Json.Nodes; namespace LightORMTest.Models; diff --git a/test/LightORMTest/Models/Product.cs b/test/LightORMTest/Models/Product.cs index a19399b8..e542025a 100644 --- a/test/LightORMTest/Models/Product.cs +++ b/test/LightORMTest/Models/Product.cs @@ -1,7 +1,4 @@ -using LightORM.Interfaces; -using LightORM.Models; - -namespace LightORMTest.Models; +namespace LightORMTest.Models; /// /// 产品 diff --git a/test/LightORMTest/Models/Sales.cs b/test/LightORMTest/Models/Sales.cs index 23b60a58..923b48cc 100644 --- a/test/LightORMTest/Models/Sales.cs +++ b/test/LightORMTest/Models/Sales.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.Models; +namespace LightORMTest.Models; [LightTable(Name = "SALES")] public class Sales diff --git a/test/LightORMTest/ReadParameter/DbParameterReadTest.cs b/test/LightORMTest/ReadParameter/DbParameterReadTest.cs index 7e5ee22b..bd02a9f6 100644 --- a/test/LightORMTest/ReadParameter/DbParameterReadTest.cs +++ b/test/LightORMTest/ReadParameter/DbParameterReadTest.cs @@ -1,9 +1,6 @@ using LightORM.Cache; -using System; -using System.Collections.Generic; using System.Data; using System.Data.SQLite; -using System.Text; namespace LightORMTest.ReadParameter; diff --git a/test/LightORMTest/ReflectTest/TableColumnTest.cs b/test/LightORMTest/ReflectTest/TableColumnTest.cs index 46de7846..ff765736 100644 --- a/test/LightORMTest/ReflectTest/TableColumnTest.cs +++ b/test/LightORMTest/ReflectTest/TableColumnTest.cs @@ -1,9 +1,4 @@ using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest.ReflectTest; diff --git a/test/LightORMTest/RepositoryTest.cs b/test/LightORMTest/RepositoryTest.cs index a495cf45..400b9a5d 100644 --- a/test/LightORMTest/RepositoryTest.cs +++ b/test/LightORMTest/RepositoryTest.cs @@ -1,10 +1,5 @@ using LightORM.Repository; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest; diff --git a/test/LightORMTest/ResolverTest/ValueResolveTest.cs b/test/LightORMTest/ResolverTest/ValueResolveTest.cs index 3d013999..c2363297 100644 --- a/test/LightORMTest/ResolverTest/ValueResolveTest.cs +++ b/test/LightORMTest/ResolverTest/ValueResolveTest.cs @@ -1,9 +1,5 @@ using LightORM.Providers.Sqlite; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; namespace LightORMTest.ResolverTest; diff --git a/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs b/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs index 3fd0930b..b95768d1 100644 --- a/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs +++ b/test/LightORMTest/ResultTest/ExecutionTest.Trans.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; +using System.Collections.Concurrent; using System.Data; -using System.Text; namespace LightORMTest.ResultTest; diff --git a/test/LightORMTest/ResultTest/JsonTest.cs b/test/LightORMTest/ResultTest/JsonTest.cs index 29c43342..bc2b1fe1 100644 --- a/test/LightORMTest/ResultTest/JsonTest.cs +++ b/test/LightORMTest/ResultTest/JsonTest.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.Json.Nodes; +using System.Text.Json.Nodes; namespace LightORMTest.ResultTest; diff --git a/test/LightORMTest/ScopedTest/TransactionTest.cs b/test/LightORMTest/ScopedTest/TransactionTest.cs index 1ec77d90..b5adf368 100644 --- a/test/LightORMTest/ScopedTest/TransactionTest.cs +++ b/test/LightORMTest/ScopedTest/TransactionTest.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Transactions; +using System.Transactions; namespace LightORMTest.ScopedTest; diff --git a/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs index 999bc87b..6276e097 100644 --- a/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs +++ b/test/LightORMTest/SqlGenerate/InsertOrUpdateTest.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public class InsertOrUpdateTest : TestBase { diff --git a/test/LightORMTest/SqlGenerate/InsertSql.cs b/test/LightORMTest/SqlGenerate/InsertSql.cs index bdc77018..a7d0b106 100644 --- a/test/LightORMTest/SqlGenerate/InsertSql.cs +++ b/test/LightORMTest/SqlGenerate/InsertSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public class InsertSql : TestBase { diff --git a/test/LightORMTest/SqlGenerate/SelectSql.Group.cs b/test/LightORMTest/SqlGenerate/SelectSql.Group.cs index 0a3b4f5a..e18aa1b5 100644 --- a/test/LightORMTest/SqlGenerate/SelectSql.Group.cs +++ b/test/LightORMTest/SqlGenerate/SelectSql.Group.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public partial class SelectSql { diff --git a/test/LightORMTest/SqlGenerate/SelectSql_Json.cs b/test/LightORMTest/SqlGenerate/SelectSql_Json.cs index 8a6b898b..a0696659 100644 --- a/test/LightORMTest/SqlGenerate/SelectSql_Json.cs +++ b/test/LightORMTest/SqlGenerate/SelectSql_Json.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public class SelectSql_Json : TestBase { diff --git a/test/LightORMTest/SqlGenerate/UpdateSql.cs b/test/LightORMTest/SqlGenerate/UpdateSql.cs index 9a7396b1..ec6ad7f4 100644 --- a/test/LightORMTest/SqlGenerate/UpdateSql.cs +++ b/test/LightORMTest/SqlGenerate/UpdateSql.cs @@ -1,9 +1,4 @@ -using LightORM.SqlExecutor; -using LightORMTest; -using Microsoft.Extensions.Primitives; -using System.Threading.Tasks; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public class UpdateSql : TestBase { diff --git a/test/LightORMTest/SqlGenerate/WithOriginSql.cs b/test/LightORMTest/SqlGenerate/WithOriginSql.cs index bcc183d7..6bdcad01 100644 --- a/test/LightORMTest/SqlGenerate/WithOriginSql.cs +++ b/test/LightORMTest/SqlGenerate/WithOriginSql.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace LightORMTest.SqlGenerate; +namespace LightORMTest.SqlGenerate; public class WithOriginSql : TestBase { diff --git a/test/LightORMTest/SwitchDatabaseTest.cs b/test/LightORMTest/SwitchDatabaseTest.cs index db39b85f..db3c78ff 100644 --- a/test/LightORMTest/SwitchDatabaseTest.cs +++ b/test/LightORMTest/SwitchDatabaseTest.cs @@ -1,12 +1,5 @@ using LightORM.Providers.Sqlite.Extensions; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LightORMTest; diff --git a/test/LightORMTest/TestBase.cs b/test/LightORMTest/TestBase.cs index 2e0f8156..a0bdd5b6 100644 --- a/test/LightORMTest/TestBase.cs +++ b/test/LightORMTest/TestBase.cs @@ -4,8 +4,6 @@ using LightORM.Implements; using Microsoft.Extensions.DependencyInjection; using System.Diagnostics.CodeAnalysis; -using System.Text.Json.Serialization; -using System.Text.Json.Serialization.Metadata; namespace LightORMTest; diff --git a/test/LightORMTest/TestTableContext.cs b/test/LightORMTest/TestTableContext.cs index 857c5498..916fc921 100644 --- a/test/LightORMTest/TestTableContext.cs +++ b/test/LightORMTest/TestTableContext.cs @@ -1,11 +1,4 @@ -using LightORM; -using LightORM.Models; -using System.Linq.Expressions; - -namespace LightORMTest; - -using static LightORMTest.TestTableContext; - +namespace LightORMTest; /// /// 数据表上下文缓存 /// diff --git a/test/TestProject1/DataHelper.cs b/test/TestProject1/DataHelper.cs index c3193e01..648df58b 100644 --- a/test/TestProject1/DataHelper.cs +++ b/test/TestProject1/DataHelper.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TestProject1 +namespace TestProject1 { internal class DataHelper { diff --git a/test/TestProject1/ExpressionTest/ConditionalTest.cs b/test/TestProject1/ExpressionTest/ConditionalTest.cs index 7e358264..b875b095 100644 --- a/test/TestProject1/ExpressionTest/ConditionalTest.cs +++ b/test/TestProject1/ExpressionTest/ConditionalTest.cs @@ -1,10 +1,5 @@ using LightORM.Providers.Sqlite; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace TestProject1.ExpressionTest { diff --git a/test/TestProject1/ExpressionTest/ConstraintTest.cs b/test/TestProject1/ExpressionTest/ConstraintTest.cs index f6db72e9..7d89c3fa 100644 --- a/test/TestProject1/ExpressionTest/ConstraintTest.cs +++ b/test/TestProject1/ExpressionTest/ConstraintTest.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; +using System.Linq.Expressions; namespace TestProject1.ExpressionTest; diff --git a/test/TestProject1/ExpressionTest/SelectExpressionTest.cs b/test/TestProject1/ExpressionTest/SelectExpressionTest.cs index 31cad40a..9591f0a3 100644 --- a/test/TestProject1/ExpressionTest/SelectExpressionTest.cs +++ b/test/TestProject1/ExpressionTest/SelectExpressionTest.cs @@ -1,11 +1,5 @@ -using LightORM.Utils; -using LightORM.Utils.Vistors; -using System; -using System.Collections.Generic; -using System.Linq; +using LightORM.Utils.Vistors; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace TestProject1.ExpressionTest; diff --git a/test/TestProject1/FlatSqlTest/SelectTest.cs b/test/TestProject1/FlatSqlTest/SelectTest.cs index 804adcbe..dbe677a0 100644 --- a/test/TestProject1/FlatSqlTest/SelectTest.cs +++ b/test/TestProject1/FlatSqlTest/SelectTest.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TestProject1.FlatSqlTest; +namespace TestProject1.FlatSqlTest; [TestClass] public class SelectTest : TestBase diff --git a/test/TestProject1/Models/Product.cs b/test/TestProject1/Models/Product.cs index 07fd4aca..0e26b789 100644 --- a/test/TestProject1/Models/Product.cs +++ b/test/TestProject1/Models/Product.cs @@ -1,7 +1,4 @@ -using LightORM.Interfaces; -using LightORM.Models; - -namespace TestProject1.Models; +namespace TestProject1.Models; /// /// 产品 diff --git a/test/TestProject1/Models/RunLog.cs b/test/TestProject1/Models/RunLog.cs index 659b2617..e4af49fe 100644 --- a/test/TestProject1/Models/RunLog.cs +++ b/test/TestProject1/Models/RunLog.cs @@ -1,6 +1,4 @@ #nullable disable -using System.Diagnostics.CodeAnalysis; - namespace TestProject1.Models; diff --git a/test/TestProject1/Other.cs b/test/TestProject1/Other.cs index 75aa7aa7..17f41103 100644 --- a/test/TestProject1/Other.cs +++ b/test/TestProject1/Other.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Data.Common; +using System.Data.Common; using System.Data.SQLite; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace TestProject1 { diff --git a/test/TestProject1/ResultTest/SelectResult.cs b/test/TestProject1/ResultTest/SelectResult.cs index d6cfd8a7..01f47bdd 100644 --- a/test/TestProject1/ResultTest/SelectResult.cs +++ b/test/TestProject1/ResultTest/SelectResult.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TestProject1.ResultTest +namespace TestProject1.ResultTest { [TestClass] public class SelectResult : TestBase diff --git a/test/TestProject1/SqlFunctionTest/SqlFunTest.cs b/test/TestProject1/SqlFunctionTest/SqlFunTest.cs index bd538d97..512dd3ab 100644 --- a/test/TestProject1/SqlFunctionTest/SqlFunTest.cs +++ b/test/TestProject1/SqlFunctionTest/SqlFunTest.cs @@ -1,12 +1,5 @@ -using LightORM.Providers.MySql; -using LightORM.Providers.Oracle; -using LightORM.Providers.Sqlite; -using System; -using System.Collections.Generic; -using System.Linq; +using LightORM.Providers.Sqlite; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace TestProject1.SqlFunctionTest; diff --git a/test/TestProject1/SqlTest/SelectResult.cs b/test/TestProject1/SqlTest/SelectResult.cs index 9e8922ba..9af994d3 100644 --- a/test/TestProject1/SqlTest/SelectResult.cs +++ b/test/TestProject1/SqlTest/SelectResult.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TestProject1.SqlTest; +namespace TestProject1.SqlTest; [TestClass] public class SelectResult : TestBase diff --git a/test/TestProject1/StringBuilderHelperTest.cs b/test/TestProject1/StringBuilderHelperTest.cs index 3838b456..ca575856 100644 --- a/test/TestProject1/StringBuilderHelperTest.cs +++ b/test/TestProject1/StringBuilderHelperTest.cs @@ -1,9 +1,5 @@ using LightORM.Extension; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace TestProject1 { diff --git a/test/TestProject1/TestBase.cs b/test/TestProject1/TestBase.cs index 9bb1c5ed..bca5d610 100644 --- a/test/TestProject1/TestBase.cs +++ b/test/TestProject1/TestBase.cs @@ -1,7 +1,6 @@ using LightORM.Implements; using LightORM.Providers.Oracle.Extensions; using LightORM.Providers.Sqlite.Extensions; -using System.Data.SQLite; using System.Linq.Expressions; namespace TestProject1; diff --git a/test/TestProject1/TestTableContext.cs b/test/TestProject1/TestTableContext.cs index 4ee5f562..b15c4b89 100644 --- a/test/TestProject1/TestTableContext.cs +++ b/test/TestProject1/TestTableContext.cs @@ -1,12 +1,4 @@ -using LightORM.Cache; -using LightORM.Interfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TestProject1; +namespace TestProject1; [LightORMTableContext] internal partial class TestTableContext diff --git a/test/TestProject1/TypeSetFlatTest.cs b/test/TestProject1/TypeSetFlatTest.cs index 3d23edb9..77be8994 100644 --- a/test/TestProject1/TypeSetFlatTest.cs +++ b/test/TestProject1/TypeSetFlatTest.cs @@ -1,13 +1,6 @@ using LightORM.Interfaces.ExpSql; -using LightORM.Utils; using LightORM.Utils.Vistors; -using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace TestProject1; diff --git a/test/TestWeb/Models/Product.cs b/test/TestWeb/Models/Product.cs index 53f3f8de..c642e991 100644 --- a/test/TestWeb/Models/Product.cs +++ b/test/TestWeb/Models/Product.cs @@ -1,7 +1,4 @@ -using LightORM.Interfaces; -using LightORM.Models; - -namespace TestWeb.Models; +namespace TestWeb.Models; /// /// 产品 diff --git a/test/TestWeb/Models/Role.cs b/test/TestWeb/Models/Role.cs index c4969d69..681c981e 100644 --- a/test/TestWeb/Models/Role.cs +++ b/test/TestWeb/Models/Role.cs @@ -1,6 +1,4 @@ -using TestWeb.Models; - -namespace TestWeb.Models; +namespace TestWeb.Models; [LightTable(Name = "ROLE")] public class Role diff --git a/test/TestWeb/Models/RunLog.cs b/test/TestWeb/Models/RunLog.cs index b4453770..3dbc3896 100644 --- a/test/TestWeb/Models/RunLog.cs +++ b/test/TestWeb/Models/RunLog.cs @@ -1,6 +1,4 @@ #nullable disable -using System.Diagnostics.CodeAnalysis; - namespace TestWeb.Models; diff --git a/test/TestWeb/Services.cs b/test/TestWeb/Services.cs index dbdfabe4..dda5d667 100644 --- a/test/TestWeb/Services.cs +++ b/test/TestWeb/Services.cs @@ -1,5 +1,4 @@ -using LightORM; -using TestWeb.Models; +using TestWeb.Models; namespace TestWeb {