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
26 changes: 26 additions & 0 deletions .workbuddy/memory/2026-09-05.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 2026-09-05

## 通读 LightORM 项目并生成技术大纲

产出 `doc/项目大纲.md`(约 11 章 + 2 个附录),覆盖双主线架构、方言层、执行层、源生成器、AOT 设施、缺口清单与阅读路线。

### 项目核心认知

- **双主线**:A 表达式→SQL(IExpSelect<T1..Tn> → SelectProvider → SelectBuilder → ExpressionResolver → ISqlMethodResolver → IDatabaseAdapter);B DbDataReader→对象(SqlAdo → InternalDataReader → ExpressionBuilder.BuildDeserializer<T> → Expression.Compile())。两线在 `Extension/SelectResultExtensions.cs` 的 InternalToList 汇合。
- **三层职责分离**:解析器管片段生成 / Builder 管结构组装 / Adapter 管方言翻译。
- **易混命名**:`src/LightORM/Providers/` 是核心库内 SQL 生成 Provider;`src/Providers/` 才是独立数据库方言 NuGet 包。

### 实测发现的坑(后续可做)

- `LightOrmTableContextGenerator/TableContextGenerator.CreateDeserializeMethod.cs`:生成的方法体是 `throw new NotImplementedException()`,完整实现整体注释掉了 → **AOT 静态反序列化路径当前不可用**,实际仍全部走 `ExpressionBuilder` 动态编译。
- `Cache/DeserializerCache.cs`:空壳,直接 throw NotImplementedException。
- `Utils/ExpressionAotHelper.cs`:空桩。
- `SqlExecutor/OrignalSqlExecutor.cs`:标记 `[Obsolete]` 但仍是主实现。
- `AssemblyInfo.cs`:`ShowSqlExecutorDebugInfo` / `ShowExpressionHashCodeDebugInfo` 默认 true。
- `IsAOTRuntime` = `!RuntimeFeature.IsDynamicCodeSupported && AOTSupported`,`AOTSupported` 由 `ExpressionSqlBuilder.cs:74` 置 true。

### 有用的速查

- 表达式缓存:FNV-1a 64 位(`Utils/Vistors/ExpressionHasher.cs`),参数名与常量值默认不参与哈希,`NeedToExtractValues` 触发 `ExpressionValueExtract` 每次重新取值 —— 结构解析一次 / 值提取每次。
- 反序列化:缓存键 = `类型 FullName + 每列「列名:DataType:AllowDBNull」`;四路类型分派 = 元组 / 基础类型 / 匿名(Expression.New)/ 具名(MemberInit);每成员三段 = 取值 GetXxx(i) + 转换 + `IsDBNull ? default : value` 三元。
- 新增数据库方言 = 实现 5 个类:Custom{DB}Adapter / {DB}MethodResolver / {DB}Provider / {DB}TableHandler / {DB}TableOptions。
11 changes: 10 additions & 1 deletion doc/版本日志.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# 版本功能更新记录

## 2026.09.02
## v2026.09.05
- 🐞现在ScopedContext在释放前,不归还Connection对象
- 🐞表达式解析缓存键新增层级
- 🐞解析结果需要处理Template时,使用with {}复制对象,避免污染缓存
- 🐞修复子查询的层级错误
- ⚡️新增GroupBy方言处理(MySql 8.0以下版本不支持 CUBE, GROUPING SETS)
- 🐞修复SqlServer的分页查询的ORDER BY子语句
- 🐞修复FlatGrouping中的KeySelector的参数替换

## v2026.09.02
- 🐞`WhereIf<TTable>(bool condition, Expression<Func<TTable, bool>> exp)`处理TypeSet类型
- ⚡️`IScopedExpressionContext`释放时,自动提交事务

Expand Down
701 changes: 701 additions & 0 deletions doc/项目大纲.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/LightORM/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ internal static class DebugControl
public static readonly bool ShowExpressionResolveDebugInfo = false;
public static readonly bool ShowSqlExecutorDebugInfo = true;
public static readonly bool ShowExpressionHashCodeDebugInfo = true;
public static readonly bool ShowObjectPoolDebugInfo = false;
}

internal static class BenchmarkConfig
Expand Down
2 changes: 1 addition & 1 deletion src/LightORM/Builder/InsertBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ public override string ToSqlString(IDatabaseAdapter database)
// ToSqlString由内部或者测试项目调用,批量情况下查看SQL使用BatchInfos属性
return string.Empty;
}
ResolveExpressions(database);

if (TargetObject == null && DbParameters.Count == 0)
{
throw new LightOrmException("插入的实体为空或者没有需要插入的值");
}
ResolveExpressions(database);

var insertColumns = GetInsertColumns();

Expand Down
2 changes: 2 additions & 0 deletions src/LightORM/Builder/ScopedDatabaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@ public void ReturnIdentitySql(StringBuilder sql)
void IDatabaseAdapter.HandleInsertOrUpdate(UpsertContext context) => inner.HandleInsertOrUpdate(context);

void IDatabaseAdapter.HandleBatchDelete<T>(BatchActionContext<DeleteBuilder<T>> context) => inner.HandleBatchDelete(context);

void IDatabaseAdapter.HandleSelectGroupBySegment(SelectContext context) => inner.HandleSelectGroupBySegment(context);
}
34 changes: 6 additions & 28 deletions src/LightORM/Builder/SelectBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ internal partial class SelectBuilder : SqlBuilder, ISelectSqlBuilder
public List<SelectBuilder> TempViews { get; } = [];
public SelectBuilder? SubQuery { get; set; }
public List<UnionItem> Unions { get; } = [];
public HashSet<SelectMap> SelectedMembers { get; set; } = [];
public bool IsSubQuery { get; set; }
public bool IsTemp { get; set; }
public bool IsUnion { get; set; }
Expand All @@ -54,13 +55,15 @@ internal partial class SelectBuilder : SqlBuilder, ISelectSqlBuilder
public bool IsCube { get; set; }
public string SelectValue { get; set; } = "*";
public int Depth { get; set; }

private readonly List<JoinInfo> joins = [];
public List<string> Having { get; set; } = [];
public SortedSet<IncludeInfo> Includes { get; set; } = [];

public string? GroupBy { get; set; }
public List<string> GroupingSets { get; set; } = [];
public List<string> OrderBy { get; set; } = [];
public HashSet<string> OrderByMembers { get; set; } = [];
public int TableIndexFix { get; set; }
public object? AdditionalValue { get; set; }
public int NextTableIndex => SelectedTables.Count + joins.Count + TableIndexFix;
Expand Down Expand Up @@ -191,6 +194,7 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e
}
}
}
SelectedMembers.AddRange(result.SelectedMembers);
if (!string.IsNullOrWhiteSpace(result.SqlString))
{
SelectValue = result.SqlString!;
Expand All @@ -209,6 +213,7 @@ protected override void HandleResult(IDatabaseAdapter database, ExpressionInfo e
}
else if (expInfo.ResolveOptions.SqlType == SqlPartial.OrderBy)
{
OrderByMembers.AddRange(result.Members);
OrderBy.Add(result.SqlString!);
AdditionalValue = expInfo.AdditionalParameter;
}
Expand Down Expand Up @@ -321,7 +326,6 @@ public override string ToSqlString(IDatabaseAdapter database)
return sqlString;
}

private const string UNIT_IDENT = " ";
public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel)
{
Depth = currentLevel;
Expand Down Expand Up @@ -436,33 +440,7 @@ public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel
}
if (GroupBy is { })
{
if (IsRollup)
{
// $"{ident}GROUP BY ROLLUP ({string.Join(", ", GroupBy)})"
sql.Append(ident).Append("GROUP BY ROLLUP (").Append(GroupBy).AppendLine(")");
}
else if (IsCube)
{
// $"{ident}GROUP BY CUBE ({string.Join(", ", GroupBy)})"
sql.Append(ident).Append("GROUP BY CUBE (").Append(GroupBy).AppendLine(")");
}
else if (GroupingSets.Count > 0)
{
sql.Append(ident).AppendLine("GROUP BY GROUPING SETS (");
foreach (var set in GroupingSets)
{
sql.Append(ident).Append(UNIT_IDENT)
.Append('(').Append(set).Append(')').AppendLine(",");
}
sql.RemoveLast(N.Length + 1);
sql.AppendLine();
sql.Append(ident).AppendLine(")");
}
else
{
// $"{ident}GROUP BY {string.Join(", ", GroupBy)}"
sql.Append(ident).Append("GROUP BY ").Append(GroupBy).AppendLine();
}
database.HandleSelectGroupBySegment(new(this, sql, database, ident));
}
if (Having.Count > 0)
{
Expand Down
3 changes: 3 additions & 0 deletions src/LightORM/Builder/SqlBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ namespace LightORM.Builder;
//internal readonly struct
internal abstract partial class SqlBuilder : ISqlBuilder
{

public const string UNIT_IDENT = " ";
public static string N { get; } = Environment.NewLine;
public ExpressionInfoProvider Expressions { get; } = new ExpressionInfoProvider();
public TableInfo MainTable => SelectedTables[0];
Expand Down Expand Up @@ -108,6 +110,7 @@ protected void ResolveExpressions(IDatabaseAdapter database)
var result = item.Expression.Resolve(item.ResolveOptions, ResolveCtx);
if (!string.IsNullOrEmpty(item.Template))
{
result = result with { };
result.SqlString = string.Format(item.Template, result.SqlString);
}
HandleResult(database, item, result);
Expand Down
41 changes: 25 additions & 16 deletions src/LightORM/Builder/UpdateBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private static ITableColumnInfo GetColumn(TableInfo tableInfo, string propertyNa
public bool IsBatchUpdate { get; internal set; }
public VersionInfo VersionInfo { get; set; }
public bool UseVersionColumn { get; private set; }
public int SetCount => Members.Count + SetNullMembers.Count;
public void AddMember(string member, object? value)
{
Members.Add(member);
Expand Down Expand Up @@ -184,13 +185,6 @@ private void CreateUpdateBatchSql(IDatabaseAdapter database)
if (IgnoreMembers.Count > 0 && IgnoreMembers.Contains(col.PropertyName))
return false;

// 如果 Members 为空,且当前列不是被强制保留的类型,则需进一步判断
if (Members.Count == 0)
{
// 当 Members 为空时,只要没被 Ignore 就保留
return true;
}

// Members 非空:只保留显式指定的成员,主键、版本号等始终保留
if (col.IsPrimaryKey || col.IsVersionColumn)
return true;
Expand All @@ -199,6 +193,13 @@ private void CreateUpdateBatchSql(IDatabaseAdapter database)
if (col.AutoIncrement || col.IsNotMapped || col.IsNavigate || col.IsAggregated || col.IsIgnoreUpdate)
return false;

// 如果 Members 为空,且当前列不是被强制保留的类型,则需进一步判断
if (Members.Count == 0)
{
// 当 Members 为空时,只要没被 Ignore 就保留
return true;
}

// 最终:是否在 Members 中
return Members.Contains(col.PropertyName);
})
Expand Down Expand Up @@ -308,18 +309,26 @@ public override string ToSqlString(IDatabaseAdapter database)
}
sb.AppendEmphasis(c.ColumnName, database);
sb.Append(" = ");
sb.WithPrefix(c.PropertyName, database);
if (c.IsJsonColumn)
if (value is bool b)
{
// TODO 暂时做法,兼容postgresql,在后面追加::JSONB
database.HandleJsonParameter(new(ActionType.Parameterized, c, sb, null, DbParameters, ExpressionSqlOptions.Instance.Value.GetJsonHandler()));
var jsonHandler = ExpressionSqlOptions.Instance.Value.GetJsonHandler();
var jsonString = jsonHandler.Serialize(value);
DbParameters[c.PropertyName] = jsonString;
sb.Append(database.FormatBooleanValue(b));
DbParameters.Remove(c.PropertyName);
}
if (!valueFounded)
else
{
DbParameters.Add(c.PropertyName, value!);
sb.WithPrefix(c.PropertyName, database);
if (c.IsJsonColumn)
{
// TODO 暂时做法,兼容postgresql,在后面追加::JSONB
database.HandleJsonParameter(new(ActionType.Parameterized, c, sb, null, DbParameters, ExpressionSqlOptions.Instance.Value.GetJsonHandler()));
var jsonHandler = ExpressionSqlOptions.Instance.Value.GetJsonHandler();
var jsonString = jsonHandler.Serialize(value);
DbParameters[c.PropertyName] = jsonString;
}
if (!valueFounded)
{
DbParameters.Add(c.PropertyName, value!);
}
}

sb.AppendLine(",");
Expand Down
2 changes: 2 additions & 0 deletions src/LightORM/ExpressionSql/ExpressionCoreSql.Tran.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ public ISingleScopedExpressionContext Use(IDatabaseProvider db)
{

var connection = connectionFactory.GetDatabaseConnection(db);
connection.KeepAlive = true;
return new SingleScopedExpressionCoreSql(connection, Options);
}

public ISingleScopedExpressionContext CreateScoped(string key)
{
Debug.WriteLine("CreateScoped");
var connection = connectionFactory.GetDatabaseConnection(key);
connection.KeepAlive = true;
return new SingleScopedExpressionCoreSql(connection, Options);
}

Expand Down
24 changes: 15 additions & 9 deletions src/LightORM/ExpressionSql/ScopedExpressionCoreSql.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@ internal sealed class ScopedExpressionCoreSql(ExpressionSqlOptions options) : Ex
private readonly ConcurrentDictionary<string, DatabaseConnection> connections = [];
private TransientContext? current;
public override SqlAdo Ado => current?.Ado ?? DefaultAdo;

private DatabaseConnection GetConnection(string key)
{
var conn = connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection);
conn.KeepAlive = true;
return conn;
}
public SqlAdo DefaultAdo
{
get
{
var connection = connections.GetOrAdd(Options.DefaultDbKey, connectionFactory.GetDatabaseConnection);
var connection = GetConnection(Options.DefaultDbKey);
if (useTrans)
{
connection.BeginTransaction();
Expand All @@ -33,7 +38,7 @@ ITransientContext IScopedExpressionContext.SwitchDatabase(string key)
{
return ctx;
}
var connection = connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection);
var connection = GetConnection(key);
if (useTrans)
{
connection.BeginTransaction(isolationLevel);
Expand All @@ -48,6 +53,7 @@ public void Dispose()
{
foreach (var item in connections.Values)
{
item.KeepAlive = false;
if (item.State == AdoState.Active && item.UnderTransaction)
{
try
Expand Down Expand Up @@ -90,13 +96,13 @@ public void RollbackAllTransaction()
}
}
public void BeginTransaction(string key = "MainDb", IsolationLevel isolationLevel = IsolationLevel.Unspecified)
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).BeginTransaction(isolationLevel);
=> GetConnection(key).BeginTransaction(isolationLevel);

public void CommitTransaction(string key = "MainDb")
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).CommitTransaction();
=> GetConnection(key).CommitTransaction();

public void RollbackTransaction(string key = "MainDb")
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).RollbackTransaction();
=> GetConnection(key).RollbackTransaction();

#if NET8_0_OR_GREATER
public async Task BeginAllTransactionAsync(IsolationLevel isolationLevel = IsolationLevel.Unspecified, CancellationToken cancellationToken = default)
Expand Down Expand Up @@ -130,15 +136,15 @@ public async Task RollbackAllTransactionAsync(CancellationToken cancellationToke
public Task BeginTransactionAsync(string key = "MainDb"
, IsolationLevel isolationLevel = IsolationLevel.Unspecified
, CancellationToken cancellationToken = default)
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).BeginTransactionAsync(isolationLevel, cancellationToken);
=> GetConnection(key).BeginTransactionAsync(isolationLevel, cancellationToken);


public Task CommitTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default)
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).CommitTransactionAsync(cancellationToken);
=> GetConnection(key).CommitTransactionAsync(cancellationToken);


public Task RollbackTransactionAsync(string key = "MainDb", CancellationToken cancellationToken = default)
=> connections.GetOrAdd(key, connectionFactory.GetDatabaseConnection).RollbackTransactionAsync(cancellationToken);
=> GetConnection(key).RollbackTransactionAsync(cancellationToken);
#endif

}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public async Task RollbackTransactionAsync(CancellationToken cancellationToken =

public void Dispose()
{
databaseConnection.KeepAlive = false;
if (databaseConnection.State == AdoState.Active && databaseConnection.UnderTransaction)
{
try
Expand Down
Loading
Loading