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
16 changes: 15 additions & 1 deletion doc/版本日志.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# 版本功能更新记录

## v2026.08.21
- 🛠重构Table生成配置,基类`TableOptions`保留公共配置,由各Provider派生各自的配置项
- ⚡️新增`StringBuilderPool`,一定程度上缓解GC和内存占用

| Provider | 版本要求 | 对应LightORM版本 |
|---------------------------------|-------|---|
| `LightORM.Providers.Dameng` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.KingbaseES` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.MySql` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.Oracle` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.PostgreSQL` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.Sqlite` | 2026.8.21.1 |2026.8.21.1 |
| `LightORM.Providers.SqlServer` | 2026.8.21.1 |2026.8.21.1 |

## v2026.08.19
- ⚡️Update, Insert, Delete增加`NoQuoteIdentifiers`和`QuoteIdentifiers`,控制单次构建中是否使用标识引用符号

Expand Down Expand Up @@ -93,7 +107,7 @@ WHERE EXISTS (

## v2026.06.19
- 🐞修复JSON列反序列化代码的丢失
- AOT改造
- 🛠AOT改造
1. 🛠泛型参数改造,用于支持AOT裁剪
2. 🛠生成器增加Include操作的代码生成
3. 🛠反序列化支持在匿名对象中使用实体接收值
Expand Down
22 changes: 14 additions & 8 deletions src/LightORM/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
[assembly: InternalsVisibleTo("TestProject1")]
[assembly: InternalsVisibleTo("LightORMTest")]
[assembly: InternalsVisibleTo("LightORMTest.PostgreSQL")]
[assembly: InternalsVisibleTo("BenchmarkTest")]

[assembly:InternalsVisibleTo("LightORM.Extensions.DependencyInjection")]
[assembly:InternalsVisibleTo("LightORM.Providers.Dameng")]
[assembly:InternalsVisibleTo("LightORM.Providers.KingbaseES")]
[assembly:InternalsVisibleTo("LightORM.Providers.MySql")]
[assembly:InternalsVisibleTo("LightORM.Providers.Oracle")]
[assembly:InternalsVisibleTo("LightORM.Providers.PostgreSQL")]
[assembly:InternalsVisibleTo("LightORM.Providers.Sqlite")]
[assembly:InternalsVisibleTo("LightORM.Providers.SqlServer")]
[assembly: InternalsVisibleTo("LightORM.Extensions.DependencyInjection")]
[assembly: InternalsVisibleTo("LightORM.Providers.Dameng")]
[assembly: InternalsVisibleTo("LightORM.Providers.KingbaseES")]
[assembly: InternalsVisibleTo("LightORM.Providers.MySql")]
[assembly: InternalsVisibleTo("LightORM.Providers.Oracle")]
[assembly: InternalsVisibleTo("LightORM.Providers.PostgreSQL")]
[assembly: InternalsVisibleTo("LightORM.Providers.Sqlite")]
[assembly: InternalsVisibleTo("LightORM.Providers.SqlServer")]

[assembly: SelectExtension(ArgumentCount = 2)]
[assembly: SelectExtension(ArgumentCount = 3)]
Expand Down Expand Up @@ -43,6 +44,11 @@ internal static class DebugControl
public static readonly bool ShowExpressionHashCodeDebugInfo = true;
}

internal static class BenchmarkConfig
{
public static bool UseStringBuilderPool { get; set; }
}

internal static class AOTControl
{
public static bool AOTSupported = false;
Expand Down
64 changes: 3 additions & 61 deletions src/LightORM/Builder/DeleteBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace LightORM.Builder;
//#endif
internal class DeleteBuilder<T> : SqlBuilder
{
public new T? TargetObject { get; set; }
//public new T? TargetObject { get; set; }
public T[] TargetObjects { get; set; } = [];
private bool batchDone = false;
public bool IsBatchDelete { get; set; }
Expand Down Expand Up @@ -130,66 +130,8 @@ private void CreateBatchDeleteSql(IDatabaseAdapter database)
}
BatchInfos = columns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count);
//var delete = $"DELETE FROM {GetTableName(database, MainTable, false)}";
foreach (var batch in BatchInfos)
{
StringBuilder sb = new("DELETE FROM ");
//sb.AppendLine(GetTableName(database, MainTable, false));
sb.AppendTableName(database, MainTable, false).AppendLine();
sb.Append("WHERE ");
if (TargetObjects.Length == 0)
{
sb.Append("1=0");
batch.Sql = sb.ToString();
break;
}
sb.Append('(');
for (int rowIndex = 0; rowIndex < batch.Parameters.Count; rowIndex++)
{
List<SimpleColumn>? row = batch.Parameters[rowIndex];
if (columns.Length > 1)
{
sb.Append('(');
for (var i = 0; i < row.Count; i++)
{
if (i > 0)
{
sb.Append(" AND ");
}
sb.AppendEmphasis(row[i].ColumnName, database);
sb.Append(" = ");
sb.WithPrefix(row[i].ParameterName, database);
}
sb.Append(')');
if (rowIndex < batch.Parameters.Count - 1)
sb.Append(" OR ");
}
else
{
if (rowIndex == 0)
{
// 这里直接访问索引0是安全的,因为进入到else分支的话,说明row.Count == 1, 而row.Count是跟前面的columns的数量是一致的
sb.AppendEmphasis(row[0].ColumnName, database);
sb.Append(" IN (");

}
sb.WithPrefix(row[0].ParameterName, database);
if (rowIndex < batch.Parameters.Count - 1)
sb.Append(',');
else
sb.Append(')');
}
}
sb.Append(')');
database.HandleBatchDelete<T>(new(this, columns, BatchInfos, database));

foreach (var w in Where)
{
sb.AppendLine();
sb.Append("AND ");
sb.Append(w);
}
HandleSqlParameters(sb, database);
batch.Sql = sb.ToString();
}
batchDone = true;
}
public override string ToSqlString(IDatabaseAdapter database)
Expand Down Expand Up @@ -224,7 +166,7 @@ public override string ToSqlString(IDatabaseAdapter database)
{
throw new LightOrmException("Where Condition is null and not provider a entity value");
}
StringBuilder sql;
using var _ = StringBuilderPool.Get(out var sql);
sql = new("DELETE FROM ");
//sql.AppendLine(GetTableName(database, MainTable, false));
sql.AppendTableName(database, MainTable, false).AppendLine();
Expand Down
10 changes: 5 additions & 5 deletions src/LightORM/Builder/InsertBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace LightORM.Builder;

internal class InsertBuilder<T> : SqlBuilder
{
public new T? TargetObject { get; set; }
//public new T? TargetObject { get; set; }
public T[] TargetObjects { get; set; } = [];
public List<BatchSqlInfo>? BatchInfos { get; set; }
HashSet<string> IgnoreMembers { get; set; } = [];
Expand Down Expand Up @@ -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.HandleBatchInsert(new(this, insertColumns, BatchInfos, database));

batchDone = true;

Expand Down Expand Up @@ -184,14 +184,14 @@ public override string ToSqlString(IDatabaseAdapter database)
}
//columns.RemoveLast(1);
//values.RemoveLast(1);
StringBuilder sb;
using var _ = StringBuilderPool.Get(out var sb);
if ((UpdateOnConflict || IgnoreOnConflict) && insertColumns.Any(i => i.IsPrimaryKey))
{
sb = database.HandleInsertOrUpdate(new(this, columnValueMap, DbParameters, IgnoreOnConflict, database));
database.HandleInsertOrUpdate(new(this, sb, columnValueMap, DbParameters, IgnoreOnConflict, database));
}
else
{
sb = new("INSERT INTO ");
sb.Append("INSERT INTO ");
//sb.AppendLine($" {GetTableName(database, MainTable, false)} ");
sb.AppendTableName(database, MainTable, false).AppendLine();
sb.Append('(');
Expand Down
24 changes: 12 additions & 12 deletions src/LightORM/Builder/ScopedDatabaseAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public string FormatBooleanValue(bool value)
return inner.FormatBooleanValue(value);
}

public string FormatDateTimeValue(DateTime value)
{
return inner.FormatDateTimeValue(value);
}

//public void HandleBooleanValue(StringBuilder sql, bool value)
//{
// inner.HandleBooleanValue(sql, value);
Expand Down Expand Up @@ -74,18 +79,13 @@ public void ReturnIdentitySql(StringBuilder sql)
inner.ReturnIdentitySql(sql);
}

public string RewriteParameterReferences(string sql, string prefix)
{
return inner.RewriteParameterReferences(sql, prefix);
}
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);

StringBuilder IDatabaseAdapter.HandleInsertOrUpdate(UpsertContext context)
{
return inner.HandleInsertOrUpdate(context);
}
void IDatabaseAdapter.HandleBatchUpdate(BatchActionContext context) => inner.HandleBatchUpdate(context);

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

void IDatabaseAdapter.HandleBatchDelete<T>(BatchActionContext<DeleteBuilder<T>> context) => inner.HandleBatchDelete(context);
}
5 changes: 2 additions & 3 deletions src/LightORM/Builder/SelectBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,14 @@ public override string ToSqlString(IDatabaseAdapter database)
{
database = new ScopedDatabaseAdapter(database, QuoteIdentifiers.Value);
}
StringBuilder sql = new(estimatedSize);
using var _ = StringBuilderPool.Get(out var sql, estimatedSize);
Build(sql, database, Depth);
HandleSqlParameters(sql, database);
sql.Trim();
var sqlString = sql.ToString();
//SelectBuilderPool.Return(this);
return sqlString;

}

private const string UNIT_IDENT = " ";
public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel)
{
Expand Down
104 changes: 6 additions & 98 deletions src/LightORM/Builder/UpdateBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private static ITableColumnInfo GetColumn(TableInfo tableInfo, string propertyNa
return columnInfo;
}

public new T? TargetObject { get; set; }
//public new T? TargetObject { get; set; }
public T[] TargetObjects { get; set; } = [];
public List<BatchSqlInfo>? BatchInfos { get; set; }
HashSet<string> IgnoreMembers { get; set; } = [];
Expand Down Expand Up @@ -205,106 +205,13 @@ private void CreateUpdateBatchSql(IDatabaseAdapter database)
.ToArray();

BatchInfos = columns.GenBatchInfos(TargetObjects, database, 2000 - DbParameters.Count, DbParameters);
//var update = $"UPDATE {GetTableName(database, MainTable, false)} SET";
//var primaryWhen = $"WHEN {string.Join(" AND ", primaryCol.Select(p => $"{AttachPrefix(p.ColumnName)}_{{0}}"))}";
foreach (var batch in BatchInfos)
{
// 每一个BatchSqInfo就是每批次更新的数据量
StringBuilder sb = new("UPDATE ");
//sb.Append(GetTableName(database, MainTable, false));
sb.AppendTableName(database, MainTable, false);
sb.Append(" SET ");
for (int i = 0; i < columns.Length; i++)
{
ITableColumnInfo? col = columns[i];
if (col.IsPrimaryKey) continue;
//sb.Append($"\n{database.AttachEmphasis(col.ColumnName)} = CASE ");
sb.AppendEmphasis(col.ColumnName, database);
sb.AppendLine(" = CASE");
// 每一条记录的参数数量
for (var rowIndex = 0; rowIndex < batch.Parameters.Count; rowIndex++)
{
var rowDatas = batch.Parameters[rowIndex];
var currentCol = rowDatas.First(r => r.PropName == col.PropertyName);
if (currentCol.IsVersion)
{
var newVersion = VersionPlus(currentCol.Value);
var newCol = currentCol with { ParameterName = $"{currentCol.ParameterName}_n", Value = newVersion, IsVersion = false };
rowDatas.Add(newCol);
currentCol = newCol;
}
bool first = true;
sb.Append(" WHEN ");
foreach (var item in rowDatas.Where(r => r.IsPrimaryKey || r.IsVersion))
{
if (!first) sb.Append(" AND ");
first = false;
sb.AppendEmphasis(item.ColumnName, database);
sb.Append(" = ");
sb.WithPrefix(item.ParameterName, database);
}
sb.Append(" THEN ");
sb.AppendLine(database.GetValueExpression(currentCol));
//if (currentCol.IsVersion)
//{
// rowDatas.Add(currentCol);
//}
}

sb.Append("END, ");
}

sb.RemoveLast(2);

var pValues = batch.Parameters.SelectMany(rowDatas => rowDatas.Where(r => r.IsPrimaryKey | r.IsVersion)).GroupBy(c => c.ColumnName).ToList();
if (pValues.Count == 0 && Where.Count == 0)
{
throw new LightOrmException($"类型{typeof(T)}, 没有主键并且缺失Where条件");
}
sb.AppendLine();
sb.Append("WHERE ");
for (int k = 0; k < pValues.Count; k++)
{
IGrouping<string, SimpleColumn>? item = pValues[k];
if (k > 0)
{
sb.AppendLine();
sb.Append("AND ");
}
sb.Append('(');
sb.AppendEmphasis(item.Key, database);
sb.Append(" IN (");
foreach (var i in item)
{
sb.WithPrefix(i.ParameterName, database);
sb.Append(',');
}
sb.RemoveLast(1);
sb.Append("))");
}
if (Where.Count > 0)
{
//if (pValues.Count == 0)
for (int i = 0; i < Where.Count; i++)
{
if (i > 0 || pValues.Count > 0)
{
sb.AppendLine();
sb.Append("AND ");
}
sb.Append(Where[i]);
}
}
HandleSqlParameters(sb, database);
batch.Sql = sb.ToString();
}
database.HandleBatchUpdate(new(this, columns, BatchInfos, database));

batchDone = true;


}



public override string ToSqlString(IDatabaseAdapter database)
{
if (QuoteIdentifiers.HasValue)
Expand Down Expand Up @@ -369,8 +276,9 @@ public override string ToSqlString(IDatabaseAdapter database)
var customCols = MainTable.TableEntityInfo.Columns.Where(c => Members.Contains(c.PropertyName) && !SetNullMembers.Contains(c.PropertyName));

var setNullCol = MainTable.TableEntityInfo.Columns.Where(c => SetNullMembers.Count > 0 && SetNullMembers.Contains(c.PropertyName)).ToList();

StringBuilder sb = new("UPDATE ");
using var _ = StringBuilderPool.Get(out var sb);
//StringBuilder sb = new("UPDATE ");
sb.Append("UPDATE ");
sb.AppendTableName(database, MainTable, false);
sb.AppendLine(" SET ");
bool valueFounded;
Expand Down
9 changes: 2 additions & 7 deletions src/LightORM/DbStruct/TableGenerateOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ public TableOptions()
public bool NotCreateIfExists { get; set; }
public bool UseUnicodeString { get; set; } = true;
public bool SupportComment { get; set; } = true;

/// <summary>
/// 当前仅Oracle对此属性有支持,高级版本的Oracle,适用自增列语法 GENERATED ALWAYS AS IDENTITY
/// </summary>
public bool OverVersion { get; set; }
public string? TableSpace { get; set; }
public string? UserId { get; set; }
public JSONBackend JSONBackend { get; set; } = JSONBackend.Text;
public string? SpecificJsonColumnDbType { get; set; }

Expand All @@ -25,4 +18,6 @@ public int DefaultStringLength
get => UseUnicodeString ? defaultStringLength / 2 : defaultStringLength;
set => defaultStringLength = value;
}


}
Loading
Loading