From ee2edac726bda9703abcb9496d8c48218b45e500 Mon Sep 17 00:00:00 2001 From: yaoqinglin Date: Thu, 20 Aug 2026 14:04:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=A0=E5=92=8C?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LightORM/AssemblyInfo.cs | 17 +- src/LightORM/Builder/SelectBuilder.cs | 20 +- src/LightORM/Utils/StringBuilderPool.cs | 68 +++++++ test/BenchmarkTest/BenchmarkTest.csproj | 2 +- test/BenchmarkTest/Program.cs | 2 +- test/BenchmarkTest/StringBuilderPoolTest.cs | 192 ++++++++++++++++++++ 6 files changed, 289 insertions(+), 12 deletions(-) create mode 100644 src/LightORM/Utils/StringBuilderPool.cs create mode 100644 test/BenchmarkTest/StringBuilderPoolTest.cs diff --git a/src/LightORM/AssemblyInfo.cs b/src/LightORM/AssemblyInfo.cs index 6552efa9..365f554d 100644 --- a/src/LightORM/AssemblyInfo.cs +++ b/src/LightORM/AssemblyInfo.cs @@ -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)] diff --git a/src/LightORM/Builder/SelectBuilder.cs b/src/LightORM/Builder/SelectBuilder.cs index 6e0e0379..0c451424 100644 --- a/src/LightORM/Builder/SelectBuilder.cs +++ b/src/LightORM/Builder/SelectBuilder.cs @@ -318,15 +318,31 @@ 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; + } + public string ToSqlStringOld(IDatabaseAdapter database) + { + //SubQuery?.ResolveExpressions(); + var estimatedSize = EstimateSqlLength(); + if (QuoteIdentifiers.HasValue) + { + database = new ScopedDatabaseAdapter(database, QuoteIdentifiers.Value); + } + StringBuilder sql = new(estimatedSize); + Build(sql, database, Depth); + HandleSqlParameters(sql, database); + sql.Trim(); + var sqlString = sql.ToString(); + return sqlString; } + + private const string UNIT_IDENT = " "; public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel) { diff --git a/src/LightORM/Utils/StringBuilderPool.cs b/src/LightORM/Utils/StringBuilderPool.cs new file mode 100644 index 00000000..c06ffc38 --- /dev/null +++ b/src/LightORM/Utils/StringBuilderPool.cs @@ -0,0 +1,68 @@ +using System.Collections.Concurrent; +using System.Text; +using System.Threading; + +namespace LightORM.Utils; + +internal static class StringBuilderPool +{ + private static int POOL_CAPACITY => ExpressionSqlOptions.Instance.Value.InternalObjectPoolSize; + private const int BUILDER_CAPACITY = 4096; + private static readonly ConcurrentQueue pool = []; + private static int itemCount = 0; + [ThreadStatic] + private static StringBuilder? fast; + public static IDisposable Get(out StringBuilder builder, int capacity = 256) + { + var item = fast; + + if (item is not null) + { + fast = null; + builder = item; + return new BuilderWrap(builder); + } + if (pool.TryDequeue(out item)) + { + Interlocked.Decrement(ref itemCount); + builder = item; + return new BuilderWrap(builder); + } + item = new StringBuilder(capacity); + builder = item; + return new BuilderWrap(builder); + + + } + + public static void Return(StringBuilder item) + { + if (item == null) return; + + item.Clear(); + if (item.Capacity > BUILDER_CAPACITY) // 超过 4096 就不缓存 + { + return; + } + // 快速路径尝试 + if (fast == null) + { + fast = item; + return; + } + if (Interlocked.Increment(ref itemCount) <= POOL_CAPACITY) + { + pool.Enqueue(item); + return; + } + Interlocked.Decrement(ref itemCount); + } + + private class BuilderWrap(StringBuilder builder) : IDisposable + { + public void Dispose() + { + Return(builder); + } + } +} diff --git a/test/BenchmarkTest/BenchmarkTest.csproj b/test/BenchmarkTest/BenchmarkTest.csproj index 5c9fb6bb..75698101 100644 --- a/test/BenchmarkTest/BenchmarkTest.csproj +++ b/test/BenchmarkTest/BenchmarkTest.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/BenchmarkTest/Program.cs b/test/BenchmarkTest/Program.cs index 2ca1d7ad..bcfab183 100644 --- a/test/BenchmarkTest/Program.cs +++ b/test/BenchmarkTest/Program.cs @@ -3,5 +3,5 @@ using LightORM.Providers.Sqlite.Extensions; Console.WriteLine("Hello, World!"); -BenchmarkDotNet.Running.BenchmarkRunner.Run(); +BenchmarkDotNet.Running.BenchmarkRunner.Run(); diff --git a/test/BenchmarkTest/StringBuilderPoolTest.cs b/test/BenchmarkTest/StringBuilderPoolTest.cs new file mode 100644 index 00000000..a3e27716 --- /dev/null +++ b/test/BenchmarkTest/StringBuilderPoolTest.cs @@ -0,0 +1,192 @@ +using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Jobs; +using LightORM; +using LightORM.Providers.Sqlite.Extensions; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BenchmarkTest; + +[MemoryDiagnoser] +public class StringBuilderPoolTest +{ + class Jobs + { + public string? Plate { get; set; } + public string? StnId { get; set; } + } + [GlobalSetup] + public void Setup() + { + ExpSqlFactory.Configuration(config => + { + config.UseSqlite("Data Source=:memory:;Version=3;New=True;"); + }); + } + + [Benchmark] + public string SimpleSelectNoPool() + { + var db = ExpSqlFactory.GetContext(); + var select = db.Select(); + var builder = select.SqlBuilder; + var database = select.Executor.Database.DatabaseAdapter; + return builder.ToSqlStringOld(database); + } + + [Benchmark] + public string SimpleSelectWithPool() + { + var db = ExpSqlFactory.GetContext(); + var select = db.Select(); + var builder = select.SqlBuilder; + var database = select.Executor.Database.DatabaseAdapter; + return builder.ToSqlString(database); + } + + [Benchmark] + public string CTENoPool() + { + var Db = ExpSqlFactory.GetContext(); + // 从Jobs表中,选择Plate的第一个字符作为Fzjg字段,选择Fzjg和StnId,作为temp表,并命名为info + // With info as (...) + var info = Db.Select().AsTemp("info", j => new + { + Fzjg = j.Plate!.Substring(1, 2), + j.StnId + }); + // 从info表中,按StnId和Fzjg分组并且按Count(*)排序后,选择StnId,Fzjg,Count(*),RowNumer,作为temp表,并命名为stn_fzjg,表数据为每个StnId中,按Fzjg数据量进行排序并标记为Index + var stnFzjg = Db.FromTemp(info) + .GroupBy(a => new { a.StnId, a.Fzjg }) + .OrderByDesc(a => new { a.Group.StnId, i = a.Count() }) + .AsTemp("stn_fzjg", g => new + { + g.Group.StnId, + g.Group.Fzjg, + Count = g.Count(), + Index = WinFn.RowNumber().PartitionBy(g.Tables.StnId).OrderByDesc(g.Count()).Value() + }); + // 从info表中,按Fzjg分组并且按Count(*)排序后,选择StnId,Fzjg,Count(*),RowNumer,作为temp表,并命名为all_fzjg,表数据为所有Fzjg中,按每个Fzjg的数据量进行排序并标记为Index + var allFzjg = Db.FromTemp(info).GroupBy(a => new { a.Fzjg }) + .OrderByDesc(a => a.Count()) + .AsTemp("all_fzjg", g => new + { + StnId = "合计", + Fzjg = g.Group.Fzjg, + Count = g.Count(), + Index = WinFn.RowNumber().OrderByDesc(g.Count()).Value() + }); + // 从info表中,按StnId进行Group By Rollup ,选择StnId和分组数据量,作为temp表,并命名为all_station + var allStation = Db.FromTemp(info).GroupBy(t => new { t.StnId }) + .Rollup() + .AsTemp("all_station", g => new + { + StnId = SqlFn.NullThen(g.Group.StnId, "合计"), + Total = SqlFn.Count() + }); + /* + * 1. 从stn_fzjg中,筛选出所有前3的Fzjg数量,然后按StnId分组,选择StnId,组内第一Fzjg作为FirstFzjg,组内第一的Count作为FirstCount + * 2. 从all_fzjg中,筛选出所有前3的Fzjg数量,选择'合计'作为StnId,第一Fzjg作为FirstFzjg,第一的Count作为FirstCount + * 3. 将1和2的结果Union ALl + * 4. 转为子查询,inner join all_station + * 5. select结果列 + */ + var select = Db.FromTemp(stnFzjg).Where(t => t.Index < 4) + .GroupBy(t => new { t.StnId }) + .AsTable(g => new + { + StnId = g.Group.StnId!, + FirstFzjg = g.Join(g.Tables.Index == 1 ? g.Tables.Fzjg.ToString() : "").Separator("").OrderBy(g.Tables.StnId).Value(), + FirstCount = g.Join(g.Tables.Index == 1 ? g.Tables.Count.ToString() : "").Separator("").OrderBy(g.Tables.StnId).Value() + }).UnionAll(Db.FromTemp(allFzjg).Where(t => t.Index < 4).AsTable(g => new + { + StnId = "合计", + FirstFzjg = SqlFn.Join(g.Index == 1 ? g.Fzjg.ToString() : "").Separator("").OrderBy(g.StnId).Value(), + FirstCount = SqlFn.Join(g.Index == 1 ? g.Count.ToString() : "").Separator("").OrderBy(g.StnId).Value() + })).AsSubQuery() + .InnerJoin(allStation, (t, a) => t.StnId == a.StnId) + .SelectColumns((t, a) => new + { + Jczmc = SqlFn.NullThen(t.StnId, "TT"), + a.Total, + t + }); + var builder = select.SqlBuilder; + var database = select.Executor.Database.DatabaseAdapter; + return builder.ToSqlStringOld(database); + } + + [Benchmark] + public string CTEWithPool() + { + var Db = ExpSqlFactory.GetContext(); + // 从Jobs表中,选择Plate的第一个字符作为Fzjg字段,选择Fzjg和StnId,作为temp表,并命名为info + // With info as (...) + var info = Db.Select().AsTemp("info", j => new + { + Fzjg = j.Plate!.Substring(1, 2), + j.StnId + }); + // 从info表中,按StnId和Fzjg分组并且按Count(*)排序后,选择StnId,Fzjg,Count(*),RowNumer,作为temp表,并命名为stn_fzjg,表数据为每个StnId中,按Fzjg数据量进行排序并标记为Index + var stnFzjg = Db.FromTemp(info) + .GroupBy(a => new { a.StnId, a.Fzjg }) + .OrderByDesc(a => new { a.Group.StnId, i = a.Count() }) + .AsTemp("stn_fzjg", g => new + { + g.Group.StnId, + g.Group.Fzjg, + Count = g.Count(), + Index = WinFn.RowNumber().PartitionBy(g.Tables.StnId).OrderByDesc(g.Count()).Value() + }); + // 从info表中,按Fzjg分组并且按Count(*)排序后,选择StnId,Fzjg,Count(*),RowNumer,作为temp表,并命名为all_fzjg,表数据为所有Fzjg中,按每个Fzjg的数据量进行排序并标记为Index + var allFzjg = Db.FromTemp(info).GroupBy(a => new { a.Fzjg }) + .OrderByDesc(a => a.Count()) + .AsTemp("all_fzjg", g => new + { + StnId = "合计", + Fzjg = g.Group.Fzjg, + Count = g.Count(), + Index = WinFn.RowNumber().OrderByDesc(g.Count()).Value() + }); + // 从info表中,按StnId进行Group By Rollup ,选择StnId和分组数据量,作为temp表,并命名为all_station + var allStation = Db.FromTemp(info).GroupBy(t => new { t.StnId }) + .Rollup() + .AsTemp("all_station", g => new + { + StnId = SqlFn.NullThen(g.Group.StnId, "合计"), + Total = SqlFn.Count() + }); + /* + * 1. 从stn_fzjg中,筛选出所有前3的Fzjg数量,然后按StnId分组,选择StnId,组内第一Fzjg作为FirstFzjg,组内第一的Count作为FirstCount + * 2. 从all_fzjg中,筛选出所有前3的Fzjg数量,选择'合计'作为StnId,第一Fzjg作为FirstFzjg,第一的Count作为FirstCount + * 3. 将1和2的结果Union ALl + * 4. 转为子查询,inner join all_station + * 5. select结果列 + */ + var select = Db.FromTemp(stnFzjg).Where(t => t.Index < 4) + .GroupBy(t => new { t.StnId }) + .AsTable(g => new + { + StnId = g.Group.StnId!, + FirstFzjg = g.Join(g.Tables.Index == 1 ? g.Tables.Fzjg.ToString() : "").Separator("").OrderBy(g.Tables.StnId).Value(), + FirstCount = g.Join(g.Tables.Index == 1 ? g.Tables.Count.ToString() : "").Separator("").OrderBy(g.Tables.StnId).Value() + }).UnionAll(Db.FromTemp(allFzjg).Where(t => t.Index < 4).AsTable(g => new + { + StnId = "合计", + FirstFzjg = SqlFn.Join(g.Index == 1 ? g.Fzjg.ToString() : "").Separator("").OrderBy(g.StnId).Value(), + FirstCount = SqlFn.Join(g.Index == 1 ? g.Count.ToString() : "").Separator("").OrderBy(g.StnId).Value() + })).AsSubQuery() + .InnerJoin(allStation, (t, a) => t.StnId == a.StnId) + .SelectColumns((t, a) => new + { + Jczmc = SqlFn.NullThen(t.StnId, "TT"), + a.Total, + t + }); + var builder = select.SqlBuilder; + var database = select.Executor.Database.DatabaseAdapter; + return builder.ToSqlString(database); + } + +} From 7046a9ce1ea07ea78604688e002e70a6c264ff99 Mon Sep 17 00:00:00 2001 From: yaoqinglin Date: Fri, 21 Aug 2026 15:30:20 +0800 Subject: [PATCH 2/2] =?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 --- ...10\346\234\254\346\227\245\345\277\227.md" | 16 +- src/LightORM/AssemblyInfo.cs | 5 + src/LightORM/Builder/DeleteBuilder.cs | 64 +---- src/LightORM/Builder/InsertBuilder.cs | 10 +- src/LightORM/Builder/ScopedDatabaseAdapter.cs | 24 +- src/LightORM/Builder/SelectBuilder.cs | 17 -- src/LightORM/Builder/UpdateBuilder.cs | 104 +------- src/LightORM/DbStruct/TableGenerateOption.cs | 9 +- src/LightORM/ExpressionSql/DbInitial.cs | 7 - src/LightORM/Extension/StringBuilderHelper.cs | 223 +++++++++--------- .../Implements/BaseDatabaseHandler.cs | 7 +- .../Implements/CustomDatabaseAdapter.cs | 187 ++++++++++++++- src/LightORM/Implements/WriteTableFromType.cs | 12 +- src/LightORM/Interfaces/IDatabaseAdapter.cs | 6 +- .../Interfaces/IDatabaseTableHandler.cs | 1 - src/LightORM/Interfaces/IDbInitial.cs | 2 - src/LightORM/Interfaces/IDbOption.cs | 3 +- src/LightORM/Models/DataBaseOption.cs | 18 +- src/LightORM/Models/JsonColumnContext.cs | 5 +- src/LightORM/Providers/DeleteProvider.cs | 6 +- src/LightORM/Providers/InsertProvider.cs | 4 +- src/LightORM/Providers/UpdateProvider.cs | 6 +- src/LightORM/Utils/StringBuilderPool.cs | 13 +- .../CustomDamengAdapter.InsertOrUpdate.cs | 5 +- .../CustomDamengAdapter.ValueFormat.cs | 23 ++ .../CustomDamengAdapter.cs | 10 +- .../DamengMethodResolver.cs | 2 +- .../DamengProvider.cs | 8 +- .../DamengTableHandler.cs | 6 +- .../DamengTableOptions.cs | 13 + .../Extensions/IoCExtension.cs | 45 ++-- .../TableStructure/DamengTableWriter.cs | 12 +- .../CustomKingbaseESAdapter.InsertOrUpdate.cs | 8 +- .../CustomKingbaseESAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 41 ++-- .../KingbaseESProvider.cs | 8 +- .../KingbaseESTableHandler.cs | 6 +- .../KingbaseESTableOptions.cs | 12 + .../TableStructure/KingbaseESTableWriter.cs | 10 +- .../CustomMySqlAdapter.InertOrUpdate.cs | 10 +- .../CustomMySqlAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 45 ++-- .../LightORM.Providers.MySql/MySqlProvider.cs | 8 +- .../MySqlTableHandler.cs | 6 +- .../MySqlTableOptions.cs | 14 ++ .../TableStructure/MySqlTableWriter.cs | 12 +- .../CustomOracleAdapter.BatchInsert.cs | 18 +- .../CustomOracleAdapter.InsertOrUpdate.cs | 5 +- .../CustomOracleAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 47 ++-- .../OracleProvider.cs | 8 +- .../OracleTableHandler.cs | 6 +- .../OracleTableOptions.cs | 18 ++ .../TableStructure/OracleTableWriter.cs | 12 +- .../CustomPostgreSQL.InsertOrUpdate.cs | 8 +- .../CustomPostgreSQL.cs | 2 +- .../Extensions/IoCExtension.cs | 45 ++-- .../PostgreSQLTableHandler.cs | 6 +- .../PostgreSQLTableOptions.cs | 12 + .../PostgresSQLProvider.cs | 8 +- .../TableStructure/PostgreSQLTableWriter.cs | 10 +- .../CustomSqlServerAdapter.InsertOrUpdate.cs | 5 +- .../CustomSqlServerAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 45 ++-- .../SqlServerProvider.cs | 8 +- .../SqlServerTableHandler.cs | 6 +- .../SqlServerTableOptions.cs | 11 + .../TableStructure/SqlServerTableWriter.cs | 10 +- .../CustomSqliteAdapter.cs | 2 +- .../Extensions/IoCExtension.cs | 41 ++-- .../LightORM.Providers.Sqlite.csproj | 4 + .../SqliteMethodResolver.cs | 2 +- .../SqliteProvider.cs | 8 +- .../SqliteTableHandler.cs | 6 +- .../SqliteTableOptions.cs | 11 + .../TableStructure/SqliteTableWriter.cs | 10 +- src/versions.props | 34 +-- test/BenchmarkTest/StringBuilderPoolTest.cs | 8 +- .../SqlGenerate/InsertOrUpdateTest.cs | 9 +- 79 files changed, 856 insertions(+), 630 deletions(-) create mode 100644 src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs create mode 100644 src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs create mode 100644 src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs 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 4aa5b8d7..1471a93a 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,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`,控制单次构建中是否使用标识引用符号 @@ -93,7 +107,7 @@ WHERE EXISTS ( ## v2026.06.19 - 🐞修复JSON列反序列化代码的丢失 -- AOT改造 +- 🛠AOT改造 1. 🛠泛型参数改造,用于支持AOT裁剪 2. 🛠生成器增加Include操作的代码生成 3. 🛠反序列化支持在匿名对象中使用实体接收值 diff --git a/src/LightORM/AssemblyInfo.cs b/src/LightORM/AssemblyInfo.cs index 365f554d..eb4567af 100644 --- a/src/LightORM/AssemblyInfo.cs +++ b/src/LightORM/AssemblyInfo.cs @@ -44,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; diff --git a/src/LightORM/Builder/DeleteBuilder.cs b/src/LightORM/Builder/DeleteBuilder.cs index fdd62046..2d870ea9 100644 --- a/src/LightORM/Builder/DeleteBuilder.cs +++ b/src/LightORM/Builder/DeleteBuilder.cs @@ -8,7 +8,7 @@ namespace LightORM.Builder; //#endif internal class DeleteBuilder : 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; } @@ -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? 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(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) @@ -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(); diff --git a/src/LightORM/Builder/InsertBuilder.cs b/src/LightORM/Builder/InsertBuilder.cs index f5515711..74fd82cd 100644 --- a/src/LightORM/Builder/InsertBuilder.cs +++ b/src/LightORM/Builder/InsertBuilder.cs @@ -5,7 +5,7 @@ namespace LightORM.Builder; internal class InsertBuilder : SqlBuilder { - public new T? TargetObject { get; set; } + //public new T? TargetObject { get; set; } public T[] TargetObjects { get; set; } = []; public List? BatchInfos { get; set; } HashSet IgnoreMembers { get; set; } = []; @@ -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; @@ -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('('); diff --git a/src/LightORM/Builder/ScopedDatabaseAdapter.cs b/src/LightORM/Builder/ScopedDatabaseAdapter.cs index e20f1568..55cc8251 100644 --- a/src/LightORM/Builder/ScopedDatabaseAdapter.cs +++ b/src/LightORM/Builder/ScopedDatabaseAdapter.cs @@ -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); @@ -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(BatchActionContext> context) => inner.HandleBatchDelete(context); } diff --git a/src/LightORM/Builder/SelectBuilder.cs b/src/LightORM/Builder/SelectBuilder.cs index 0c451424..618963e1 100644 --- a/src/LightORM/Builder/SelectBuilder.cs +++ b/src/LightORM/Builder/SelectBuilder.cs @@ -326,23 +326,6 @@ public override string ToSqlString(IDatabaseAdapter database) return sqlString; } - public string ToSqlStringOld(IDatabaseAdapter database) - { - //SubQuery?.ResolveExpressions(); - var estimatedSize = EstimateSqlLength(); - if (QuoteIdentifiers.HasValue) - { - database = new ScopedDatabaseAdapter(database, QuoteIdentifiers.Value); - } - StringBuilder sql = new(estimatedSize); - Build(sql, database, Depth); - HandleSqlParameters(sql, database); - sql.Trim(); - var sqlString = sql.ToString(); - return sqlString; - } - - private const string UNIT_IDENT = " "; public void Build(StringBuilder sql, IDatabaseAdapter database, int currentLevel) { diff --git a/src/LightORM/Builder/UpdateBuilder.cs b/src/LightORM/Builder/UpdateBuilder.cs index ad600c1f..c2e123ef 100644 --- a/src/LightORM/Builder/UpdateBuilder.cs +++ b/src/LightORM/Builder/UpdateBuilder.cs @@ -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? BatchInfos { get; set; } HashSet IgnoreMembers { get; set; } = []; @@ -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? 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) @@ -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; diff --git a/src/LightORM/DbStruct/TableGenerateOption.cs b/src/LightORM/DbStruct/TableGenerateOption.cs index 68ba8aa7..2015762b 100644 --- a/src/LightORM/DbStruct/TableGenerateOption.cs +++ b/src/LightORM/DbStruct/TableGenerateOption.cs @@ -9,13 +9,6 @@ public TableOptions() public bool NotCreateIfExists { get; set; } public bool UseUnicodeString { get; set; } = true; public bool SupportComment { get; set; } = true; - - /// - /// 当前仅Oracle对此属性有支持,高级版本的Oracle,适用自增列语法 GENERATED ALWAYS AS IDENTITY - /// - 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; } @@ -25,4 +18,6 @@ public int DefaultStringLength get => UseUnicodeString ? defaultStringLength / 2 : defaultStringLength; set => defaultStringLength = value; } + + } diff --git a/src/LightORM/ExpressionSql/DbInitial.cs b/src/LightORM/ExpressionSql/DbInitial.cs index e493aa75..b1e01b27 100644 --- a/src/LightORM/ExpressionSql/DbInitial.cs +++ b/src/LightORM/ExpressionSql/DbInitial.cs @@ -4,13 +4,6 @@ namespace LightORM.ExpressionSql; public class DbInitial(ISqlExecutor executor, IDatabaseTableHandler handler) : IDbInitial { - private readonly TableOptions tableOption = new(); - public IDbInitial Configuration(Action option) - { - option?.Invoke(tableOption); - return this; - } - public IDbInitial CreateTable(params T[]? datas) { try diff --git a/src/LightORM/Extension/StringBuilderHelper.cs b/src/LightORM/Extension/StringBuilderHelper.cs index e59036bc..b9cc9fb4 100644 --- a/src/LightORM/Extension/StringBuilderHelper.cs +++ b/src/LightORM/Extension/StringBuilderHelper.cs @@ -5,159 +5,162 @@ namespace LightORM.Extension; public static class StringBuilderHelper { - public static bool EndsWith(this StringBuilder stringBuilder, string ends) + extension(StringBuilder stringBuilder) { - var el = ends.Length; - var sl = stringBuilder.Length; - if (sl < el) return false; - for (int i = 0; i < el; i++) + public bool EndsWith(string ends) { - var c1 = stringBuilder[sl - el + i]; - var c2 = ends[i]; - if (c1 != c2) + var el = ends.Length; + var sl = stringBuilder.Length; + if (sl < el) return false; + for (int i = 0; i < el; i++) { - return false; + var c1 = stringBuilder[sl - el + i]; + var c2 = ends[i]; + if (c1 != c2) + { + return false; + } } + return true; } - return true; - } - public static void RemoveLast(this StringBuilder stringBuilder, int length) - { - var startIndex = stringBuilder.Length - length; - if (startIndex < 0) - return; - stringBuilder.Remove(startIndex, length); - } + public void RemoveLast(int length) + { + var startIndex = stringBuilder.Length - length; + if (startIndex < 0) + return; + stringBuilder.Remove(startIndex, length); + } - public static string Trim(this StringBuilder stringBuilder, params char[] chars) - { + public string Trim(params char[] chars) + { #if NET462_OR_GREATER || NETSTANDARD2_0_OR_GREATER - if (stringBuilder == null) - throw new ArgumentNullException(nameof(stringBuilder)); + if (stringBuilder == null) + throw new ArgumentNullException(nameof(stringBuilder)); #else ArgumentNullException.ThrowIfNull(stringBuilder); #endif - if (stringBuilder.Length == 0) - return string.Empty; - // 如果没有提供自定义字符,则修剪空白字符 - bool trimWhileSpace = chars == null || chars.Length == 0; - var s = 0; - var e = stringBuilder.Length - 1; - // 找到第一个不需要修剪的字符 - while (s <= e) - { - char c = stringBuilder[s]; - bool shouldTrim = trimWhileSpace ? char.IsWhiteSpace(c) : Array.IndexOf(chars!, c) >= 0; - if (!shouldTrim) - break; - s++; - } + if (stringBuilder.Length == 0) + return string.Empty; + // 如果没有提供自定义字符,则修剪空白字符 + bool trimWhileSpace = chars == null || chars.Length == 0; + var s = 0; + var e = stringBuilder.Length - 1; + // 找到第一个不需要修剪的字符 + while (s <= e) + { + char c = stringBuilder[s]; + bool shouldTrim = trimWhileSpace ? char.IsWhiteSpace(c) : Array.IndexOf(chars!, c) >= 0; + if (!shouldTrim) + break; + s++; + } - // 找到最后一个不需要修剪的字符 - while (e >= s) - { - char c = stringBuilder[e]; - bool shouldTrim = trimWhileSpace ? char.IsWhiteSpace(c) : Array.IndexOf(chars!, c) >= 0; - if (!shouldTrim) - break; - e--; + // 找到最后一个不需要修剪的字符 + while (e >= s) + { + char c = stringBuilder[e]; + bool shouldTrim = trimWhileSpace ? char.IsWhiteSpace(c) : Array.IndexOf(chars!, c) >= 0; + if (!shouldTrim) + break; + e--; + } + return stringBuilder.ToString(s, e - s + 1); } - return stringBuilder.ToString(s, e - s + 1); - } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool CheckEmpty( + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool CheckEmpty( #if NET8_0_OR_GREATER ReadOnlySpan content #else - string content + string content #endif - ) - { + ) + { #if NET8_0_OR_GREATER return content.IsEmpty; #else - return string.IsNullOrEmpty(content); + return string.IsNullOrEmpty(content); #endif - } + } - public static int IndexOf(this StringBuilder stringBuilder + public int IndexOf( #if NET8_0_OR_GREATER - , ReadOnlySpan content + ReadOnlySpan content #else - , string content + string content #endif - , int startIndex = 0 - , int count = -1) - { - if (stringBuilder == null) throw new ArgumentNullException(nameof(stringBuilder)); - if (CheckEmpty(content)) throw new ArgumentNullException(nameof(content)); - - int sbLength = stringBuilder.Length; - int valueLength = content.Length; + , int startIndex = 0 + , int count = -1) + { + if (stringBuilder == null) throw new ArgumentNullException(nameof(stringBuilder)); + if (CheckEmpty(content)) throw new ArgumentNullException(nameof(content)); - // 参数验证 - if (startIndex < 0 || startIndex > sbLength) - throw new ArgumentOutOfRangeException(nameof(startIndex)); + int sbLength = stringBuilder.Length; + int valueLength = content.Length; - if (count < 0) - count = sbLength - startIndex; + // 参数验证 + if (startIndex < 0 || startIndex > sbLength) + throw new ArgumentOutOfRangeException(nameof(startIndex)); - if (count < 0 || startIndex > sbLength - count) - throw new ArgumentOutOfRangeException(nameof(count)); + if (count < 0) + count = sbLength - startIndex; - if (valueLength == 0) - return startIndex; // 空字符串总是匹配 + if (count < 0 || startIndex > sbLength - count) + throw new ArgumentOutOfRangeException(nameof(count)); - if (valueLength > count) - return -1; + if (valueLength == 0) + return startIndex; // 空字符串总是匹配 - int endIndex = startIndex + count - valueLength; + if (valueLength > count) + return -1; - char firstChar = content[0]; + int endIndex = startIndex + count - valueLength; - for (int i = startIndex; i <= endIndex; i++) - { - // 使用StringBuilder的索引器访问字符 - if (stringBuilder[i] != firstChar) - continue; + char firstChar = content[0]; - // 检查剩余字符 - bool match = true; - for (int j = 1; j < valueLength; j++) + for (int i = startIndex; i <= endIndex; i++) { - if (stringBuilder[i + j] != content[j]) + // 使用StringBuilder的索引器访问字符 + if (stringBuilder[i] != firstChar) + continue; + + // 检查剩余字符 + bool match = true; + for (int j = 1; j < valueLength; j++) { - match = false; - break; + if (stringBuilder[i + j] != content[j]) + { + match = false; + break; + } } + + if (match) + return i; } - if (match) - return i; + return -1; } - return -1; - } - - public static void ReplaceNull(this StringBuilder sql, string placeholder) - { - var parameterIndex = sql.IndexOf(placeholder); - - if (sql[parameterIndex - 2] == '=') + public void ReplaceNull(string placeholder) { - //equal - sql.Replace($"= {placeholder}", "IS NULL"); - } - else if (sql[parameterIndex - 3] == '<' && sql[parameterIndex - 2] == '>') - { - //not equal - sql.Replace($"<> {placeholder}", "IS NOT NULL"); - } - else - { - sql.Replace(placeholder, "NULL"); + var parameterIndex = stringBuilder.IndexOf(placeholder); + + if (stringBuilder[parameterIndex - 2] == '=') + { + //equal + stringBuilder.Replace($"= {placeholder}", "IS NULL"); + } + else if (stringBuilder[parameterIndex - 3] == '<' && stringBuilder[parameterIndex - 2] == '>') + { + //not equal + stringBuilder.Replace($"<> {placeholder}", "IS NOT NULL"); + } + else + { + stringBuilder.Replace(placeholder, "NULL"); + } } } } diff --git a/src/LightORM/Implements/BaseDatabaseHandler.cs b/src/LightORM/Implements/BaseDatabaseHandler.cs index 0f73a9cf..409d84e7 100644 --- a/src/LightORM/Implements/BaseDatabaseHandler.cs +++ b/src/LightORM/Implements/BaseDatabaseHandler.cs @@ -3,11 +3,12 @@ namespace LightORM.Implements; -public abstract class BaseDatabaseHandler : IDatabaseTableHandler - where TWriter : WriteTableFromType, new() +public abstract class BaseDatabaseHandler : IDatabaseTableHandler + where TWriter : WriteTableFromType, new() + where TOption : TableOptions { protected TWriter Writer { get; } = new(); - public abstract TableOptions Options { get; } + public abstract TOption Options { get; } public IEnumerable GenerateDbTable() { try diff --git a/src/LightORM/Implements/CustomDatabaseAdapter.cs b/src/LightORM/Implements/CustomDatabaseAdapter.cs index 5abde2e2..b693791b 100644 --- a/src/LightORM/Implements/CustomDatabaseAdapter.cs +++ b/src/LightORM/Implements/CustomDatabaseAdapter.cs @@ -87,6 +87,11 @@ public virtual string FormatBooleanValue(bool value) return value ? "1" : "0"; } + public virtual string FormatDateTimeValue(DateTime value) + { + throw new NotImplementedException(); + } + public abstract void HandleDateValue(StringBuilder sql, DateTime dateTime); public virtual string HandleBooleanValueForBulkCopy(bool value) @@ -128,7 +133,7 @@ public virtual void HandleJsonParameter(JsonColumnParameterContext context) { } public virtual void DbCommandInit(DbCommand dbCommand) { } - public virtual StringBuilder HandleInsertOrUpdate(UpsertContext context) + public virtual void HandleInsertOrUpdate(UpsertContext context) { throw new NotImplementedException(); } @@ -137,10 +142,12 @@ public virtual void HandleBatchInsert(BatchActionContext context) { var batchs = context.Batchs; var builder = context.Builder; - var insertColumns = context.InsertColumns; + var insertColumns = context.TargetColumns; + var database = context.ScopedAdapter; foreach (var item in batchs) { - StringBuilder sb = CreateInsertBuilder();//new(insert);// + using var _ = StringBuilderPool.Get(out var sb); + PreHandleInsertBuilder(sb); for (int i = 0; i < item.Parameters.Count; i++) { List? dic = item.Parameters[i]; @@ -163,11 +170,11 @@ public virtual void HandleBatchInsert(BatchActionContext context) } - StringBuilder CreateInsertBuilder() + void PreHandleInsertBuilder(StringBuilder sb) { - var sb = new StringBuilder("INSERT INTO "); + sb.Append("INSERT INTO "); //sb.Append(GetTableName(database, MainTable, false)); - sb.AppendTableName(this, builder.MainTable, false).AppendLine(); + sb.AppendTableName(database, builder.MainTable, false).AppendLine(); sb.Append('('); foreach (var item in insertColumns) { @@ -178,7 +185,173 @@ StringBuilder CreateInsertBuilder() sb.Append(')'); sb.AppendLine(); sb.AppendLine("VALUES"); - return sb; + } + } + + public virtual void HandleBatchUpdate(BatchActionContext context) + { + var batchs = context.Batchs; + var builder = context.Builder; + var updateColumns = context.TargetColumns; + var database = context.ScopedAdapter; + foreach (var batch in batchs) + { + // 每一个BatchSqInfo就是每批次更新的数据量 + //StringBuilder sb = new("UPDATE "); + using var _ = StringBuilderPool.Get(out var sb); + sb.Append("UPDATE "); + //sb.Append(GetTableName(database, MainTable, false)); + sb.AppendTableName(database, builder.MainTable, false); + sb.Append(" SET "); + for (int i = 0; i < updateColumns.Length; i++) + { + ITableColumnInfo? col = updateColumns[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 = SqlBuilder.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)); + } + + 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 && builder.Where.Count == 0) + { + throw new LightOrmException($"类型{builder.MainTable.Type}, 没有主键并且缺失Where条件"); + } + sb.AppendLine(); + sb.Append("WHERE "); + for (int k = 0; k < pValues.Count; k++) + { + IGrouping? 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 (builder.Where.Count > 0) + { + //if (pValues.Count == 0) + for (int i = 0; i < builder.Where.Count; i++) + { + if (i > 0 || pValues.Count > 0) + { + sb.AppendLine(); + sb.Append("AND "); + } + sb.Append(builder.Where[i]); + } + } + builder.HandleSqlParameters(sb, database); + batch.Sql = sb.ToString(); + } + } + + public virtual void HandleBatchDelete(BatchActionContext> context) + { + var batchs = context.Batchs; + var builder = context.Builder; + var keyColumns = context.TargetColumns; + var database = context.ScopedAdapter; + + foreach (var batch in batchs) + { + using var _ = StringBuilderPool.Get(out var sb); + sb.Append("DELETE FROM "); + //sb.AppendLine(GetTableName(database, MainTable, false)); + sb.AppendTableName(database, builder.MainTable, false).AppendLine(); + sb.Append("WHERE "); + if (builder.TargetObjects.Length == 0) + { + sb.Append("1=0"); + batch.Sql = sb.ToString(); + break; + } + sb.Append('('); + for (int rowIndex = 0; rowIndex < batch.Parameters.Count; rowIndex++) + { + List? row = batch.Parameters[rowIndex]; + if (keyColumns.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(')'); + + foreach (var w in builder.Where) + { + sb.AppendLine(); + sb.Append("AND "); + sb.Append(w); + } + builder.HandleSqlParameters(sb, database); + batch.Sql = sb.ToString(); } } } \ No newline at end of file diff --git a/src/LightORM/Implements/WriteTableFromType.cs b/src/LightORM/Implements/WriteTableFromType.cs index 75e8b62d..b386bfd1 100644 --- a/src/LightORM/Implements/WriteTableFromType.cs +++ b/src/LightORM/Implements/WriteTableFromType.cs @@ -2,14 +2,14 @@ namespace LightORM.Implements; -public abstract class WriteTableFromType +public abstract class WriteTableFromType where TOption:TableOptions { - protected abstract string ConvertToDbType(TableOptions option, DbColumn type); - protected abstract string BuildColumn(TableOptions option, DbColumn column); - protected abstract string DbEmphasis(TableOptions option, string name); + 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(TableOptions option, string name) => DbEmphasis(option, name); - public abstract IEnumerable BuildTableSql(TableOptions option, DbTable table); + 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) { diff --git a/src/LightORM/Interfaces/IDatabaseAdapter.cs b/src/LightORM/Interfaces/IDatabaseAdapter.cs index 6375be5a..c103232e 100644 --- a/src/LightORM/Interfaces/IDatabaseAdapter.cs +++ b/src/LightORM/Interfaces/IDatabaseAdapter.cs @@ -26,6 +26,7 @@ public interface IDatabaseAdapter void ReturnIdentitySql(StringBuilder sql); //void HandleBooleanValue(StringBuilder sql, bool value); string FormatBooleanValue(bool value); + string FormatDateTimeValue(DateTime value); void HandleDateValue(StringBuilder sql, DateTime value); string HandleBooleanValueForBulkCopy(bool value); @@ -37,9 +38,12 @@ public interface IDatabaseAdapter void HandleJsonColumn(JsonColumnContext context); void HandleJsonParameter(JsonColumnParameterContext context); - internal StringBuilder HandleInsertOrUpdate(UpsertContext context); + internal void HandleInsertOrUpdate(UpsertContext context); internal void HandleBatchInsert(BatchActionContext context); + internal void HandleBatchUpdate(BatchActionContext context); + + internal void HandleBatchDelete(BatchActionContext> context); } } diff --git a/src/LightORM/Interfaces/IDatabaseTableHandler.cs b/src/LightORM/Interfaces/IDatabaseTableHandler.cs index f6bbd071..a246917a 100644 --- a/src/LightORM/Interfaces/IDatabaseTableHandler.cs +++ b/src/LightORM/Interfaces/IDatabaseTableHandler.cs @@ -4,7 +4,6 @@ namespace LightORM.Interfaces; public interface IDatabaseTableHandler { - TableOptions Options { get; } IEnumerable GenerateDbTable(); string GetTablesSql(); string GetTableStructSql(string table); diff --git a/src/LightORM/Interfaces/IDbInitial.cs b/src/LightORM/Interfaces/IDbInitial.cs index 697d2ebb..dd807c40 100644 --- a/src/LightORM/Interfaces/IDbInitial.cs +++ b/src/LightORM/Interfaces/IDbInitial.cs @@ -3,6 +3,4 @@ public interface IDbInitial { IDbInitial CreateTable(params T[]? datas); - // IDbInitial CreateOrUpdateTable(params T[]? datas); - IDbInitial Configuration(Action option); } diff --git a/src/LightORM/Interfaces/IDbOption.cs b/src/LightORM/Interfaces/IDbOption.cs index 309f3b22..3b2de8ea 100644 --- a/src/LightORM/Interfaces/IDbOption.cs +++ b/src/LightORM/Interfaces/IDbOption.cs @@ -5,6 +5,7 @@ namespace LightORM; public interface IDbOption { string? DbKey { get; set; } + internal TOption GetOption() where TOption : TableOptions; string? MasterConnectionString { get; set; } string[]? SalveConnectionStrings { get; set; } IDbOption ConfigurationMethodResolver(Action action); @@ -15,5 +16,5 @@ public interface IDbOption /// IDbOption AddDbKeyWords(params string[] keyWords); IDbOption UseIdentifierQuote(bool value = true); - IDbOption TableConfiguration(Action action); + //IDbOption TableConfiguration(Action action); } diff --git a/src/LightORM/Models/DataBaseOption.cs b/src/LightORM/Models/DataBaseOption.cs index ba8123cf..45d826bf 100644 --- a/src/LightORM/Models/DataBaseOption.cs +++ b/src/LightORM/Models/DataBaseOption.cs @@ -2,13 +2,14 @@ namespace LightORM.Models; -public sealed class DataBaseOption : IDbOption +public sealed class DataBaseOption : IDbOption + where T : TableOptions, new() { public string? DbKey { get; set; } public string? MasterConnectionString { get; set; } public string[]? SalveConnectionStrings { get; set; } - public DbProviderFactory? NewFactory { get; set; } - public TableOptions GenerateOption { get; set; } = new(); + public DbProviderFactory? NewFactory { get; set; } + public T GenerateOption { get; set; } = new(); public HashSet Keyworks { get; set; } = []; public bool IsUseIdentifierQuote { get; set; } = true; public Action? SqlMethodConfiguration { get; set; } @@ -36,9 +37,14 @@ public IDbOption OverrideDbProviderFactory(DbProviderFactory factory) return this; } - public IDbOption TableConfiguration(Action action) + TOption IDbOption.GetOption() { - action.Invoke(GenerateOption); - return this; + return (GenerateOption as TOption)!; } + + //public IDbOption TableConfiguration(Action action) + //{ + // action.Invoke(GenerateOption); + // return this; + //} } diff --git a/src/LightORM/Models/JsonColumnContext.cs b/src/LightORM/Models/JsonColumnContext.cs index e7c9599f..c356d296 100644 --- a/src/LightORM/Models/JsonColumnContext.cs +++ b/src/LightORM/Models/JsonColumnContext.cs @@ -30,9 +30,10 @@ public enum ActionType public readonly record struct MapEntry(string Column, string Value); -internal readonly record struct UpsertContext(SqlBuilder Builder, Dictionary ColumnValueMap, Dictionary Parameters, bool IgnoreWhenMap, IDatabaseAdapter ScopedAdapter); +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[] InsertColumns, List Batchs); +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; public readonly record struct JsonColumnParameterContext(ActionType ActionType , ITableColumnInfo Column diff --git a/src/LightORM/Providers/DeleteProvider.cs b/src/LightORM/Providers/DeleteProvider.cs index 07594e05..b858a7ae 100644 --- a/src/LightORM/Providers/DeleteProvider.cs +++ b/src/LightORM/Providers/DeleteProvider.cs @@ -14,7 +14,7 @@ internal sealed class DeleteProvider : IExpDelete public DeleteProvider(ISqlExecutor executor, T? entity) { this.executor = executor; - sqlBuilder = new DeleteBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.TargetObject = entity; } @@ -22,7 +22,7 @@ public DeleteProvider(ISqlExecutor executor, T? entity) public DeleteProvider(ISqlExecutor executor, T[] entities) { this.executor = executor; - sqlBuilder = new DeleteBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.TargetObjects = entities; sqlBuilder.IsBatchDelete = true; @@ -35,7 +35,7 @@ public DeleteProvider(ISqlExecutor executor, T[] entities) public IExpDelete NoQuoteIdentifiers() { sqlBuilder.QuoteIdentifiers = false; - return this ; + return this; } public IExpDelete QuoteIdentifiers() diff --git a/src/LightORM/Providers/InsertProvider.cs b/src/LightORM/Providers/InsertProvider.cs index 7de406eb..0e713177 100644 --- a/src/LightORM/Providers/InsertProvider.cs +++ b/src/LightORM/Providers/InsertProvider.cs @@ -12,7 +12,7 @@ internal sealed class InsertProvider : IExpInsert public InsertProvider(ISqlExecutor executor, T? entity) { this.executor = executor; - sqlBuilder = new InsertBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.TargetObject = entity; } @@ -20,7 +20,7 @@ public InsertProvider(ISqlExecutor executor, T? entity) public InsertProvider(ISqlExecutor executor, T[] entities) { this.executor = executor; - sqlBuilder = new InsertBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.TargetObjects = entities; sqlBuilder.IsBatchInsert = true; diff --git a/src/LightORM/Providers/UpdateProvider.cs b/src/LightORM/Providers/UpdateProvider.cs index 40ed56e9..1c19d9e0 100644 --- a/src/LightORM/Providers/UpdateProvider.cs +++ b/src/LightORM/Providers/UpdateProvider.cs @@ -12,7 +12,7 @@ internal class UpdateProvider : IExpUpdate public UpdateProvider(ISqlExecutor executor, T? entity) { this.executor = executor; - sqlBuilder = new UpdateBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.TargetObject = entity; } @@ -20,7 +20,7 @@ public UpdateProvider(ISqlExecutor executor, T? entity) public UpdateProvider(ISqlExecutor executor, T[] entities) { this.executor = executor; - sqlBuilder = new UpdateBuilder(); + sqlBuilder = new(); sqlBuilder.SelectedTables.Add(TableInfo.Create()); sqlBuilder.IsBatchUpdate = true; sqlBuilder.TargetObjects = entities; @@ -137,7 +137,7 @@ public IExpUpdate SetNull(Expression> exp) return this; } - + public IExpUpdate SetIf(bool condition, Expression> exp, TField value) { diff --git a/src/LightORM/Utils/StringBuilderPool.cs b/src/LightORM/Utils/StringBuilderPool.cs index c06ffc38..49c548e2 100644 --- a/src/LightORM/Utils/StringBuilderPool.cs +++ b/src/LightORM/Utils/StringBuilderPool.cs @@ -1,4 +1,5 @@ -using System.Collections.Concurrent; +using LightORM.AssemblyControl; +using System.Collections.Concurrent; using System.Text; using System.Threading; @@ -12,8 +13,13 @@ internal static class StringBuilderPool private static int itemCount = 0; [ThreadStatic] private static StringBuilder? fast; - public static IDisposable Get(out StringBuilder builder, int capacity = 256) + public static IDisposable Get(out StringBuilder builder, int capacity = 128) { + if (!BenchmarkConfig.UseStringBuilderPool) + { + builder = new StringBuilder(capacity); + return new BuilderWrap(null); + } var item = fast; if (item is not null) @@ -58,10 +64,11 @@ public static void Return(StringBuilder item) Interlocked.Decrement(ref itemCount); } - private class BuilderWrap(StringBuilder builder) : IDisposable + private class BuilderWrap(StringBuilder? builder) : IDisposable { public void Dispose() { + if (builder == null) return; Return(builder); } } diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs index a7c868d0..d70b2ee1 100644 --- a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.InsertOrUpdate.cs @@ -11,11 +11,11 @@ namespace LightORM.Providers.Dameng; internal partial class CustomDamengAdapter { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + 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) @@ -74,7 +74,6 @@ public override StringBuilder HandleInsertOrUpdate(UpsertContext context) .Append(") VALUES (") .AppendEntryValues(columnValueMaps.Values) .Append(')'); - return sb; } } diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs new file mode 100644 index 00000000..372bea5d --- /dev/null +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.ValueFormat.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.Dameng; + +internal partial class CustomDamengAdapter +{ + public override void HandleDateValue(StringBuilder sql, DateTime dateTime) + { + // Dameng 使用 TO_DATE 函数来处理日期值 + sql.Append("TO_DATE('"); + sql.Append(dateTime.ToString("yyyy-MM-dd HH:mm:ss")); + sql.Append("', 'YYYY-MM-DD HH24:MI:SS')"); + } + + //public override string FormatDateTimeValue(DateTime value) + //{ + // throw new NotImplementedException(); + //} +} diff --git a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.cs b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.cs index 8c6ae464..c970db55 100644 --- a/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.cs +++ b/src/Providers/LightORM.Providers.Dameng/CustomDamengAdapter.cs @@ -6,7 +6,7 @@ namespace LightORM.Providers.Dameng; -internal sealed partial class CustomDamengAdapter(ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomDamengAdapter(ISqlMethodResolver methodResolver, DamengTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { internal static readonly CustomDamengAdapter TestInstance = new CustomDamengAdapter(new DamengMethodResolver(new()), new()); public override string Prefix => ":"; @@ -20,14 +20,6 @@ public override void Paging(ISelectSqlBuilder builder, StringBuilder sql) } public override void ReturnIdentitySql(StringBuilder sql) => sql.Append("SELECT @@IDENTITY"); - public override void HandleDateValue(StringBuilder sql, DateTime dateTime) - { - // Dameng 使用 TO_DATE 函数来处理日期值 - sql.Append("TO_DATE('"); - sql.Append(dateTime.ToString("yyyy-MM-dd HH:mm:ss")); - sql.Append("', 'YYYY-MM-DD HH24:MI:SS')"); - } - string Extract => tableOptions.JSONBackend == JSONBackend.Binary ? "JSONB_VALUE" : "JSON_VALUE"; string Set => tableOptions.JSONBackend == JSONBackend.Binary ? "JSONB_SET" : "JSON_SET"; public override void HandleJsonColumn(JsonColumnContext context) diff --git a/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs b/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs index 7ed53595..9df6bbe4 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengMethodResolver.cs @@ -10,7 +10,7 @@ namespace LightORM.Providers.Dameng; -public sealed class DamengMethodResolver(TableOptions tableOptions) : BaseSqlMethodResolver +public sealed class DamengMethodResolver(DamengTableOptions tableOptions) : BaseSqlMethodResolver { public override void ToString(IExpressionResolver resolver, MethodCallExpression methodCall) { diff --git a/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs b/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs index 5aa76a70..fc89b108 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengProvider.cs @@ -10,10 +10,10 @@ namespace LightORM.Providers.Dameng; public sealed class DamengProvider : BaseDatabaseProvider { public static readonly DbBaseType Dameng = new ("Dameng"); - public static DamengProvider Create(DataBaseOption option) => new(option); - public static DamengProvider Create(Action setting) + public static DamengProvider Create(DataBaseOption option) => new(option); + public static DamengProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -22,7 +22,7 @@ public static DamengProvider Create(Action setting) return Create(dbOption); } - private DamengProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private DamengProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new DamengTableHandler(option.GenerateOption); var sqlMethodResolver = new DamengMethodResolver(option.GenerateOption); diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs index 6ace3b07..6a3bce14 100644 --- a/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableHandler.cs @@ -5,11 +5,11 @@ namespace LightORM.Providers.Dameng; -public sealed class DamengTableHandler(TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class DamengTableHandler(DamengTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override DamengTableOptions Options => tableOptions; public override string GetTablesSql() { throw new NotImplementedException(); diff --git a/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs b/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs new file mode 100644 index 00000000..49eb4bdd --- /dev/null +++ b/src/Providers/LightORM.Providers.Dameng/DamengTableOptions.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.Dameng; + +public record DamengTableOptions : TableOptions +{ + public string? TableSpace { get; set; } + public string? UserId { get; set; } +} diff --git a/src/Providers/LightORM.Providers.Dameng/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.Dameng/Extensions/IoCExtension.cs index 93fddf80..33e17d45 100644 --- a/src/Providers/LightORM.Providers.Dameng/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.Dameng/Extensions/IoCExtension.cs @@ -4,28 +4,39 @@ namespace LightORM.Providers.Dameng.Extensions; public static class IoCExtension { - public static void UseDameng(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => options.UseDameng("MainDb", masterConnectString, slaveConnectStrings); - public static void UseDameng(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - //var provider = DamengProvider.Create(masterConnectString, slaveConnectStrings); - //options.SetDatabase(key, DbBaseType.Dameng, provider); - UseDameng(options, set => + public void UseDameng(string masterConnectString, params string[] slaveConnectStrings) + => options.UseDameng("MainDb", masterConnectString, slaveConnectStrings); + public void UseDameng(string? key, string masterConnectString, params string[] slaveConnectStrings) + { + //var provider = DamengProvider.Create(masterConnectString, slaveConnectStrings); + //options.SetDatabase(key, DbBaseType.Dameng, provider); + UseDameng(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseDameng(Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = DamengProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DamengProvider.Dameng, provider); + } } - public static void UseDameng(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfiguraDameng(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = DamengProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DamengProvider.Dameng, provider); } } diff --git a/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs b/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs index facd049d..bf8dcaec 100644 --- a/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs +++ b/src/Providers/LightORM.Providers.Dameng/TableStructure/DamengTableWriter.cs @@ -7,9 +7,9 @@ namespace LightORM.Providers.Dameng.TableStructure; -public class DamengTableWriter : LightORM.Implements.WriteTableFromType +public class DamengTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(DamengTableOptions option, DbTable table) { var tableSpace = option.TableSpace != null ? $"TABLESPACE {option.TableSpace}" : ""; @@ -107,7 +107,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t #endregion } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(DamengTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); if (dataType.Contains("VARCHAR")) @@ -121,7 +121,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType} {defaultValueClause} {notNull} {identity}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(DamengTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -164,7 +164,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) }; } - protected override string DbEmphasis(TableOptions option, string name) => $"\"{name.ToUpper()}\""; + protected override string DbEmphasis(DamengTableOptions option, string name) => $"\"{name.ToUpper()}\""; private static string CheckPkLength(string name, IEnumerable pks) { @@ -194,7 +194,7 @@ 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(TableOptions option, string name) + private string AttachUserId(DamengTableOptions option, string name) { if (option.UserId != null) return $"\"{option.UserId}\".\"{name.ToUpper()}\""; diff --git a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs index b0c94965..03bc7cf3 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.InsertOrUpdate.cs @@ -11,19 +11,19 @@ namespace LightORM.Providers.KingbaseES; internal partial class CustomKingbaseESAdapter { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + var sb = context.Sql; OnConflict(); - return sb; + return; void OnConflict() { - sb = new("INSERT INTO "); + sb.Append("INSERT INTO "); //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); sb.Append('('); diff --git a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.cs b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.cs index e1289451..c2fd64dd 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/CustomKingbaseESAdapter.cs @@ -9,7 +9,7 @@ namespace LightORM.Providers.KingbaseES; #pragma warning disable CS9113 // 参数未读。 -internal sealed partial class CustomKingbaseESAdapter(ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomKingbaseESAdapter(ISqlMethodResolver methodResolver, KingbaseESTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { internal readonly static CustomKingbaseESAdapter Instance = new(new KingbaseESMethodResolver(), new()); diff --git a/src/Providers/LightORM.Providers.KingbaseES/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.KingbaseES/Extensions/IoCExtension.cs index 63270821..b2c9a9a4 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/Extensions/IoCExtension.cs @@ -5,26 +5,37 @@ namespace LightORM.Providers.KingbaseES.Extensions; public static class IoCExtension { - public static void UseKingbaseES(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => options.UseKingbaseES("MainDb", masterConnectString, slaveConnectStrings); - public static void UseKingbaseES(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - UseKingbaseES(options, set => + public void UseKingbaseES(string masterConnectString, params string[] slaveConnectStrings) + => options.UseKingbaseES("MainDb", masterConnectString, slaveConnectStrings); + public void UseKingbaseES(string? key, string masterConnectString, params string[] slaveConnectStrings) + { + UseKingbaseES(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseKingbaseES(Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = KingbaseESProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Oracle, provider); + } } - public static void UseKingbaseES(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfigureKbes(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = KingbaseESProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Oracle, provider); } } diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs index c775c2e3..7f1dd4b4 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESProvider.cs @@ -9,11 +9,11 @@ namespace LightORM.Providers.KingbaseES; public class KingbaseESProvider : BaseDatabaseProvider { public static readonly DbBaseType KingbaseEs = new("KingbaseES"); - public static KingbaseESProvider Create(DataBaseOption option) => new(option); + public static KingbaseESProvider Create(DataBaseOption option) => new(option); - public static KingbaseESProvider Create(Action setting) + public static KingbaseESProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -21,7 +21,7 @@ public static KingbaseESProvider Create(Action setting) } return Create(dbOption); } - private KingbaseESProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private KingbaseESProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new KingbaseESTableHandler(option.GenerateOption); var sqlMethodResolver = new KingbaseESMethodResolver(); diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs index 6ab250a0..31d56444 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableHandler.cs @@ -4,10 +4,10 @@ namespace LightORM.Providers.KingbaseES; -public sealed class KingbaseESTableHandler(TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class KingbaseESTableHandler(KingbaseESTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override KingbaseESTableOptions Options => tableOptions; public override string GetTablesSql() { diff --git a/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs new file mode 100644 index 00000000..84e1e80b --- /dev/null +++ b/src/Providers/LightORM.Providers.KingbaseES/KingbaseESTableOptions.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.KingbaseES; + +public record KingbaseESTableOptions : TableOptions +{ + public string? TableSpace { get; set; } +} diff --git a/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs b/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs index 4ecc8fce..857ab2a9 100644 --- a/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs +++ b/src/Providers/LightORM.Providers.KingbaseES/TableStructure/KingbaseESTableWriter.cs @@ -4,9 +4,9 @@ namespace LightORM.Providers.KingbaseES.TableStructure; -public class KingbaseESTableWriter : LightORM.Implements.WriteTableFromType +public class KingbaseESTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(KingbaseESTableOptions option, DbTable table) { StringBuilder sql = new StringBuilder(); @@ -94,7 +94,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t yield return sql.ToString(); } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(KingbaseESTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); @@ -111,7 +111,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType}{identity}{defaultValue}{notNull}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(KingbaseESTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -124,7 +124,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) return type.DataType.TransformType(); } - protected override string DbEmphasis(TableOptions option, string name) => $"\"{name}\""; + protected override string DbEmphasis(KingbaseESTableOptions option, string name) => $"\"{name}\""; private static string FormatDefaultValue(object value, string dataType) { diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs index 2b36ff9c..dab80af2 100644 --- a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.InertOrUpdate.cs @@ -11,14 +11,14 @@ namespace LightORM.Providers.MySql; internal partial class CustomMySqlAdapter { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + var sb = context.Sql; if (context.IgnoreWhenMap) { - sb = new("INSERT IGNORE INTO "); + sb.Append("INSERT IGNORE INTO "); sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); sb.Append('('); sb.AppendEntryColumns(columnValueMaps.Values); @@ -30,7 +30,7 @@ public override StringBuilder HandleInsertOrUpdate(UpsertContext context) } else { - sb = new("INSERT INTO "); + sb.Append("INSERT INTO "); //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); sb.Append('('); @@ -69,7 +69,5 @@ public override StringBuilder HandleInsertOrUpdate(UpsertContext context) sb.RemoveLast(SqlBuilder.N.Length + 1); } - - return sb; } } diff --git a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.cs b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.cs index 738de888..7644ad93 100644 --- a/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.cs +++ b/src/Providers/LightORM.Providers.MySql/CustomMySqlAdapter.cs @@ -7,7 +7,7 @@ namespace LightORM.Providers.MySql; #pragma warning disable CS9113 // 参数未读。 -internal sealed partial class CustomMySqlAdapter(ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomMySqlAdapter(ISqlMethodResolver methodResolver, MySqlTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { internal static readonly CustomMySqlAdapter Instance = new(new MySqlMethodResolver(), new()); public override string Prefix => "?"; diff --git a/src/Providers/LightORM.Providers.MySql/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.MySql/Extensions/IoCExtension.cs index a9a931fd..32b2ea52 100644 --- a/src/Providers/LightORM.Providers.MySql/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.MySql/Extensions/IoCExtension.cs @@ -4,28 +4,39 @@ namespace LightORM.Providers.MySql.Extensions; public static class IoCExtension { - public static void UseMySql(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => options.UseMySql("MainDb", masterConnectString, slaveConnectStrings); - public static void UseMySql(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - //var provider = MySqlProvider.Create(masterConnectString, slaveConnectStrings); - //options.SetDatabase(key, DbBaseType.MySql, provider); - UseMySql(options, set => + public void UseMySql(string masterConnectString, params string[] slaveConnectStrings) + => options.UseMySql("MainDb", masterConnectString, slaveConnectStrings); + public void UseMySql(string? key, string masterConnectString, params string[] slaveConnectStrings) + { + //var provider = MySqlProvider.Create(masterConnectString, slaveConnectStrings); + //options.SetDatabase(key, DbBaseType.MySql, provider); + UseMySql(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseMySql(Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = MySqlProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.MySql, provider); + } } - public static void UseMySql(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfiguraMySql(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = MySqlProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.MySql, provider); } } diff --git a/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs b/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs index bb9a1be2..a0b99f30 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlProvider.cs @@ -10,11 +10,11 @@ namespace LightORM.Providers.MySql; public sealed class MySqlProvider : BaseDatabaseProvider { - public static MySqlProvider Create(DataBaseOption option) => new (option); + public static MySqlProvider Create(DataBaseOption option) => new (option); - public static MySqlProvider Create(Action setting) + public static MySqlProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -23,7 +23,7 @@ public static MySqlProvider Create(Action setting) return Create(dbOption); } - private MySqlProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private MySqlProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { var master = option.MasterConnectionString!; var match = Regex.Match(master, @"(?<=Database\=)([A-Z|a-z|_]+)", RegexOptions.IgnoreCase); diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs index 0f449068..92032bab 100644 --- a/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableHandler.cs @@ -9,10 +9,10 @@ namespace LightORM.Providers.MySql; -public sealed class MySqlTableHandler(string database, TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class MySqlTableHandler(string database, MySqlTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override MySqlTableOptions Options => tableOptions; public override string GetTablesSql() { return $""" diff --git a/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs b/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs new file mode 100644 index 00000000..c91a03ea --- /dev/null +++ b/src/Providers/LightORM.Providers.MySql/MySqlTableOptions.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.MySql; + +public record MySqlTableOptions : TableOptions +{ + public string? Engine { get; set; } = "InnoDB"; + public string? Charset { get; set; } = "utf8mb4"; + public string? Collation { get; set; } = "utf8mb4_unicode_ci"; +} diff --git a/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs b/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs index ef712313..023bfd91 100644 --- a/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs +++ b/src/Providers/LightORM.Providers.MySql/TableStructure/MySqlTableWriter.cs @@ -7,9 +7,9 @@ namespace LightORM.Providers.MySql.TableStructure; -public class MySqlTableWriter : LightORM.Implements.WriteTableFromType +public class MySqlTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(MySqlTableOptions option, DbTable table) { StringBuilder sql = new StringBuilder(); var primaryKeys = table.Columns.Where(col => col.PrimaryKey); @@ -25,7 +25,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t sql.AppendLine(@$" CREATE TABLE{existsClause} {DbEmphasis(option, table.Name)}( {string.Join($",{Environment.NewLine} ", table.Columns.Select(col => BuildColumn(option, col)))}{primaryKeyConstraint} -)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci +)ENGINE={option.Engine} DEFAULT CHARSET={option.Charset} COLLATE={option.Collation} "); int i = 1; foreach (DbIndex index in table.Indexs) @@ -44,7 +44,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t yield return sql.ToString(); } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(MySqlTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); if (dataType.Contains("VARCHAR") || dataType == "BINARY") @@ -59,7 +59,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType} {notNull} {identity} {commentClause} {defaultValueClause}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(MySqlTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -94,7 +94,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) }; } - protected override string DbEmphasis(TableOptions option, string name) => $"`{name}`"; + protected override string DbEmphasis(MySqlTableOptions option, string name) => $"`{name}`"; private static object CheckDefaultValue(DbColumn column) { diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs index a78a03ef..2052aa9e 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.BatchInsert.cs @@ -1,10 +1,8 @@ -using LightORM.Extension; +using LightORM.Builder; +using LightORM.Extension; using LightORM.Models; -using System; -using System.Collections.Generic; -using System.Linq; +using LightORM.Utils; using System.Text; -using System.Threading.Tasks; namespace LightORM.Providers.Oracle; @@ -14,11 +12,13 @@ public override void HandleBatchInsert(BatchActionContext context) { var batchs = context.Batchs; var builder = context.Builder; - var insertColumns = context.InsertColumns; + var insertColumns = context.TargetColumns; + var database = context.ScopedAdapter; foreach (var item in batchs) { - StringBuilder sb = new("INSERT ALL"); - sb.AppendLine(); + //StringBuilder sb = new("INSERT ALL"); + using var _ = StringBuilderPool.Get(out var sb); + sb.AppendLine("INSERT ALL"); for (int i = 0; i < item.Parameters.Count; i++) { AttachInserts(sb); @@ -41,7 +41,7 @@ public override void HandleBatchInsert(BatchActionContext context) void AttachInserts(StringBuilder sb) { sb.Append(" INTO "); - sb.AppendTableName(this, builder.MainTable, false); + sb.AppendTableName(database, builder.MainTable, false); sb.Append(" ("); foreach (var item in insertColumns) { diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs index 93e6a352..04e1aabf 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.InsertOrUpdate.cs @@ -11,11 +11,11 @@ namespace LightORM.Providers.Oracle; internal partial class CustomOracleAdapter { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + 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) @@ -74,7 +74,6 @@ public override StringBuilder HandleInsertOrUpdate(UpsertContext context) .Append(") VALUES (") .AppendEntryValues(columnValueMaps.Values) .Append(')'); - return sb; } } diff --git a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs index 744169ba..fb55d2d7 100644 --- a/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs +++ b/src/Providers/LightORM.Providers.Oracle/CustomOracleAdapter.cs @@ -11,7 +11,7 @@ namespace LightORM.Providers.Oracle; #pragma warning disable CS9113 // 参数未读。 -internal sealed partial class CustomOracleAdapter(ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomOracleAdapter(ISqlMethodResolver methodResolver, OracleTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { internal readonly static CustomOracleAdapter Instance = new(new OracleMethodResolver(), new()); public override string Prefix => ":"; diff --git a/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs index 390836a6..77384eca 100644 --- a/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.Oracle/Extensions/IoCExtension.cs @@ -1,33 +1,44 @@ using LightORM.Interfaces; using LightORM.Models; using Oracle.ManagedDataAccess.Client; - +using LightORM.Providers.Oracle; namespace LightORM.Providers.Oracle.Extensions; public static class IoCExtension { - public static void UseOracle(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => options.UseOracle("MainDb", masterConnectString, slaveConnectStrings); - public static void UseOracle(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - //var provider = OracleProvider.Create(masterConnectString, slaveConnectStrings); - //options.SetDatabase(key, DbBaseType.Oracle, provider); - UseOracle(options, set => + public void UseOracle(string masterConnectString, params string[] slaveConnectStrings) + => options.UseOracle("MainDb", masterConnectString, slaveConnectStrings); + public void UseOracle(string? key, string masterConnectString, params string[] slaveConnectStrings) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + //var provider = OracleProvider.Create(masterConnectString, slaveConnectStrings); + //options.SetDatabase(key, DbBaseType.Oracle, provider); + UseOracle(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseOracle(Action setting) + { + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = OracleProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Oracle, provider); + } } - public static void UseOracle(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfigureOracle(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = OracleProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Oracle, provider); } } diff --git a/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs b/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs index 30067c10..fc028f09 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleProvider.cs @@ -9,10 +9,10 @@ namespace LightORM.Providers.Oracle; public sealed class OracleProvider : BaseDatabaseProvider { - public static OracleProvider Create(DataBaseOption option) => new(option); - public static OracleProvider Create(Action setting) + public static OracleProvider Create(DataBaseOption option) => new(option); + public static OracleProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -20,7 +20,7 @@ public static OracleProvider Create(Action setting) } return Create(dbOption); } - private OracleProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private OracleProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new OracleTableHandler(option.GenerateOption); var sqlMethodResolver = new OracleMethodResolver(); diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs index 6987a08a..63026ed7 100644 --- a/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableHandler.cs @@ -9,10 +9,10 @@ namespace LightORM.Providers.Oracle; -public sealed class OracleTableHandler(TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class OracleTableHandler(OracleTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override OracleTableOptions Options => tableOptions; public override string GetTablesSql() { return "select table_name TableName from user_tab_columns group by table_name order by table_name"; diff --git a/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs b/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs new file mode 100644 index 00000000..c7067cb2 --- /dev/null +++ b/src/Providers/LightORM.Providers.Oracle/OracleTableOptions.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.Oracle; + +public record OracleTableOptions : TableOptions +{ + + /// + /// 当前仅Oracle对此属性有支持,高级版本的Oracle,适用自增列语法 GENERATED ALWAYS AS IDENTITY + /// + public bool OverVersion { get; set; } + public string? TableSpace { get; set; } + public string? UserId { get; set; } +} diff --git a/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs b/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs index d7896e64..ffa113cf 100644 --- a/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs +++ b/src/Providers/LightORM.Providers.Oracle/TableStructure/OracleTableWriter.cs @@ -7,9 +7,9 @@ namespace LightORM.Providers.Oracle.TableStructure; -public class OracleTableWriter : LightORM.Implements.WriteTableFromType +public class OracleTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(OracleTableOptions option, DbTable table) { var tableSpace = option.TableSpace != null ? $"TABLESPACE {option.TableSpace}" : ""; @@ -133,7 +133,7 @@ FOR EACH ROW } } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(OracleTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); if (dataType.Contains("VARCHAR")) @@ -147,7 +147,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType} {defaultValueClause} {notNull} {identity}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(OracleTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -190,7 +190,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) }; } - protected override string DbEmphasis(TableOptions option, string name) => $"\"{name.ToUpper()}\""; + protected override string DbEmphasis(OracleTableOptions option, string name) => $"\"{name.ToUpper()}\""; private static string CheckPkLength(string name, IEnumerable pks) { @@ -220,7 +220,7 @@ 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(TableOptions option, string name) + private string AttachUserId(OracleTableOptions option, string name) { if (option.UserId != null) return $"\"{option.UserId}\".\"{name.ToUpper()}\""; diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs index a88b2a22..b9e2572f 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.InsertOrUpdate.cs @@ -11,19 +11,19 @@ namespace LightORM.Providers.PostgreSQL; internal partial class CustomPostgreSQL { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + var sb = context.Sql; OnConflict(); - return sb; + return ; void OnConflict() { - sb = new("INSERT INTO "); + sb.Append("INSERT INTO "); //sb.AppendLine($" {GetTableName(database, MainTable, false)} "); sb.AppendTableName(database, context.Builder.MainTable, false).AppendLine(); sb.Append('('); diff --git a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.cs b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.cs index e26f3ff0..9bfd1a89 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/CustomPostgreSQL.cs @@ -9,7 +9,7 @@ namespace LightORM.Providers.PostgreSQL; #pragma warning disable CS9113 // 参数未读。 -internal sealed partial class CustomPostgreSQL(ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomPostgreSQL(ISqlMethodResolver methodResolver, PostgreSQLTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { internal readonly static CustomPostgreSQL Instance = new(new PostgreSQLMethodResolver(), new()); diff --git a/src/Providers/LightORM.Providers.PostgreSQL/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.PostgreSQL/Extensions/IoCExtension.cs index 6eff1681..3d1e27e3 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/Extensions/IoCExtension.cs @@ -5,28 +5,39 @@ namespace LightORM.Providers.PostgreSQL.Extensions; public static class IoCExtension { - public static void UsePostgreSQL(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => options.UsePostgreSQL("MainDb", masterConnectString, slaveConnectStrings); - public static void UsePostgreSQL(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - //var provider = PostgreSQLProvider.Create(masterConnectString, slaveConnectStrings); - //options.SetDatabase(key, DbBaseType.PostgreSQL, provider); - UsePostgreSQL(options, set => + public void UsePostgreSQL(string masterConnectString, params string[] slaveConnectStrings) + => options.UsePostgreSQL("MainDb", masterConnectString, slaveConnectStrings); + public void UsePostgreSQL(string? key, string masterConnectString, params string[] slaveConnectStrings) + { + //var provider = PostgreSQLProvider.Create(masterConnectString, slaveConnectStrings); + //options.SetDatabase(key, DbBaseType.PostgreSQL, provider); + UsePostgreSQL(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UsePostgreSQL(Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = PostgreSQLProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.PostgreSQL, provider); + } } - public static void UsePostgreSQL(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfigureOracle(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = PostgreSQLProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.PostgreSQL, provider); } } diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs index 2abc8259..e265755a 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableHandler.cs @@ -9,10 +9,10 @@ namespace LightORM.Providers.PostgreSQL; -public sealed class PostgreSQLTableHandler(TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class PostgreSQLTableHandler(PostgreSQLTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override PostgreSQLTableOptions Options => tableOptions; public override string GetTablesSql() { diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs new file mode 100644 index 00000000..7d70d283 --- /dev/null +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgreSQLTableOptions.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.PostgreSQL; + +public record PostgreSQLTableOptions: TableOptions +{ + public string? TableSpace { get; set; } +} diff --git a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs index aa96eb50..aa68795c 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/PostgresSQLProvider.cs @@ -13,11 +13,11 @@ namespace LightORM.Providers.PostgreSQL; public sealed class PostgreSQLProvider : BaseDatabaseProvider { - public static PostgreSQLProvider Create(DataBaseOption option) => new(option); + public static PostgreSQLProvider Create(DataBaseOption option) => new(option); - public static PostgreSQLProvider Create(Action setting) + public static PostgreSQLProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -28,7 +28,7 @@ public static PostgreSQLProvider Create(Action setting) public override DbBaseType DbBaseType => DbBaseType.PostgreSQL; - private PostgreSQLProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private PostgreSQLProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new PostgreSQLTableHandler(option.GenerateOption); var sqlMethodResolver = new PostgreSQLMethodResolver(); diff --git a/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs b/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs index 8173971a..d9e92582 100644 --- a/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs +++ b/src/Providers/LightORM.Providers.PostgreSQL/TableStructure/PostgreSQLTableWriter.cs @@ -8,9 +8,9 @@ namespace LightORM.Providers.PostgreSQL.TableStructure; -public class PostgreSQLTableWriter : LightORM.Implements.WriteTableFromType +public class PostgreSQLTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(PostgreSQLTableOptions option, DbTable table) { StringBuilder sql = new StringBuilder(); @@ -98,7 +98,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t yield return sql.ToString(); } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(PostgreSQLTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); @@ -115,7 +115,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType}{identity}{defaultValue}{notNull}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(PostgreSQLTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -128,7 +128,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) return type.DataType.TransformType(); } - protected override string DbEmphasis(TableOptions option, string name) => $"\"{name}\""; + protected override string DbEmphasis(PostgreSQLTableOptions option, string name) => $"\"{name}\""; private static string FormatDefaultValue(object value, string dataType) { diff --git a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs index 848ebd55..eef00247 100644 --- a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs +++ b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.InsertOrUpdate.cs @@ -7,11 +7,11 @@ namespace LightORM.Providers.SqlServer; internal partial class CustomSqlServerAdapter { - public override StringBuilder HandleInsertOrUpdate(UpsertContext context) + public override void HandleInsertOrUpdate(UpsertContext context) { var database = context.ScopedAdapter; var columnValueMaps = context.ColumnValueMap; - var sb = new StringBuilder(); + 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) @@ -78,6 +78,5 @@ public override StringBuilder HandleInsertOrUpdate(UpsertContext context) .Append(") VALUES (") .AppendEntryValues(columnValueMaps.Values) .Append(");"); - return sb; } } diff --git a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.cs b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.cs index 6c5fcd82..879f58e4 100644 --- a/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.cs +++ b/src/Providers/LightORM.Providers.SqlServer/CustomSqlServerAdapter.cs @@ -7,7 +7,7 @@ namespace LightORM.Providers.SqlServer; #pragma warning disable CS9113 // 参数未读。 -internal sealed partial class CustomSqlServerAdapter(SqlServerVersion version, ISqlMethodResolver methodResolver, TableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) +internal sealed partial class CustomSqlServerAdapter(SqlServerVersion version, ISqlMethodResolver methodResolver, SqlServerTableOptions tableOptions) : CustomDatabaseAdapter(methodResolver) { public SqlServerVersion Version { get; } = version; public override string Prefix => "@"; diff --git a/src/Providers/LightORM.Providers.SqlServer/Extensions/IoCExtension.cs b/src/Providers/LightORM.Providers.SqlServer/Extensions/IoCExtension.cs index b3506c6f..8fe90d2b 100644 --- a/src/Providers/LightORM.Providers.SqlServer/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.SqlServer/Extensions/IoCExtension.cs @@ -5,28 +5,39 @@ namespace LightORM.Providers.SqlServer.Extensions; public static class IoCExtension { - public static void UseSqlServer(this IExpressionContextSetup options, SqlServerVersion version, string masterConnectString, params string[] slaveConnectStrings) - => options.UseSqlServer("MainDb", version, masterConnectString, slaveConnectStrings); - public static void UseSqlServer(this IExpressionContextSetup options, string? key, SqlServerVersion version, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - //var provider = SqlServerProvider.Create((version), masterConnectString, slaveConnectStrings); - //options.SetDatabase(key, DbBaseType.SqlServer, provider); - UseSqlServer(options, version, set => + public void UseSqlServer(SqlServerVersion version, string masterConnectString, params string[] slaveConnectStrings) + => options.UseSqlServer("MainDb", version, masterConnectString, slaveConnectStrings); + public void UseSqlServer(string? key, SqlServerVersion version, string masterConnectString, params string[] slaveConnectStrings) + { + //var provider = SqlServerProvider.Create((version), masterConnectString, slaveConnectStrings); + //options.SetDatabase(key, DbBaseType.SqlServer, provider); + UseSqlServer(options, version, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseSqlServer(SqlServerVersion version, Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = SqlServerProvider.Create(version, dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.SqlServer, provider); + } } - public static void UseSqlServer(this IExpressionContextSetup options, SqlServerVersion version, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfiguraSqlServer(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = SqlServerProvider.Create(version, dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.SqlServer, provider); } } diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs index 139b515b..6f281373 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerProvider.cs @@ -19,12 +19,12 @@ public enum SqlServerVersion public sealed class SqlServerProvider : BaseDatabaseProvider { - public static SqlServerProvider Create(SqlServerVersion version, DataBaseOption option) + public static SqlServerProvider Create(SqlServerVersion version, DataBaseOption option) => new(version, option); - public static SqlServerProvider Create(SqlServerVersion version, Action setting) + public static SqlServerProvider Create(SqlServerVersion version, Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -34,7 +34,7 @@ public static SqlServerProvider Create(SqlServerVersion version, Action option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new SqlServerTableHandler(option.GenerateOption); var sqlMethodResolver = new SqlServerMethodResolver(version); diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs index e63a254e..e2114483 100644 --- a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableHandler.cs @@ -10,10 +10,10 @@ namespace LightORM.Providers.SqlServer; -public sealed class SqlServerTableHandler(TableOptions tableOptions) - : BaseDatabaseHandler +public sealed class SqlServerTableHandler(SqlServerTableOptions tableOptions) + : BaseDatabaseHandler { - public override TableOptions Options => tableOptions; + public override SqlServerTableOptions Options => tableOptions; public override string GetTablesSql() { return "SELECT NAME TableName FROM SYSOBJECTS WHERE XTYPE = 'U' ORDER BY NAME"; diff --git a/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs new file mode 100644 index 00000000..d6ba9912 --- /dev/null +++ b/src/Providers/LightORM.Providers.SqlServer/SqlServerTableOptions.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.SqlServer; + +public record SqlServerTableOptions : TableOptions +{ +} diff --git a/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs b/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs index 6e42a7ea..715e5b0b 100644 --- a/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs +++ b/src/Providers/LightORM.Providers.SqlServer/TableStructure/SqlServerTableWriter.cs @@ -7,9 +7,9 @@ namespace LightORM.Providers.SqlServer.TableStructure; -public class SqlServerTableWriter : LightORM.Implements.WriteTableFromType +public class SqlServerTableWriter : LightORM.Implements.WriteTableFromType { - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(SqlServerTableOptions option, DbTable table) { StringBuilder sql = new StringBuilder(); @@ -86,7 +86,7 @@ SET QUOTED_IDENTIFIER ON yield return sql.ToString(); } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(SqlServerTableOptions option, DbColumn column) { var dbType = ConvertToDbType(option, column); var length = (dbType.Contains("Char") || dbType.Contains("Binary")) && !column.IsJson ? $"({column.Length ?? option.DefaultStringLength})" : ""; @@ -97,7 +97,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{dataType}{identity}{notNull}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(SqlServerTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -132,7 +132,7 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) }; } - protected override string DbEmphasis(TableOptions option, string name) => $"[{name}]"; + protected override string DbEmphasis(SqlServerTableOptions option, string name) => $"[{name}]"; private static object CheckDefaultValue(DbColumn column) { diff --git a/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs b/src/Providers/LightORM.Providers.Sqlite/CustomSqliteAdapter.cs index 3bba6067..02df99f7 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, TableOptions options) : CustomDatabaseAdapter(methodResolver) +internal sealed 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 251c73ee..73e784cc 100644 --- a/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs +++ b/src/Providers/LightORM.Providers.Sqlite/Extensions/IoCExtension.cs @@ -6,26 +6,37 @@ namespace LightORM.Providers.Sqlite.Extensions; public static class IoCExtension { - public static void UseSqlite(this IExpressionContextSetup options, string masterConnectString, params string[] slaveConnectStrings) - => UseSqlite(options, "MainDb", masterConnectString, slaveConnectStrings); - public static void UseSqlite(this IExpressionContextSetup options, string? key, string masterConnectString, params string[] slaveConnectStrings) + extension(IExpressionContextSetup options) { - UseSqlite(options, set => + public void UseSqlite(string masterConnectString, params string[] slaveConnectStrings) + => UseSqlite(options, "MainDb", masterConnectString, slaveConnectStrings); + public void UseSqlite(string? key, string masterConnectString, params string[] slaveConnectStrings) + { + UseSqlite(options, set => + { + set.DbKey = key; + set.MasterConnectionString = masterConnectString; + set.SalveConnectionStrings = slaveConnectStrings; + }); + } + public void UseSqlite(Action setting) { - set.DbKey = key; - set.MasterConnectionString = masterConnectString; - set.SalveConnectionStrings = slaveConnectStrings; - }); + var dbOption = new DataBaseOption(); + setting.Invoke(dbOption); + if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + { + throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + } + var provider = SqliteProvider.Create(dbOption); + options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Sqlite, provider); + } } - public static void UseSqlite(this IExpressionContextSetup options, Action setting) + + extension(IDbOption option) { - var dbOption = new DataBaseOption(); - setting.Invoke(dbOption); - if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) + public void ConfiguraSqlite(Action config) { - throw new ArgumentNullException(nameof(dbOption.MasterConnectionString), "连接字符串不能为空"); + config.Invoke(option.GetOption()); } - var provider = SqliteProvider.Create(dbOption); - options.SetDatabase(dbOption.DbKey ?? "MainDb", DbBaseType.Sqlite, provider); } } diff --git a/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj b/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj index 8196c316..0fec596a 100644 --- a/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj +++ b/src/Providers/LightORM.Providers.Sqlite/LightORM.Providers.Sqlite.csproj @@ -30,5 +30,9 @@ + + + + diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteMethodResolver.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteMethodResolver.cs index 46b12a3a..f57b5fe8 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteMethodResolver.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteMethodResolver.cs @@ -5,7 +5,7 @@ namespace LightORM.Providers.Sqlite; -public sealed class SqliteMethodResolver(TableOptions tableOptions) : BaseSqlMethodResolver +public sealed class SqliteMethodResolver(SqliteTableOptions tableOptions) : BaseSqlMethodResolver { public override void ToString(IExpressionResolver resolver, MethodCallExpression methodCall) { diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs index 31adada0..1ae9a4f0 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteProvider.cs @@ -9,11 +9,11 @@ namespace LightORM.Providers.Sqlite; public sealed class SqliteProvider : BaseDatabaseProvider { - public static SqliteProvider Create(DataBaseOption option) => new(option); + public static SqliteProvider Create(DataBaseOption option) => new(option); - public static SqliteProvider Create(Action setting) + public static SqliteProvider Create(Action> setting) { - var dbOption = new DataBaseOption(); + var dbOption = new DataBaseOption(); setting.Invoke(dbOption); if (string.IsNullOrEmpty(dbOption.MasterConnectionString)) { @@ -22,7 +22,7 @@ public static SqliteProvider Create(Action setting) return Create(dbOption); } - private SqliteProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) + private SqliteProvider(DataBaseOption option) : base(option.MasterConnectionString!, option.SalveConnectionStrings) { DbHandler = new SqliteTableHandler(option.GenerateOption); var sqlMethodResolver = new SqliteMethodResolver(option.GenerateOption); diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs index 3ddf4bb0..1717cb0f 100644 --- a/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableHandler.cs @@ -5,10 +5,10 @@ namespace LightORM.Providers.Sqlite; -public sealed class SqliteTableHandler(TableOptions generateOption) - : BaseDatabaseHandler +public sealed class SqliteTableHandler(SqliteTableOptions generateOption) + : BaseDatabaseHandler { - public override TableOptions Options => generateOption; + public override SqliteTableOptions Options => generateOption; public override string GetTablesSql() { diff --git a/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs b/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs new file mode 100644 index 00000000..9aed4b17 --- /dev/null +++ b/src/Providers/LightORM.Providers.Sqlite/SqliteTableOptions.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LightORM.Providers.Sqlite; + +public record SqliteTableOptions : TableOptions +{ +} diff --git a/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs b/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs index 339be951..9e0e4895 100644 --- a/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs +++ b/src/Providers/LightORM.Providers.Sqlite/TableStructure/SqliteTableWriter.cs @@ -7,11 +7,11 @@ namespace LightORM.Providers.Sqlite.TableStructure; -public class SqliteTableWriter : LightORM.Implements.WriteTableFromType +public class SqliteTableWriter : LightORM.Implements.WriteTableFromType { private readonly ThreadLocal useAutoIncrement = new ThreadLocal(() => false); - public override IEnumerable BuildTableSql(TableOptions option, DbTable table) + public override IEnumerable BuildTableSql(SqliteTableOptions option, DbTable table) { StringBuilder sql = new StringBuilder(); DbColumn[] primaryKeys = [.. table.Columns.Where(col => col.PrimaryKey)]; @@ -49,7 +49,7 @@ public override IEnumerable BuildTableSql(TableOptions option, DbTable t yield return sql.ToString(); } - protected override string BuildColumn(TableOptions option, DbColumn column) + protected override string BuildColumn(SqliteTableOptions option, DbColumn column) { string dataType = ConvertToDbType(option, column); string identity = column.AutoIncrement ? $"AUTOINCREMENT" : ""; @@ -69,7 +69,7 @@ protected override string BuildColumn(TableOptions option, DbColumn column) return $"{DbEmphasis(option, column.Name)} {dataType} {notNull} {identity} {defaultValueClause}"; } - protected override string ConvertToDbType(TableOptions option, DbColumn type) + protected override string ConvertToDbType(SqliteTableOptions option, DbColumn type) { if (type.IsJson && option.JSONBackend != Models.JSONBackend.NotSupport) { @@ -114,5 +114,5 @@ protected override string ConvertToDbType(TableOptions option, DbColumn type) } } - protected override string DbEmphasis(TableOptions option, string name) => $"`{name}`"; + protected override string DbEmphasis(SqliteTableOptions option, string name) => $"`{name}`"; } \ No newline at end of file diff --git a/src/versions.props b/src/versions.props index 7de50dd3..cf4dd3fb 100644 --- a/src/versions.props +++ b/src/versions.props @@ -1,46 +1,46 @@  - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.15.1 + 2026.08.21.1 - 2026.08.15.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 - 2026.08.19.1 + 2026.08.21.1 \ No newline at end of file diff --git a/test/BenchmarkTest/StringBuilderPoolTest.cs b/test/BenchmarkTest/StringBuilderPoolTest.cs index a3e27716..896db361 100644 --- a/test/BenchmarkTest/StringBuilderPoolTest.cs +++ b/test/BenchmarkTest/StringBuilderPoolTest.cs @@ -8,9 +8,12 @@ namespace BenchmarkTest; + [MemoryDiagnoser] public class StringBuilderPoolTest { + [Params(false, true)] + public bool UsePool { get; set; } class Jobs { public string? Plate { get; set; } @@ -19,6 +22,7 @@ class Jobs [GlobalSetup] public void Setup() { + global::LightORM.AssemblyControl.BenchmarkConfig.UseStringBuilderPool = UsePool; ExpSqlFactory.Configuration(config => { config.UseSqlite("Data Source=:memory:;Version=3;New=True;"); @@ -32,7 +36,7 @@ public string SimpleSelectNoPool() var select = db.Select(); var builder = select.SqlBuilder; var database = select.Executor.Database.DatabaseAdapter; - return builder.ToSqlStringOld(database); + return builder.ToSqlString(database); } [Benchmark] @@ -114,7 +118,7 @@ public string CTENoPool() }); var builder = select.SqlBuilder; var database = select.Executor.Database.DatabaseAdapter; - return builder.ToSqlStringOld(database); + return builder.ToSqlString(database); } [Benchmark] diff --git a/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs b/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs index c20872ab..b60989f1 100644 --- a/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs +++ b/test/LightORMTest.Oracle/SqlGenerate/InsertOrUpdateTest.cs @@ -11,7 +11,14 @@ public class InsertOrUpdateTest : LightORMTest.SqlGenerate.InsertOrUpdateTest protected override void Configura(IExpressionContextSetup option) { - option.UseOracle(ConnectString.Value); + option.UseOracle(c => + { + c.MasterConnectionString = ConnectString.Value; + c.ConfigureOracle(t => + { + t.OverVersion = true; + }); + }); option.UseInterceptor(); } }