Review feedback tweaks.

Author: chullybun

src/CoreEx.Database.Postgres/PostgresDatabase.cs

@@ -18,34 +18,17 @@
 ///  <para>This class also implements the <see cref="IUnitOfWork"/> including a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>. The <see cref="IUnitOfWork"/> 
 ///  functionality is enabled by the <see cref="PostgresUnitOfWorkInvoker"/>; note, this is not thread-safe.</para>
 /// </remarks>
-public partial class PostgresDatabase : Database<NpgsqlConnection, PostgresCommand, PostgresDatabaseArgs>
+/// <param name="dataSource">The <see cref="NpgsqlDataSource"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public partial class PostgresDatabase(NpgsqlDataSource dataSource, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<PostgresDatabase>? logger = null) : Database<NpgsqlConnection, PostgresCommand, PostgresDatabaseArgs, PostgresDatabaseColumns>(dataSource.CreateConnection(), PostgresInvoker.Default, PostgresDatabaseColumns.Default, jsonSerializerOptions, logger)
 {
     /// <summary>
     /// Gets the default <see cref="DuplicateErrorNumbers"/>.
     /// </summary>
     /// <remarks>See <see href="https://www.postgresql.org/docs/current/errcodes-appendix.html"/>.</remarks>
     public static string[] DefaultDuplicateErrorNumbers { get; } = ["23505"];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PostgresDatabase"/> class.
-    /// </summary>
-    /// <param name="dataSource">The <see cref="NpgsqlDataSource"/>.</param>
-    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    public PostgresDatabase(NpgsqlDataSource dataSource, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<PostgresDatabase>? logger = null)
-        : base(dataSource.CreateConnection(), PostgresInvoker.Default, jsonSerializerOptions, logger)
-        => NamedColumns = PostgresDatabaseColumns.Default with { }; 
-
-    /// <summary>
-    /// Gets or sets the names of the convention-based <see cref="PostgresDatabaseColumns"/>.
-    /// </summary>
-    /// <remarks>Defaults from <see cref="PostgresDatabaseColumns.Default"/>.</remarks>
-    public new PostgresDatabaseColumns NamedColumns
-    {
-        get => (PostgresDatabaseColumns)base.NamedColumns;
-        set => base.NamedColumns = value;
-    }
-
     /// <inheritdoc/>
     public override ISourceConverter<string?> RowVersionConverter => EncodedStringToUInt32Converter.Default;
 

src/CoreEx.Database.SqlServer/SqlServerDatabase.cs

@@ -18,7 +18,10 @@
 ///  <para>This class also implements the <see cref="IUnitOfWork"/> including a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>. The <see cref="IUnitOfWork"/> 
 ///  functionality is enabled by the <see cref="SqlServerUnitOfWorkInvoker"/>; note, this is not thread-safe.</para>
 /// </remarks>
-public partial class SqlServerDatabase : Database<SqlConnection, SqlServerCommand, SqlServerDatabaseArgs>
+/// <param name="connection">The <see cref="SqlConnection"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public partial class SqlServerDatabase(SqlConnection connection, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<SqlServerDatabase>? logger = null) : Database<SqlConnection, SqlServerCommand, SqlServerDatabaseArgs, SqlServerDatabaseColumns>(connection, SqlServerInvoker.Default, SqlServerDatabaseColumns.Default, jsonSerializerOptions, logger)
 {
     /// <summary>
     /// Gets the default <see cref="DuplicateErrorNumbers"/>.
@@ -27,26 +30,6 @@ public partial class SqlServerDatabase : Database<SqlConnection, SqlServerComman
     /// and <see href="https://docs.microsoft.com/en-us/azure/sql-database/sql-database-develop-error-messages"/>.</remarks>
     public static int[] DefaultDuplicateErrorNumbers { get; } = [2601, 2627];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SqlServerDatabase"/> class.
-    /// </summary>
-    /// <param name="connection">The <see cref="SqlConnection"/>.</param>
-    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    public SqlServerDatabase(SqlConnection connection, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<SqlServerDatabase>? logger = null)
-        : base(connection, SqlServerInvoker.Default, jsonSerializerOptions, logger)
-        => NamedColumns = SqlServerDatabaseColumns.Default with { };
-
-    /// <summary>
-    /// Gets or sets the names of the convention-based <see cref="SqlServerDatabaseColumns"/>.
-    /// </summary>
-    /// <remarks>Defaults from <see cref="SqlServerDatabaseColumns.Default"/>.</remarks>
-    public new SqlServerDatabaseColumns NamedColumns
-    {
-        get => (SqlServerDatabaseColumns)base.NamedColumns;
-        set => base.NamedColumns = value;
-    }
-
     /// <inheritdoc/>
     public override ISourceConverter<string?> RowVersionConverter => StringBase64Converter.Default;
 

src/CoreEx.Database/Abstractions/DatabaseArgsBase.cs

@@ -17,6 +17,6 @@ public abstract record class DatabaseArgsBase : IDataArgs
     /// Indicates whether to transform the underlying <see cref="DbException"/> into an <see cref="IExtendedException"/> equivalent.
     /// </summary>
     /// <remarks>Defaults to <see langword="true"/>.
-    /// <para>The <see cref="Database{TConnection, TCommand, TDatabaseArgs}.OnDbException(DbException)"/> will be skipped where set to <see langword="false"/>.</para></remarks>
+    /// <para>The <see cref="Database{TConnection, TCommand, TDatabaseArgs, TDatabaseColumns}.OnDbException(DbException)"/> will be skipped where set to <see langword="false"/>.</para></remarks>
     public bool TransformException { get; init; } = true;
 }

src/CoreEx.Database/Database.cs

@@ -6,15 +6,16 @@
 /// <typeparam name="TConnection">The <see cref="DbConnection"/> <see cref="Type"/>.</typeparam>
 /// <typeparam name="TCommand">The <see cref="DatabaseCommand{TDatabaseArgs, TSelf}"/> <see cref="Type"/>.</typeparam>
 /// <typeparam name="TDatabaseArgs">The <see cref="DatabaseArgs"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDatabaseColumns">The <see cref="DatabaseColumns"/> <see cref="Type"/>.</typeparam>
 /// <param name="connection">The <typeparamref name="TConnection"/> <see cref="DbConnection"/>.</param>
 /// <param name="invoker">The <see cref="DatabaseInvoker"/>.</param>
+/// <param name="namedColumns">The convention-based column names.</param>
 /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
 /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-public abstract class Database<TConnection, TCommand, TDatabaseArgs>(TConnection connection, DatabaseInvoker invoker, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<Database<TConnection, TCommand, TDatabaseArgs>>? logger = null) : IDatabase, IDisposable
-    where TConnection : DbConnection where TCommand : DatabaseCommand<TDatabaseArgs, TCommand> where TDatabaseArgs : DatabaseArgs, new()
+public abstract class Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>(TConnection connection, DatabaseInvoker invoker, TDatabaseColumns namedColumns, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>>? logger = null) : IDatabase, IDisposable
+    where TConnection : DbConnection where TCommand : DatabaseCommand<TDatabaseArgs, TCommand> where TDatabaseArgs : DatabaseArgs, new() where TDatabaseColumns : DatabaseColumns
 {
     private static readonly TDatabaseArgs _defaultDbArgs = new();
-    private static readonly DatabaseColumns _defaultColumns = new();
     private static readonly DatabaseWildcard _defaultWildcard = new();
 
     private readonly SemaphoreSlim _semaphore = new(1, 1);
@@ -26,7 +27,7 @@ public abstract class Database<TConnection, TCommand, TDatabaseArgs>(TConnection
     public string DatabaseId { get; } = Guid.NewGuid().ToString();
 
     /// <inheritdoc/>
-    public ILogger? Logger { get; } = logger ?? ExecutionContext.GetService<ILogger<Database<TConnection, TCommand, TDatabaseArgs>>>();
+    public ILogger? Logger { get; } = logger ?? ExecutionContext.GetService<ILogger<Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>>>();
 
     /// <inheritdoc/>
     public DatabaseInvoker Invoker { get; } = invoker.ThrowIfNull();
@@ -46,11 +47,12 @@ public abstract class Database<TConnection, TCommand, TDatabaseArgs>(TConnection
     public bool DateTimeOffsetTransform { get; set; } = true;
 
     /// <inheritdoc/>
-    public DatabaseColumns NamedColumns
-    {
-        get => field ?? throw new InvalidOperationException($"{nameof(NamedColumns)} is not initialized.");
-        set => field = value.ThrowIfNull();
-    }
+    DatabaseColumns IDatabase.NamedColumns => NamedColumns;
+
+    /// <summary>
+    /// Gets or sets the names of the convention-based <see cref="Extended.DatabaseColumns"/>.
+    /// </summary>
+    public TDatabaseColumns NamedColumns { get; set; } = namedColumns.ThrowIfNull();
 
     /// <summary>
     /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.

src/CoreEx.Database/IDatabase.cs

@@ -37,9 +37,9 @@ public interface IDatabase
     bool DateTimeOffsetTransform { get; set; }
 
     /// <summary>
-    /// Gets or sets the names of the convention-based <see cref="Extended.DatabaseColumns"/>.
+    /// Gets the names of the convention-based <see cref="Extended.DatabaseColumns"/>.
     /// </summary>
-    DatabaseColumns NamedColumns { get; set; }
+    DatabaseColumns NamedColumns { get; }
 
     /// <summary>
     /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.

src/CoreEx.Database/SqlStatement.cs

@@ -48,7 +48,7 @@ public static SqlStatement FromResource(string resourceName, Assembly? assembly
     public static SqlStatement FromResource<TResource>(string resourceName) => FromResource(resourceName, typeof(TResource).Assembly);
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="SqlStatement"/> struct.
+    /// Initializes a new instance of the <see cref="SqlStatement"/> class.
     /// </summary>
     /// <param name="commandType">The <see cref="System.Data.CommandType"/>.</param>
     /// <param name="commandText">The command text.</param>

src/CoreEx.UnitTesting/GlobalUsing.cs

@@ -22,6 +22,7 @@
 global using DbEx.SqlServer.Migration;
 global using AwesomeAssertions;
 global using Microsoft.Extensions.DependencyInjection;
+global using System.Collections.Concurrent;
 global using System.Diagnostics.CodeAnalysis;
 global using System.Reflection;
 global using System.Text;

src/CoreEx.UnitTesting/UnitTestExExtensions.Postgres.cs

@@ -55,7 +55,7 @@ public static async Task MigratePostgresDataAsync(this TesterBase tester, Func<M
     {
         // Determine the connection string and configure the migration args.
         var cs = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(connectionString.ThrowIfNullOrEmpty(), tester.ThrowIfNull().Configuration);
-        var ma = new MigrationArgs(_connectionStrings.Add(cs) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
+        var ma = new MigrationArgs(_connectionStrings.TryAdd(cs, 0) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
 
         if (configureMigrationArgs is not null)
             ma = configureMigrationArgs(ma);

src/CoreEx.UnitTesting/UnitTestExExtensions.SqlServer.cs

@@ -55,7 +55,7 @@ public static async Task MigrateSqlServerDataAsync(this TesterBase tester, Func<
     {
         // Determine the connection string and configure the migration args.
         var cs = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(connectionString.ThrowIfNullOrEmpty(), tester.ThrowIfNull().Configuration);
-        var ma = new MigrationArgs(_connectionStrings.Add(cs) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
+        var ma = new MigrationArgs(_connectionStrings.TryAdd(cs, 0) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
 
         if (configureMigrationArgs is not null)
             ma = configureMigrationArgs(ma);

src/CoreEx.UnitTesting/UnitTestExExtensions.cs

@@ -7,7 +7,7 @@ namespace UnitTestEx;
 /// </summary>
 public static partial class UnitTestExExtensions
 {
-    private static readonly HashSet<string> _connectionStrings = [];
+    private static readonly ConcurrentDictionary<string, byte> _connectionStrings = [];
 
     /// <summary>
     /// Enables an <see cref="ExecutionContext"/> instance to be tested managed within a <see cref="TesterBase.Services"/> <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/>.