Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions DatabaseUtils/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.Configuration;
using System.Data;
using System.IO;
using System.Windows;
using System.Windows;

namespace DatabaseUtils
{
Expand Down
9 changes: 1 addition & 8 deletions DatabaseUtils/Helper/TypeMap.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions doc/版本日志.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 版本功能更新记录

## v2026.08.31
- ⚡️批量插入或更新(添加Sqlite支持)
- 🛠Delete导航删除使用更通用的写法
- 🛠PostgreSQL默认不使用QuoteIdentifiers
- 🐞修复TransientContext传递错误的Ado
- 🐞修复生成器读取标签属性错误

## v2026.08.26
- 🐞修复`ExecuteResult`中的DataReader重复Close
- 🐞修复实体映射处理匿名类型中的class类型
Expand Down
1 change: 1 addition & 0 deletions src/LightORM/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[assembly: InternalsVisibleTo("InjectTest")]
[assembly: InternalsVisibleTo("TestProject1")]
[assembly: InternalsVisibleTo("LightORMTest")]
[assembly: InternalsVisibleTo("LightORMTest.Sqlite")]
[assembly: InternalsVisibleTo("LightORMTest.PostgreSQL")]
[assembly: InternalsVisibleTo("BenchmarkTest")]

Expand Down
144 changes: 76 additions & 68 deletions src/LightORM/Builder/DeleteBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using LightORM.Extension;
using System.Diagnostics.CodeAnalysis;
using System.Text;

namespace LightORM.Builder;
//#if NET8_0_OR_GREATER
Expand All @@ -16,8 +15,16 @@ internal class DeleteBuilder<T> : SqlBuilder
public bool Truncate { get; set; }
HashSet<string> Members { get; set; } = [];
public List<BatchSqlInfo>? 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 = "根据已知类型构建导航条件")]
#endif
protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo expInfo, ExpressionResolvedResult result)
{
Expand All @@ -32,80 +39,78 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e
{
continue;
}
var navSqlBuilder = SelectBuilder.GetSelectBuilder();
navSqlBuilder.IsSubQuery = true;
navSqlBuilder.Depth = 1;
navSqlBuilder.AddTableInfo(MainTable);
var navInfo = navColumn.NavigateInfo!;
var mainCol = MainTable.GetColumnInfo(navInfo.MainName!);
var targetType = navInfo.NavigateType;
var targetTable = TableInfo.Create(targetType, navSqlBuilder.NextTableIndex);

navSqlBuilder.SelectValue = $"{MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)}";
var targetTable = TableInfo.Create(targetType);
targetTable.Depth++;
//navSqlBuilder.SelectValue = $"{selectMain.Alias}.{database.AttachEmphasis(mainCol.ColumnName)}";
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.Joins.Add(new JoinInfo(mapTable)
{
JoinType = TableLinkType.InnerJoin,
Where = $"( {MainTable.Alias}.{database.AttachEmphasis(mainCol.ColumnName)} = {mapTable.Alias}.{database.AttachEmphasis(subCol.ColumnName)} )"
});

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<ParameterExpression> 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);
}
//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, 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 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.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));
}

Where.Add($"{database.AttachEmphasis(mainCol.ColumnName)} IN ({N}{navSqlBuilder.ToSqlString(database)})");

if (result.NavigateWhereExpression.TryGetLambdaExpression(out var l)
&& l!.Parameters[0].Type == navSqlBuilder.AllTables().LastOrDefault()?.Type)
{

List<ParameterExpression> 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);
}

//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($"EXISTS ({N}{sb})");
ResolvedValues.AddRange(navSqlBuilder.ResolvedValues);
}
}
else
Expand All @@ -130,7 +135,7 @@ private void CreateBatchDeleteSql(IDatabaseAdapter database)
}
BatchInfos = columns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count);
//var delete = $"DELETE FROM {GetTableName(database, MainTable, false)}";
database.HandleBatchDelete<T>(new(this, columns, BatchInfos, database));
database.HandleBatchDelete<T>(new(this, columns, BatchInfos, DbParameters, database));

batchDone = true;
}
Expand All @@ -149,25 +154,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条件
Expand Down
4 changes: 2 additions & 2 deletions src/LightORM/Builder/InsertBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using LightORM.Extension;
using System.Text;

namespace LightORM.Builder;

Expand Down Expand Up @@ -93,7 +92,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<T>(new(this, insertColumns, BatchInfos, DbParameters, database));

batchDone = true;

Expand Down Expand Up @@ -185,6 +184,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));
Expand Down
4 changes: 2 additions & 2 deletions src/LightORM/Builder/ScopedDatabaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>(BatchActionContext<InsertBuilder<T>> context) => inner.HandleBatchInsert(context);

void IDatabaseAdapter.HandleBatchUpdate(BatchActionContext context) => inner.HandleBatchUpdate(context);
void IDatabaseAdapter.HandleBatchUpdate<T>(BatchActionContext<UpdateBuilder<T>> context) => inner.HandleBatchUpdate(context);

void IDatabaseAdapter.HandleInsertOrUpdate(UpsertContext context) => inner.HandleInsertOrUpdate(context);

Expand Down
Loading
Loading