From 14ab6d5a2c12e1272208975e8c97963394e3aef5 Mon Sep 17 00:00:00 2001 From: sergergood Date: Sat, 24 Jul 2021 22:07:24 +0300 Subject: [PATCH 1/3] DbSettingMapper --- .../ClassHandlerInvocationTest.cs | 2 +- .../ClassHandlerPrecedenceTest.cs | 4 +- .../DbHelpers/DbHelperTest.cs | 2 +- .../Extensions/DbCommandExtensionsTest.cs | 2 +- .../Interfaces/ICacheForDbConnectionTest.cs | 2 +- .../IStatementBuilderForDbConnectionTest.cs | 2 +- .../Interfaces/ITraceForDbConnectionTest.cs | 2 +- .../Mappers/MappingSequenceTest.cs | 2 +- .../PropertyHandlerInvocationTest.cs | 2 +- .../PropertyHandlerPrecedenceTest.cs | 2 +- .../RepoDb/Extensions/DbCommandExtension.cs | 2 +- .../Extensions/DbConnectionExtension.cs | 6 +- RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs | 115 ++++-------------- RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs | 2 +- .../MySqlStatementBuilder.cs | 2 +- .../RepoDb.MySqlConnector/MySqlBootstrap.cs | 2 +- .../MySqlConnectorStatementBuilder.cs | 2 +- .../RepoDb.PostgreSql/PostgreSqlBootstrap.cs | 2 +- .../PostgreSqlStatementBuilder.cs | 2 +- .../RepoDb.SqLite/SqLiteBootstrap.cs | 4 +- .../RepoDb.SqlServer/SqlServerBootstrap.cs | 4 +- 21 files changed, 52 insertions(+), 113 deletions(-) diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs index 081a23f92..6ca8816db 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs @@ -13,7 +13,7 @@ public class ClassHandlerInvocationTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(ClassHandlerConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs index 0d3bae467..4a94965fb 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs @@ -15,12 +15,12 @@ public class ClassHandlerPrecedenceTest public void Initialize() { // For Non-Attributed Entity - DbSettingMapper.Add(typeof(ClassHandlerConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); // For Attributed Entity - DbSettingMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs index a4655f15d..d8915f6c1 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs @@ -16,7 +16,7 @@ public class DbHelperTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(DbHelperDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); StatementBuilderMapper.Add(typeof(DbHelperDbConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Extensions/DbCommandExtensionsTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Extensions/DbCommandExtensionsTest.cs index 4a462c8e3..698da4828 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Extensions/DbCommandExtensionsTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Extensions/DbCommandExtensionsTest.cs @@ -217,7 +217,7 @@ private class PrivateDbConnection : CustomDbConnection { } [TestMethod] public void TestSqlConnectionExecuteQueryViaDynamicsWithEmptyArrayParameters() { - DbSettingMapper.Add(typeof(PrivateDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); using (var connection = new PrivateDbConnection()) { var sql = @" diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs index 42c9c3a09..ddfc2a903 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs @@ -14,7 +14,7 @@ public class ICacheForDbConnectionTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(CacheDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(CacheDbConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(CacheDbConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs index 3127c0f46..f4f88dd9a 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs @@ -14,7 +14,7 @@ public class IStatementBuilderForDbConnectionTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(StatementBuilderDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(StatementBuilderDbConnection), new CustomDbHelper(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs index 16eb63452..bec803f13 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs @@ -12,7 +12,7 @@ public class ITraceForDbConnectionTest [ClassInitialize] public static void ClassInitialize(TestContext context) { - DbSettingMapper.Add(typeof(TraceDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(TraceDbConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(TraceDbConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Mappers/MappingSequenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Mappers/MappingSequenceTest.cs index 6faabbdc4..3f40c6fdb 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Mappers/MappingSequenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Mappers/MappingSequenceTest.cs @@ -28,7 +28,7 @@ private class PrivateDbConnection : CustomDbConnection { } public void Initialize() { Cleanup(); - DbSettingMapper.Add(typeof(PrivateDbConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); } [TestCleanup] diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs index a2cde75d3..837d8feb7 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs @@ -14,7 +14,7 @@ public class PropertyHandlerInvocationTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(PropertyHandlerConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs index 9f2a52ffb..391dec7d0 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs @@ -15,7 +15,7 @@ public class PropertyHandlerPrecedenceTest [TestInitialize] public void Initialize() { - DbSettingMapper.Add(typeof(PropertyHandlerConnection), new CustomDbSetting(), true); + DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs index 303b6142d..8bb64d4e4 100644 --- a/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs +++ b/RepoDb.Core/RepoDb/Extensions/DbCommandExtension.cs @@ -56,7 +56,7 @@ public static class DbCommandExtension var parameter = command.CreateParameter(); // Set the values - parameter.ParameterName = name.AsParameter(DbSettingMapper.Get(command.Connection.GetType())); + parameter.ParameterName = name.AsParameter(DbSettingMapper.Get(command.Connection)); parameter.Value = value ?? DBNull.Value; // The DB Type is auto set when setting the values (so check properly Time/DateTime problem) diff --git a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs index bf8e4cbaa..9b4e39ad3 100644 --- a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs +++ b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs @@ -1080,7 +1080,7 @@ public static IDbConnection EnsureOpen(this IDbConnection connection) bool skipCommandArrayParametersCheck) { // Variables - var setting = DbSettingMapper.Get(connection.GetType()); + var setting = DbSettingMapper.Get(connection); var command = CreateDbCommandForExecution(connection: connection, commandText: commandText, param: param, @@ -1733,7 +1733,7 @@ public static IDbSetting GetDbSetting(this IDbConnection connection) } // Get the setting - var setting = DbSettingMapper.Get(connection.GetType()); + var setting = DbSettingMapper.Get(connection); // Check the presence if (setting == null) @@ -2830,7 +2830,7 @@ internal static IEnumerable GetQualifiedFields(IEnumerable maps = new(); + private static readonly ConcurrentDictionary maps = new(); #endregion #region Methods - + /* * Add */ @@ -32,25 +32,10 @@ public static class DbSettingMapper /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. public static void Add(IDbSetting dbSetting, bool @override) - where TDbConnection : DbConnection => - Add(typeof(TDbConnection), dbSetting, @override); - - /// - /// Adds a mapping between the type of and an instance of object. - /// - /// The type of object. - /// The instance of object to mapped to. - /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. - public static void Add(Type connectionType, - IDbSetting dbSetting, - bool @override) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - - // Variables for cache - var key = GenerateHashCode(connectionType); - + var key = typeof(TDbConnection); + // Try get the mappings if (maps.TryGetValue(key, out var existing)) { @@ -62,7 +47,7 @@ public static class DbSettingMapper else { // Throw an exception - throw new MappingExistsException($"The database setting mapping to provider '{connectionType.FullName}' already exists."); + throw new MappingExistsException($"The database setting mapping to provider '{key.FullName}' already exists."); } } else @@ -73,8 +58,8 @@ public static class DbSettingMapper } /* - * Get - */ + * Get + */ /// /// Gets an existing object that is mapped to type . @@ -82,59 +67,48 @@ public static class DbSettingMapper /// The type of . /// An instance of mapped public static IDbSetting Get() - where TDbConnection : DbConnection => - Get(typeof(TDbConnection)); + where TDbConnection : IDbConnection + { + // get the value + maps.TryGetValue(typeof(TDbConnection), out var value); + + // Return the value + return value; + } /// /// Gets an existing object that is mapped to type . /// - /// The type of object. + /// The type of . /// An instance of mapped - public static IDbSetting Get(Type connectionType) + public static IDbSetting Get(TDbConnection connection) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - // get the value - maps.TryGetValue(GenerateHashCode(connectionType), out var value); + maps.TryGetValue(connection.GetType(), out var value); // Return the value return value; } - + /* - * Remove - */ + * Remove + */ /// /// Removes the mapping between the type of and an instance of object. /// /// The type of . public static void Remove() - where TDbConnection : DbConnection => - Remove(typeof(TDbConnection)); - - /// - /// Removes the mapping between the type of and an instance of object. - /// - /// The type of object. - public static void Remove(Type connectionType) + where TDbConnection : IDbConnection { - // Check the presence - GuardPresence(connectionType); - // Variables for cache - var key = GenerateHashCode(connectionType); - var existing = (IDbSetting)null; + var key = typeof(TDbConnection); // Try get the the value - maps.TryRemove(key, out existing); + maps.TryRemove(key, out _); } - /* - * Clear - */ - /// /// Clears all the existing cached objects. /// @@ -142,40 +116,5 @@ public static void Remove(Type connectionType) maps.Clear(); #endregion - - #region Helpers - - /// - /// Generates a hashcode for caching. - /// - /// The type of the data entity. - /// The generated hashcode. - private static int GenerateHashCode(Type type) => - TypeExtension.GenerateHashCode(type); - - /// - /// Throws an exception if null. - /// - private static void GuardPresence(Type type) - { - if (type == null) - { - throw new NullReferenceException("Database setting type."); - } - } - - /// - /// Throws an exception if the type is not a subclass of type . - /// - private static void Guard(Type type) - { - GuardPresence(type); - if (type.IsSubclassOf(StaticType.DbConnection) == false) - { - throw new InvalidTypeException($"Type must be a subclass of '{StaticType.DbConnection.FullName}'."); - } - } - - #endregion } } diff --git a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs index e2d1b424e..fc6a34633 100644 --- a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs +++ b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs @@ -33,7 +33,7 @@ public static void Initialize() } // Map the DbSetting - DbSettingMapper.Add(typeof(MySqlConnection), new MySqlDbSetting(), true); + DbSettingMapper.Add(new MySqlDbSetting(), true); // Map the DbHelper DbHelperMapper.Add(typeof(MySqlConnection), new MySqlDbHelper(), true); diff --git a/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs b/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs index 452bfbe11..011bf80f2 100644 --- a/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs +++ b/RepoDb.MySql/RepoDb.MySql/StatementBuilders/MySqlStatementBuilder.cs @@ -17,7 +17,7 @@ public sealed class MySqlStatementBuilder : BaseStatementBuilder /// Creates a new instance of object. /// public MySqlStatementBuilder() - : this(DbSettingMapper.Get(typeof(MySqlConnection)), + : this(DbSettingMapper.Get(), null, null) { } diff --git a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs index 7bf8e89b9..3d0afb0f2 100644 --- a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs +++ b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs @@ -33,7 +33,7 @@ public static void Initialize() } // Map the DbSetting - DbSettingMapper.Add(typeof(MySqlConnection), new MySqlConnectorDbSetting(), true); + DbSettingMapper.Add(new MySqlConnectorDbSetting(), true); // Map the DbHelper DbHelperMapper.Add(typeof(MySqlConnection), new MySqlConnectorDbHelper(), true); diff --git a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs index febe5821a..e75225863 100644 --- a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs +++ b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/StatementBuilders/MySqlConnectorStatementBuilder.cs @@ -17,7 +17,7 @@ public sealed class MySqlConnectorStatementBuilder : BaseStatementBuilder /// Creates a new instance of object. /// public MySqlConnectorStatementBuilder() - : this(DbSettingMapper.Get(typeof(MySqlConnection)), + : this(DbSettingMapper.Get(), null, null) { } diff --git a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs index 01f7e0227..b9164e67c 100644 --- a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs +++ b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs @@ -33,7 +33,7 @@ public static void Initialize() } // Map the DbSetting - DbSettingMapper.Add(typeof(NpgsqlConnection), new PostgreSqlDbSetting(), true); + DbSettingMapper.Add(new PostgreSqlDbSetting(), true); // Map the DbHelper DbHelperMapper.Add(typeof(NpgsqlConnection), new PostgreSqlDbHelper(), true); diff --git a/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs b/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs index 70ce5131e..70f8d1973 100644 --- a/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs +++ b/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs @@ -18,7 +18,7 @@ public sealed class PostgreSqlStatementBuilder : BaseStatementBuilder /// Creates a new instance of object. /// public PostgreSqlStatementBuilder() - : this(DbSettingMapper.Get(typeof(NpgsqlConnection)), + : this(DbSettingMapper.Get(), new PostgreSqlConvertFieldResolver(), new ClientTypeToAverageableClientTypeResolver()) { } diff --git a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs index 60d982d70..ee8799a7c 100644 --- a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs +++ b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs @@ -38,7 +38,7 @@ public static void Initialize() // Map the DbSetting var sdsDbSetting = new SqLiteDbSetting(true); - DbSettingMapper.Add(typeof(SQLiteConnection), sdsDbSetting, true); + DbSettingMapper.Add(sdsDbSetting, true); // Map the DbHelper DbHelperMapper.Add(typeof(SQLiteConnection), @@ -55,7 +55,7 @@ public static void Initialize() // Map the DbSetting var mdsDbSetting = new SqLiteDbSetting(false); - DbSettingMapper.Add(typeof(SqliteConnection), mdsDbSetting, true); + DbSettingMapper.Add(mdsDbSetting, true); // Map the DbHelper DbHelperMapper.Add(typeof(SqliteConnection), diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs index c5123f102..9af3ed0e1 100644 --- a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs +++ b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs @@ -33,8 +33,8 @@ public static void Initialize() // Map the DbSetting var dbSetting = new SqlServerDbSetting(); - DbSettingMapper.Add(typeof(Microsoft.Data.SqlClient.SqlConnection), dbSetting, true); - DbSettingMapper.Add(typeof(System.Data.SqlClient.SqlConnection), dbSetting, true); + DbSettingMapper.Add(dbSetting, true); + DbSettingMapper.Add(dbSetting, true); // Map the DbHelper var dbHelper = new SqlServerDbHelper(); From 13f2e4a0a6421ae16feedcb5e9861da76aeb235b Mon Sep 17 00:00:00 2001 From: sergergood Date: Mon, 26 Jul 2021 20:54:28 +0300 Subject: [PATCH 2/3] DbHelperMapper --- .../ClassHandlerInvocationTest.cs | 2 +- .../ClassHandlerPrecedenceTest.cs | 4 +- .../DbHelpers/DbHelperTest.cs | 36 +++--- .../Interfaces/ICacheForDbConnectionTest.cs | 2 +- .../IStatementBuilderForDbConnectionTest.cs | 2 +- .../Interfaces/ITraceForDbConnectionTest.cs | 2 +- .../PropertyHandlerInvocationTest.cs | 2 +- .../PropertyHandlerPrecedenceTest.cs | 2 +- RepoDb.Core/RepoDb/Cachers/DbFieldCache.cs | 4 +- .../Extensions/DbConnectionExtension.cs | 2 +- RepoDb.Core/RepoDb/Mappers/DbHelperMapper.cs | 117 +++++------------- RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs | 20 +-- RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs | 2 +- .../RepoDb.MySqlConnector/MySqlBootstrap.cs | 2 +- .../RepoDb.PostgreSql/PostgreSqlBootstrap.cs | 2 +- .../RepoDb.SqLite/SqLiteBootstrap.cs | 6 +- .../RepoDb.SqlServer/SqlServerBootstrap.cs | 4 +- 17 files changed, 76 insertions(+), 135 deletions(-) diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs index 6ca8816db..f26ac5ab3 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs @@ -14,7 +14,7 @@ public class ClassHandlerInvocationTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs index 4a94965fb..85dd4f4e0 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs @@ -16,12 +16,12 @@ public void Initialize() { // For Non-Attributed Entity DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); // For Attributed Entity DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs index d8915f6c1..c25f1dea5 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs @@ -66,7 +66,7 @@ public void TestDbHelperForBatchQuery() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.BatchQuery(0, @@ -92,7 +92,7 @@ public void TestDbHelperForInsert() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Insert(new DbHelperDataEntity { Id = 1, Name = "Name" }); @@ -115,7 +115,7 @@ public void TestDbHelperForInsertAll() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.InsertAll(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } }); @@ -138,7 +138,7 @@ public void TestDbHelperForMerge() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Merge(new DbHelperDataEntity { Id = 1, Name = "Name" }); @@ -161,7 +161,7 @@ public void TestDbHelperForMergeAll() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.MergeAll(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } }); @@ -184,7 +184,7 @@ public void TestDbHelperForQuery() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Query((object)null); @@ -207,7 +207,7 @@ public void TestDbHelperForQueryAll() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.QueryAll(); @@ -230,7 +230,7 @@ public void TestDbHelperForUpdate() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Update(new DbHelperDataEntity { Id = 1, Name = "Name" }); @@ -253,7 +253,7 @@ public void TestDbHelperForUpdateAll() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.UpdateAll(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } }); @@ -280,7 +280,7 @@ public void TestDbHelperForBatchQueryViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.BatchQuery(ClassMappedNameCache.Get(), @@ -307,7 +307,7 @@ public void TestDbHelperForInsertViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Insert(ClassMappedNameCache.Get(), @@ -331,7 +331,7 @@ public void TestDbHelperForInsertAllViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.InsertAll(ClassMappedNameCache.Get(), @@ -355,7 +355,7 @@ public void TestDbHelperForMergeViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Merge(ClassMappedNameCache.Get(), @@ -379,7 +379,7 @@ public void TestDbHelperForMergeAllViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.MergeAll(ClassMappedNameCache.Get(), @@ -403,7 +403,7 @@ public void TestDbHelperForQueryViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Query(ClassMappedNameCache.Get(), @@ -427,7 +427,7 @@ public void TestDbHelperForQueryAllViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.QueryAll(ClassMappedNameCache.Get()); @@ -450,7 +450,7 @@ public void TestDbHelperForUpdateViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.Update(ClassMappedNameCache.Get(), @@ -474,7 +474,7 @@ public void TestDbHelperForUpdateAllViaTableName() // Act CommandTextCache.Flush(); DbFieldCache.Flush(); - DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true); + DbHelperMapper.Add(dbHelper.Object, true); // Act connection.UpdateAll(ClassMappedNameCache.Get(), diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs index ddfc2a903..85a5d84d4 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs @@ -15,7 +15,7 @@ public class ICacheForDbConnectionTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(CacheDbConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(CacheDbConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs index f4f88dd9a..1fc2a0889 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs @@ -15,7 +15,7 @@ public class IStatementBuilderForDbConnectionTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(StatementBuilderDbConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); } #region SubClasses diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs index bec803f13..7943b3bc8 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs @@ -13,7 +13,7 @@ public class ITraceForDbConnectionTest public static void ClassInitialize(TestContext context) { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(TraceDbConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(TraceDbConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs index 837d8feb7..f385036c2 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs @@ -15,7 +15,7 @@ public class PropertyHandlerInvocationTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs index 391dec7d0..3ed9db8d2 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs @@ -16,7 +16,7 @@ public class PropertyHandlerPrecedenceTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true); + DbHelperMapper.Add(new CustomDbHelper(), true); StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); } diff --git a/RepoDb.Core/RepoDb/Cachers/DbFieldCache.cs b/RepoDb.Core/RepoDb/Cachers/DbFieldCache.cs index eda297d38..a9ef776d8 100644 --- a/RepoDb.Core/RepoDb/Cachers/DbFieldCache.cs +++ b/RepoDb.Core/RepoDb/Cachers/DbFieldCache.cs @@ -103,7 +103,7 @@ public static class DbFieldCache if (cache.TryGetValue(key, out var result) == false) { // Get from DB - var dbHelper = DbHelperMapper.Get(type); + var dbHelper = DbHelperMapper.Get(connection); result = dbHelper?.GetFields(connection, tableName, transaction); // Validate @@ -190,7 +190,7 @@ public static class DbFieldCache if (cache.TryGetValue(key, out var result) == false) { // Get from DB - var dbHelper = DbHelperMapper.Get(type); + var dbHelper = DbHelperMapper.Get(connection); result = await dbHelper?.GetFieldsAsync(connection, tableName, transaction, cancellationToken); // Validate diff --git a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs index 9b4e39ad3..6a5eb204b 100644 --- a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs +++ b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs @@ -1759,7 +1759,7 @@ public static IDbHelper GetDbHelper(this IDbConnection connection) } // Get the setting - var helper = DbHelperMapper.Get(connection.GetType()); + var helper = DbHelperMapper.Get(connection); // Check the presence if (helper == null) diff --git a/RepoDb.Core/RepoDb/Mappers/DbHelperMapper.cs b/RepoDb.Core/RepoDb/Mappers/DbHelperMapper.cs index ae6ed72e0..84773af84 100644 --- a/RepoDb.Core/RepoDb/Mappers/DbHelperMapper.cs +++ b/RepoDb.Core/RepoDb/Mappers/DbHelperMapper.cs @@ -1,20 +1,19 @@ using RepoDb.Exceptions; -using RepoDb.Extensions; using RepoDb.Interfaces; using System; using System.Collections.Concurrent; -using System.Data.Common; +using System.Data; namespace RepoDb { /// - /// A class that is being used to map a type of into an instance of object. + /// A class that is being used to map a type of into an instance of object. /// public static class DbHelperMapper { #region Privates - private static readonly ConcurrentDictionary maps = new(); + private static readonly ConcurrentDictionary maps = new(); #endregion @@ -25,32 +24,17 @@ public static class DbHelperMapper */ /// - /// Adds a mapping between the type of and an instance of object. + /// Adds a mapping between the type of and an instance of object. /// - /// The type of object. + /// The type of object. /// The instance of object to mapped to. /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. public static void Add(IDbHelper dbHelper, bool @override) - where TDbConnection : DbConnection => - Add(typeof(TDbConnection), dbHelper, @override); - - /// - /// Adds a mapping between the type of and an instance of object. - /// - /// The type of object. - /// The instance of object to mapped to. - /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. - public static void Add(Type connectionType, - IDbHelper dbHelper, - bool @override) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - - // Variables - var key = GenerateHashCode(connectionType); - + var key = typeof(TDbConnection); + // Try get the mappings if (maps.TryGetValue(key, out var existing)) { @@ -62,7 +46,7 @@ public static class DbHelperMapper else { // Throw an exception - throw new MappingExistsException($"The database helper mapping to provider '{connectionType.FullName}' already exists."); + throw new MappingExistsException($"The database helper mapping to provider '{key.FullName}' already exists."); } } else @@ -77,26 +61,31 @@ public static class DbHelperMapper */ /// - /// Gets an existing object that is mapped to type . + /// Gets an existing object that is mapped to type . /// - /// The type of . + /// The type of . /// An instance of mapped public static IDbHelper Get() - where TDbConnection : DbConnection => - Get(typeof(TDbConnection)); + where TDbConnection : IDbConnection + { + // get the value + maps.TryGetValue(typeof(TDbConnection), out var value); + + // Return the value + return value; + } /// - /// Gets an existing object that is mapped to type . + /// Gets an existing object that is mapped to type . /// - /// The type of object. + /// The type of . + /// The instance of . /// An instance of mapped - public static IDbHelper Get(Type connectionType) + public static IDbHelper Get(TDbConnection connection) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - // get the value - maps.TryGetValue(GenerateHashCode(connectionType), out var value); + maps.TryGetValue(connection.GetType(), out var value); // Return the value return value; @@ -107,28 +96,17 @@ public static IDbHelper Get(Type connectionType) */ /// - /// Removes the mapping between the type of and an instance of object. + /// Removes the mapping between the type of and an instance of object. /// - /// The type of . + /// The type of . public static void Remove() - where TDbConnection : DbConnection => - Remove(typeof(TDbConnection)); - - /// - /// Removes the mapping between the type of and an instance of object. - /// - /// The type of object. - public static void Remove(Type connectionType) + where TDbConnection : IDbConnection { - // Check the presence - GuardPresence(connectionType); - // Variables for cache - var key = GenerateHashCode(connectionType); - var existing = (IDbHelper)null; + var key = typeof(TDbConnection); // Try get the the value - maps.TryRemove(key, out existing); + maps.TryRemove(key, out _); } /* @@ -142,40 +120,5 @@ public static void Remove(Type connectionType) maps.Clear(); #endregion - - #region Helpers - - /// - /// Generates a hashcode for caching. - /// - /// The type of the data entity. - /// The generated hashcode. - private static int GenerateHashCode(Type type) => - TypeExtension.GenerateHashCode(type); - - /// - /// Throws an exception if null. - /// - private static void GuardPresence(Type type) - { - if (type == null) - { - throw new NullReferenceException("Database helper type."); - } - } - - /// - /// Throws an exception if the type is not a sublcass of type . - /// - private static void Guard(Type type) - { - GuardPresence(type); - if (type.IsSubclassOf(StaticType.DbConnection) == false) - { - throw new InvalidTypeException($"Type must be a subclass of '{StaticType.DbConnection}'."); - } - } - - #endregion } } diff --git a/RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs b/RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs index ea8cd143d..8ddd17b61 100644 --- a/RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs +++ b/RepoDb.Core/RepoDb/Mappers/DbSettingMapper.cs @@ -3,12 +3,11 @@ using System; using System.Collections.Concurrent; using System.Data; -using System.Data.Common; namespace RepoDb { /// - /// A class that is being used to map a type of into an instance of object. + /// A class that is being used to map a type of into an instance of object. /// public static class DbSettingMapper { @@ -25,9 +24,9 @@ public static class DbSettingMapper */ /// - /// Adds a mapping between the type of and an instance of object. + /// Adds a mapping between the type of and an instance of object. /// - /// The type of object. + /// The type of object. /// The instance of object to mapped to. /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. public static void Add(IDbSetting dbSetting, @@ -62,9 +61,9 @@ public static class DbSettingMapper */ /// - /// Gets an existing object that is mapped to type . + /// Gets an existing object that is mapped to type . /// - /// The type of . + /// The type of . /// An instance of mapped public static IDbSetting Get() where TDbConnection : IDbConnection @@ -77,9 +76,10 @@ public static IDbSetting Get() } /// - /// Gets an existing object that is mapped to type . + /// Gets an existing object that is mapped to type . /// - /// The type of . + /// The type of . + /// The instance of . /// An instance of mapped public static IDbSetting Get(TDbConnection connection) where TDbConnection : IDbConnection @@ -96,9 +96,9 @@ public static IDbSetting Get(TDbConnection connection) */ /// - /// Removes the mapping between the type of and an instance of object. + /// Removes the mapping between the type of and an instance of object. /// - /// The type of . + /// The type of . public static void Remove() where TDbConnection : IDbConnection { diff --git a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs index fc6a34633..ab37c3236 100644 --- a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs +++ b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs @@ -36,7 +36,7 @@ public static void Initialize() DbSettingMapper.Add(new MySqlDbSetting(), true); // Map the DbHelper - DbHelperMapper.Add(typeof(MySqlConnection), new MySqlDbHelper(), true); + DbHelperMapper.Add(new MySqlDbHelper(), true); // Map the Statement Builder StatementBuilderMapper.Add(typeof(MySqlConnection), new MySqlStatementBuilder(), true); diff --git a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs index 3d0afb0f2..e339d1838 100644 --- a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs +++ b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs @@ -36,7 +36,7 @@ public static void Initialize() DbSettingMapper.Add(new MySqlConnectorDbSetting(), true); // Map the DbHelper - DbHelperMapper.Add(typeof(MySqlConnection), new MySqlConnectorDbHelper(), true); + DbHelperMapper.Add(new MySqlConnectorDbHelper(), true); // Map the Statement Builder StatementBuilderMapper.Add(typeof(MySqlConnection), new MySqlConnectorStatementBuilder(), true); diff --git a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs index b9164e67c..fca9c4943 100644 --- a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs +++ b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs @@ -36,7 +36,7 @@ public static void Initialize() DbSettingMapper.Add(new PostgreSqlDbSetting(), true); // Map the DbHelper - DbHelperMapper.Add(typeof(NpgsqlConnection), new PostgreSqlDbHelper(), true); + DbHelperMapper.Add(new PostgreSqlDbHelper(), true); // Map the Statement Builder StatementBuilderMapper.Add(typeof(NpgsqlConnection), new PostgreSqlStatementBuilder(), true); diff --git a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs index ee8799a7c..af4d9e5e9 100644 --- a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs +++ b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs @@ -41,8 +41,7 @@ public static void Initialize() DbSettingMapper.Add(sdsDbSetting, true); // Map the DbHelper - DbHelperMapper.Add(typeof(SQLiteConnection), - new SqLiteDbHelper(sdsDbSetting, new SdsSqLiteDbTypeNameToClientTypeResolver()), true); + DbHelperMapper.Add(new SqLiteDbHelper(sdsDbSetting, new SdsSqLiteDbTypeNameToClientTypeResolver()), true); // Map the Statement Builder StatementBuilderMapper.Add(typeof(SQLiteConnection), new SqLiteStatementBuilder(sdsDbSetting, @@ -58,8 +57,7 @@ public static void Initialize() DbSettingMapper.Add(mdsDbSetting, true); // Map the DbHelper - DbHelperMapper.Add(typeof(SqliteConnection), - new SqLiteDbHelper(mdsDbSetting, new MdsSqLiteDbTypeNameToClientTypeResolver()), true); + DbHelperMapper.Add(new SqLiteDbHelper(mdsDbSetting, new MdsSqLiteDbTypeNameToClientTypeResolver()), true); // Map the Statement Builder StatementBuilderMapper.Add(typeof(SqliteConnection), new SqLiteStatementBuilder(mdsDbSetting, diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs index 9af3ed0e1..e3dc47f50 100644 --- a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs +++ b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs @@ -38,8 +38,8 @@ public static void Initialize() // Map the DbHelper var dbHelper = new SqlServerDbHelper(); - DbHelperMapper.Add(typeof(Microsoft.Data.SqlClient.SqlConnection), dbHelper, true); - DbHelperMapper.Add(typeof(System.Data.SqlClient.SqlConnection), dbHelper, true); + DbHelperMapper.Add(dbHelper, true); + DbHelperMapper.Add(dbHelper, true); // Map the Statement Builder var statementBuilder = new SqlServerStatementBuilder(dbSetting); From 06c9e96972a1c175cf7fe9285e8a1c7f8ae724a8 Mon Sep 17 00:00:00 2001 From: sergergood Date: Wed, 28 Jul 2021 20:08:59 +0300 Subject: [PATCH 3/3] StatementBuilderMapper --- .../ClassHandlerInvocationTest.cs | 2 +- .../ClassHandlerPrecedenceTest.cs | 4 +- .../DbHelpers/DbHelperTest.cs | 2 +- .../Interfaces/ICacheForDbConnectionTest.cs | 2 +- .../Interfaces/ITraceForDbConnectionTest.cs | 2 +- .../PropertyHandlerInvocationTest.cs | 2 +- .../PropertyHandlerPrecedenceTest.cs | 2 +- .../StatementBuilders/CreateAverageAllTest.cs | 30 ++-- .../StatementBuilders/CreateAverageTest.cs | 34 ++-- .../StatementBuilders/CreateCountAllTest.cs | 20 +-- .../StatementBuilders/CreateCountTest.cs | 24 +-- .../StatementBuilders/CreateDeleteAllTest.cs | 16 +- .../StatementBuilders/CreateDeleteTest.cs | 18 +- .../StatementBuilders/CreateExistsTest.cs | 24 +-- .../StatementBuilders/CreateInsertAllTest.cs | 34 ++-- .../StatementBuilders/CreateInsertTest.cs | 30 ++-- .../StatementBuilders/CreateMaxAllTest.cs | 22 +-- .../StatementBuilders/CreateMaxTest.cs | 26 +-- .../StatementBuilders/CreateMinAllTest.cs | 22 +-- .../StatementBuilders/CreateMinTest.cs | 26 +-- .../StatementBuilders/CreateQueryAllTest.cs | 28 +-- .../StatementBuilders/CreateQueryTest.cs | 32 ++-- .../StatementBuilders/CreateSumAllTest.cs | 22 +-- .../StatementBuilders/CreateSumTest.cs | 26 +-- .../StatementBuilders/CreateTruncateTest.cs | 14 +- .../StatementBuilders/CreateUpdateAllTest.cs | 38 ++-- .../StatementBuilders/CreateUpdateTest.cs | 38 ++-- .../Extensions/DbConnectionExtension.cs | 2 +- .../RepoDb/Mappers/StatementBuilderMapper.cs | 122 ++++--------- RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs | 2 +- .../RepoDb.MySqlConnector/MySqlBootstrap.cs | 2 +- .../RepoDb.PostgreSql/PostgreSqlBootstrap.cs | 2 +- .../RepoDb.SqLite/SqLiteBootstrap.cs | 4 +- .../StatementBuilderTest.cs | 164 +++++++++--------- .../RepoDb.SqlServer/SqlServerBootstrap.cs | 4 +- 35 files changed, 391 insertions(+), 451 deletions(-) diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs index f26ac5ab3..126d4bb66 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerInvocationTest.cs @@ -15,7 +15,7 @@ public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } [TestCleanup] diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs index 85dd4f4e0..5c3de2662 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/ClassHandlers/ClassHandlerPrecedenceTest.cs @@ -17,12 +17,12 @@ public void Initialize() // For Non-Attributed Entity DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); // For Attributed Entity DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } [TestCleanup] diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs index c25f1dea5..c76945f69 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs @@ -17,7 +17,7 @@ public class DbHelperTest public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); - StatementBuilderMapper.Add(typeof(DbHelperDbConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } #region SubClasses diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs index 85a5d84d4..8df27a5af 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ICacheForDbConnectionTest.cs @@ -16,7 +16,7 @@ public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(CacheDbConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } #region SubClasses diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs index 7943b3bc8..dc68695b7 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/Interfaces/ITraceForDbConnectionTest.cs @@ -14,7 +14,7 @@ public static void ClassInitialize(TestContext context) { DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(TraceDbConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } #region SubClasses diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs index f385036c2..eddeb0eec 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerInvocationTest.cs @@ -16,7 +16,7 @@ public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } [TestCleanup] diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs index 3ed9db8d2..e5ca5b4f4 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/PropertyHandlers/PropertyHandlerPrecedenceTest.cs @@ -17,7 +17,7 @@ public void Initialize() { DbSettingMapper.Add(new CustomDbSetting(), true); DbHelperMapper.Add(new CustomDbHelper(), true); - StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomStatementBuilder(), true); } [TestCleanup] diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageAllTest.cs index 523bbc44d..04d74915b 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageAllTest.cs @@ -10,9 +10,9 @@ public class BaseStatementBuilderCreateAverageAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(DefinedBaseStatementBuilderDbConnection), new CustomDefinedBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomDefinedBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -29,7 +29,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateAverageAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -49,7 +49,7 @@ public void TestBaseStatementBuilderCreateAverageAll() public void TestBaseStatementBuilderCreateAverageAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -70,7 +70,7 @@ public void TestBaseStatementBuilderCreateAverageAllWithHints() public void TestBaseStatementBuilderCreateAverageAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -90,7 +90,7 @@ public void TestBaseStatementBuilderCreateAverageAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateAverageAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -110,7 +110,7 @@ public void TestBaseStatementBuilderCreateAverageAllWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateAverageAllForOtherAverageableFieldType() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value", typeof(long)); @@ -130,7 +130,7 @@ public void TestBaseStatementBuilderCreateAverageAllForOtherAverageableFieldType public void TestBaseStatementBuilderCreateAverageAllForFieldConverter() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(DefinedBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value", typeof(int)); @@ -150,7 +150,7 @@ public void TestBaseStatementBuilderCreateAverageAllForFieldConverter() public void TestBaseStatementBuilderCreateAverageAllForNonAverageableFieldType() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(DefinedBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value", typeof(string)); @@ -170,7 +170,7 @@ public void TestBaseStatementBuilderCreateAverageAllForNonAverageableFieldType() public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -186,7 +186,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsNull public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -202,7 +202,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsEmpt public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -218,7 +218,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheTableIsWhit public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -233,7 +233,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheFieldIsNull public void ThrowExceptionOnBaseStatementBuilderCreateAverageAllIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageTest.cs index 1074081f8..cbe764f5b 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateAverageTest.cs @@ -10,9 +10,9 @@ public class BaseStatementBuilderCreateAverageTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(DefinedBaseStatementBuilderDbConnection), new CustomDefinedBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomDefinedBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -29,7 +29,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateAverage() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -49,7 +49,7 @@ public void TestBaseStatementBuilderCreateAverage() public void TestBaseStatementBuilderCreateAverageWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -73,7 +73,7 @@ public void TestBaseStatementBuilderCreateAverageWithWhereExpression() public void TestBaseStatementBuilderCreateAverageWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -94,7 +94,7 @@ public void TestBaseStatementBuilderCreateAverageWithHints() public void TestBaseStatementBuilderCreateAverageWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -120,7 +120,7 @@ public void TestBaseStatementBuilderCreateAverageWithWhereExpressionAndWithHints public void TestBaseStatementBuilderCreateAverageWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -140,7 +140,7 @@ public void TestBaseStatementBuilderCreateAverageWithQuotedTableSchema() public void TestBaseStatementBuilderCreateAverageWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -160,7 +160,7 @@ public void TestBaseStatementBuilderCreateAverageWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateAverageForOtherAverageableFieldType() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value", typeof(long)); @@ -180,7 +180,7 @@ public void TestBaseStatementBuilderCreateAverageForOtherAverageableFieldType() public void TestBaseStatementBuilderCreateAverageForFieldConverter() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(DefinedBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value", typeof(int)); @@ -200,7 +200,7 @@ public void TestBaseStatementBuilderCreateAverageForFieldConverter() public void TestBaseStatementBuilderCreateAverageForNonAverageableFieldType() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(DefinedBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value", typeof(string)); @@ -220,7 +220,7 @@ public void TestBaseStatementBuilderCreateAverageForNonAverageableFieldType() public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -236,7 +236,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -252,7 +252,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -268,7 +268,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheTableIsWhitesp public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -283,7 +283,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateAverageIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountAllTest.cs index 87c3fcd54..2bf084007 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountAllTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateCountAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateCountAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -44,7 +44,7 @@ public void TestBaseStatementBuilderCreateCountAll() public void TestBaseStatementBuilderCreateCountAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var hints = "WITH (NOLOCK)"; @@ -63,7 +63,7 @@ public void TestBaseStatementBuilderCreateCountAllWithHints() public void TestBaseStatementBuilderCreateCountAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -81,7 +81,7 @@ public void TestBaseStatementBuilderCreateCountAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateCountAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -99,7 +99,7 @@ public void TestBaseStatementBuilderCreateCountAllWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -113,7 +113,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -127,7 +127,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsEmpty( public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -141,7 +141,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIfTheTableIsWhites public void ThrowExceptionOnBaseStatementBuilderCreateCountAllIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountTest.cs index df0407255..4c9c9f5f0 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateCountTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateCountTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateCount() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -44,7 +44,7 @@ public void TestBaseStatementBuilderCreateCount() public void TestBaseStatementBuilderCreateCountWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -66,7 +66,7 @@ public void TestBaseStatementBuilderCreateCountWithWhereExpression() public void TestBaseStatementBuilderCreateCountWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var hints = "WITH (NOLOCK)"; @@ -85,7 +85,7 @@ public void TestBaseStatementBuilderCreateCountWithHints() public void TestBaseStatementBuilderCreateCountWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -109,7 +109,7 @@ public void TestBaseStatementBuilderCreateCountWithWhereExpressionAndWithHints() public void TestBaseStatementBuilderCreateCountWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -127,7 +127,7 @@ public void TestBaseStatementBuilderCreateCountWithQuotedTableSchema() public void TestBaseStatementBuilderCreateCountWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -145,7 +145,7 @@ public void TestBaseStatementBuilderCreateCountWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -159,7 +159,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -187,7 +187,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateCountIfTheTableIsWhitespac public void ThrowExceptionOnBaseStatementBuilderCreateCountIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteAllTest.cs index f78c3d3df..a47832a11 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteAllTest.cs @@ -10,7 +10,7 @@ public class BaseStatementBuilderCreateDeleteAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); } #region SubClasses @@ -23,7 +23,7 @@ private class BaseStatementBuilderDbConnection : CustomDbConnection { } public void TestBaseStatementBuilderCreateDeleteAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -40,7 +40,7 @@ public void TestBaseStatementBuilderCreateDeleteAll() public void TestBaseStatementBuilderCreateDeleteAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -57,7 +57,7 @@ public void TestBaseStatementBuilderCreateDeleteAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateDeleteAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -74,7 +74,7 @@ public void TestBaseStatementBuilderCreateDeleteAllWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateDeleteAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -92,7 +92,7 @@ public void TestBaseStatementBuilderCreateDeleteAllWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateDeleteAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -105,7 +105,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateDeleteAllIfTheTableIsNull( public void ThrowExceptionOnBaseStatementBuilderCreateDeleteAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -118,7 +118,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateDeleteAllIfTheTableIsEmpty public void ThrowExceptionOnBaseStatementBuilderCreateDeleteAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteTest.cs index 964b7d2a7..9bcba5eb9 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateDeleteTest.cs @@ -10,7 +10,7 @@ public class BaseStatementBuilderCreateDeleteTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); } #region SubClasses @@ -23,7 +23,7 @@ private class BaseStatementBuilderDbConnection : CustomDbConnection { } public void TestBaseStatementBuilderCreateDelete() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -41,7 +41,7 @@ public void TestBaseStatementBuilderCreateDelete() public void TestBaseStatementBuilderCreateDeleteWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -59,7 +59,7 @@ public void TestBaseStatementBuilderCreateDeleteWithWhereExpression() public void TestBaseStatementBuilderCreateDeleteWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -78,7 +78,7 @@ public void TestBaseStatementBuilderCreateDeleteWithQuotedTableSchema() public void TestBaseStatementBuilderCreateDeleteWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -96,7 +96,7 @@ public void TestBaseStatementBuilderCreateDeleteWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateDeleteWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -115,7 +115,7 @@ public void TestBaseStatementBuilderCreateDeleteWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateDeleteIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -128,7 +128,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateDeleteIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateDeleteIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -141,7 +141,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateDeleteIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateDeleteIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateExistsTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateExistsTest.cs index 4e5bf749d..1bdeef513 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateExistsTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateExistsTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateExistsTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateExists() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -44,7 +44,7 @@ public void TestBaseStatementBuilderCreateExists() public void TestBaseStatementBuilderCreateExistsWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -66,7 +66,7 @@ public void TestBaseStatementBuilderCreateExistsWithWhereExpression() public void TestBaseStatementBuilderCreateExistsWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var hints = "WITH (NOLOCK)"; @@ -85,7 +85,7 @@ public void TestBaseStatementBuilderCreateExistsWithHints() public void TestBaseStatementBuilderCreateExistsWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -109,7 +109,7 @@ public void TestBaseStatementBuilderCreateExistsWithWhereExpressionAndWithHints( public void TestBaseStatementBuilderCreateExistsWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -127,7 +127,7 @@ public void TestBaseStatementBuilderCreateExistsWithQuotedTableSchema() public void TestBaseStatementBuilderCreateExistsWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -145,7 +145,7 @@ public void TestBaseStatementBuilderCreateExistsWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -159,7 +159,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -187,7 +187,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateExistsIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateExistsIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertAllTest.cs index 2e83ba692..340879d91 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertAllTest.cs @@ -11,8 +11,8 @@ public class BaseStatementBuilderCreateInsertAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(SingleStatementSupportBaseStatementBuilderDbConnection), new CustomSingleStatementSupportBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomSingleStatementSupportBaseStatementBuilder(), true); } #region SubClasses @@ -27,7 +27,7 @@ private class SingleStatementSupportBaseStatementBuilderDbConnection : CustomDbC public void TestBaseStatementBuilderCreateInsertAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -53,7 +53,7 @@ public void TestBaseStatementBuilderCreateInsertAll() public void TestBaseStatementBuilderCreateInsertAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -79,7 +79,7 @@ public void TestBaseStatementBuilderCreateInsertAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateInsertAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -105,7 +105,7 @@ public void TestBaseStatementBuilderCreateInsertAllWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateInsertAllWithPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -132,7 +132,7 @@ public void TestBaseStatementBuilderCreateInsertAllWithPrimary() public void TestBaseStatementBuilderCreateInsertAllForThreeBatches() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -167,7 +167,7 @@ public void TestBaseStatementBuilderCreateInsertAllForThreeBatches() public void TestBaseStatementBuilderCreateInsertAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -194,7 +194,7 @@ public void TestBaseStatementBuilderCreateInsertAllWithHints() public void TestBaseStatementBuilderCreateInsertAllForThreeBatchesWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -230,7 +230,7 @@ public void TestBaseStatementBuilderCreateInsertAllForThreeBatchesWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheNonIdentityPrimaryIsNotCovered() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -249,7 +249,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheNonIdentityP public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -266,7 +266,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfThereAreNoField public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -283,7 +283,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsNull( public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -300,7 +300,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsEmpty public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -317,7 +317,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheTableIsWhite public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -336,7 +336,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfThePrimaryIsNot public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -356,7 +356,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheIdentityIsNo public void ThrowExceptionOnBaseStatementBuilderCreateInsertAllIfTheBatchSizeIsGreaterThan1AndTheMultipleStatementExecutionIsNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SingleStatementSupportBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertTest.cs index 00c851e4c..7994110e8 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateInsertTest.cs @@ -11,7 +11,7 @@ public class BaseStatementBuilderCreateInsertTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); } #region SubClasses @@ -24,7 +24,7 @@ private class BaseStatementBuilderDbConnection : CustomDbConnection { } public void TestBaseStatementBuilderCreateInsert() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -49,7 +49,7 @@ public void TestBaseStatementBuilderCreateInsert() public void TestBaseStatementBuilderCreateInsertWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -74,7 +74,7 @@ public void TestBaseStatementBuilderCreateInsertWithQuotedTableSchema() public void TestBaseStatementBuilderCreateInsertWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -99,7 +99,7 @@ public void TestBaseStatementBuilderCreateInsertWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateInsertWithPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -125,7 +125,7 @@ public void TestBaseStatementBuilderCreateInsertWithPrimary() public void TestBaseStatementBuilderCreateInsertWithIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -151,7 +151,7 @@ public void TestBaseStatementBuilderCreateInsertWithIdentity() public void TestBaseStatementBuilderCreateInsertWithPrimaryAndIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -178,7 +178,7 @@ public void TestBaseStatementBuilderCreateInsertWithPrimaryAndIdentity() public void TestBaseStatementBuilderCreateInsertWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -204,7 +204,7 @@ public void TestBaseStatementBuilderCreateInsertWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheNonIdentityPrimaryIsNotCovered() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -222,7 +222,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheNonIdentityPrim public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -238,7 +238,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfThereAreNoFields() public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -254,7 +254,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -270,7 +270,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -286,7 +286,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -304,7 +304,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfThePrimaryIsNotRea public void ThrowExceptionOnBaseStatementBuilderCreateInsertIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxAllTest.cs index f2bdb7d6d..e393676b4 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxAllTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateMaxAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateMaxAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateMaxAll() public void TestBaseStatementBuilderCreateMaxAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -67,7 +67,7 @@ public void TestBaseStatementBuilderCreateMaxAllWithHints() public void TestBaseStatementBuilderCreateMaxAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -87,7 +87,7 @@ public void TestBaseStatementBuilderCreateMaxAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateMaxAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -107,7 +107,7 @@ public void TestBaseStatementBuilderCreateMaxAllWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -123,7 +123,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -139,7 +139,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -155,7 +155,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -170,7 +170,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMaxAllIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxTest.cs index fe5c1b866..2c61b0914 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMaxTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateMaxTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateMax() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateMax() public void TestBaseStatementBuilderCreateMaxWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -70,7 +70,7 @@ public void TestBaseStatementBuilderCreateMaxWithWhereExpression() public void TestBaseStatementBuilderCreateMaxWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -91,7 +91,7 @@ public void TestBaseStatementBuilderCreateMaxWithHints() public void TestBaseStatementBuilderCreateMaxWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -117,7 +117,7 @@ public void TestBaseStatementBuilderCreateMaxWithWhereExpressionAndWithHints() public void TestBaseStatementBuilderCreateMaxWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -137,7 +137,7 @@ public void TestBaseStatementBuilderCreateMaxWithQuotedTableSchema() public void TestBaseStatementBuilderCreateMaxWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -157,7 +157,7 @@ public void TestBaseStatementBuilderCreateMaxWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -189,7 +189,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -205,7 +205,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheTableIsWhitespace( public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -220,7 +220,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMaxIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMaxIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinAllTest.cs index 24d55c479..fb94f89ea 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinAllTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateMinAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateMinAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateMinAll() public void TestBaseStatementBuilderCreateMinAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -67,7 +67,7 @@ public void TestBaseStatementBuilderCreateMinAllWithHints() public void TestBaseStatementBuilderCreateMinAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -87,7 +87,7 @@ public void TestBaseStatementBuilderCreateMinAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateMinAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -107,7 +107,7 @@ public void TestBaseStatementBuilderCreateMinAllWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -123,7 +123,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -139,7 +139,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -155,7 +155,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -170,7 +170,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMinAllIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinTest.cs index ed2576c95..27b9c6fd9 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateMinTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateMinTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateMin() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateMin() public void TestBaseStatementBuilderCreateMinWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -70,7 +70,7 @@ public void TestBaseStatementBuilderCreateMinWithWhereExpression() public void TestBaseStatementBuilderCreateMinWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -91,7 +91,7 @@ public void TestBaseStatementBuilderCreateMinWithHints() public void TestBaseStatementBuilderCreateMinWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -117,7 +117,7 @@ public void TestBaseStatementBuilderCreateMinWithWhereExpressionAndWithHints() public void TestBaseStatementBuilderCreateMinWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -137,7 +137,7 @@ public void TestBaseStatementBuilderCreateMinWithQuotedTableSchema() public void TestBaseStatementBuilderCreateMinWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -157,7 +157,7 @@ public void TestBaseStatementBuilderCreateMinWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -189,7 +189,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -205,7 +205,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheTableIsWhitespace( public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -220,7 +220,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateMinIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateMinIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryAllTest.cs index bb3f215aa..d171194fb 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryAllTest.cs @@ -12,8 +12,8 @@ public class BaseStatementBuilderCreateQueryAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -28,7 +28,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateQueryAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -47,7 +47,7 @@ public void TestBaseStatementBuilderCreateQueryAll() public void TestBaseStatementBuilderCreateQueryAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -66,7 +66,7 @@ public void TestBaseStatementBuilderCreateQueryAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateQueryAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -85,7 +85,7 @@ public void TestBaseStatementBuilderCreateQueryAllWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateQueryAllWithOrderBy() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -109,7 +109,7 @@ public void TestBaseStatementBuilderCreateQueryAllWithOrderBy() public void TestBaseStatementBuilderCreateQueryAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -130,7 +130,7 @@ public void TestBaseStatementBuilderCreateQueryAllWithHints() public void TestBaseStatementBuilderCreateQueryAllWithOrderByAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -156,7 +156,7 @@ public void TestBaseStatementBuilderCreateQueryAllWithOrderByAndWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheOrderFieldIsNotCovered() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheOrderFieldIsN public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -187,7 +187,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfThereAreNoFields public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -202,7 +202,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -217,7 +217,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsEmpty( public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -232,7 +232,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheTableIsWhites public void ThrowExceptionOnBaseStatementBuilderCreateQueryAllIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryTest.cs index cafc5582d..f520f6130 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateQueryTest.cs @@ -12,8 +12,8 @@ public class BaseStatementBuilderCreateQueryTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -28,7 +28,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateQuery() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -47,7 +47,7 @@ public void TestBaseStatementBuilderCreateQuery() public void TestBaseStatementBuilderCreateQueryWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -66,7 +66,7 @@ public void TestBaseStatementBuilderCreateQueryWithQuotedTableSchema() public void TestBaseStatementBuilderCreateQueryWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -85,7 +85,7 @@ public void TestBaseStatementBuilderCreateQueryWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateQueryWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -109,7 +109,7 @@ public void TestBaseStatementBuilderCreateQueryWithWhereExpression() public void TestBaseStatementBuilderCreateQueryWithOrderBy() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -133,7 +133,7 @@ public void TestBaseStatementBuilderCreateQueryWithOrderBy() public void TestBaseStatementBuilderCreateQueryWithTop() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -154,7 +154,7 @@ public void TestBaseStatementBuilderCreateQueryWithTop() public void TestBaseStatementBuilderCreateQueryWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -175,7 +175,7 @@ public void TestBaseStatementBuilderCreateQueryWithHints() public void TestBaseStatementBuilderCreateQueryWithWhereAndWithOrderByAndWithTopAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -206,7 +206,7 @@ public void TestBaseStatementBuilderCreateQueryWithWhereAndWithOrderByAndWithTop public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheOrderFieldIsNotCovered() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -223,7 +223,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheOrderFieldIsNotC public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -237,7 +237,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfThereAreNoFields() public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -252,7 +252,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -267,7 +267,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -282,7 +282,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheTableIsWhitespac public void ThrowExceptionOnBaseStatementBuilderCreateQueryIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumAllTest.cs index cf12951b5..fb659fa30 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumAllTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateSumAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateSumAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateSumAll() public void TestBaseStatementBuilderCreateSumAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -67,7 +67,7 @@ public void TestBaseStatementBuilderCreateSumAllWithHints() public void TestBaseStatementBuilderCreateSumAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -87,7 +87,7 @@ public void TestBaseStatementBuilderCreateSumAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateSumAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -107,7 +107,7 @@ public void TestBaseStatementBuilderCreateSumAllWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -123,7 +123,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -139,7 +139,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -155,7 +155,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -170,7 +170,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateSumAllIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumTest.cs index cd1146c45..961d58f88 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateSumTest.cs @@ -10,8 +10,8 @@ public class BaseStatementBuilderCreateSumTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(NonHintsSupportingBaseStatementBuilderDbConnection), new CustomNonHintsSupportingBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomNonHintsSupportingBaseStatementBuilder(), true); } #region SubClasses @@ -26,7 +26,7 @@ private class NonHintsSupportingBaseStatementBuilderDbConnection : CustomDbConne public void TestBaseStatementBuilderCreateSum() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -46,7 +46,7 @@ public void TestBaseStatementBuilderCreateSum() public void TestBaseStatementBuilderCreateSumWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -70,7 +70,7 @@ public void TestBaseStatementBuilderCreateSumWithWhereExpression() public void TestBaseStatementBuilderCreateSumWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -91,7 +91,7 @@ public void TestBaseStatementBuilderCreateSumWithHints() public void TestBaseStatementBuilderCreateSumWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); @@ -117,7 +117,7 @@ public void TestBaseStatementBuilderCreateSumWithWhereExpressionAndWithHints() public void TestBaseStatementBuilderCreateSumWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var field = new Field("Value"); @@ -137,7 +137,7 @@ public void TestBaseStatementBuilderCreateSumWithQuotedTableSchema() public void TestBaseStatementBuilderCreateSumWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var field = new Field("Value"); @@ -157,7 +157,7 @@ public void TestBaseStatementBuilderCreateSumWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var field = new Field("Value"); @@ -173,7 +173,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var field = new Field("Value"); @@ -189,7 +189,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var field = new Field("Value"); @@ -205,7 +205,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheTableIsWhitespace( public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheFieldIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; @@ -220,7 +220,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateSumIfTheFieldIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateSumIIfTheHintsAreNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(NonHintsSupportingBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var field = new Field("Value"); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateTruncateTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateTruncateTest.cs index 83110447a..46e68f4ba 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateTruncateTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateTruncateTest.cs @@ -10,7 +10,7 @@ public class BaseStatementBuilderCreateTruncateTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); } #region SubClasses @@ -23,7 +23,7 @@ private class BaseStatementBuilderDbConnection : CustomDbConnection { } public void TestBaseStatementBuilderCreateTruncate() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -40,7 +40,7 @@ public void TestBaseStatementBuilderCreateTruncate() public void TestBaseStatementBuilderCreateTruncateWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -57,7 +57,7 @@ public void TestBaseStatementBuilderCreateTruncateWithQuotedTableSchema() public void TestBaseStatementBuilderCreateTruncateWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -74,7 +74,7 @@ public void TestBaseStatementBuilderCreateTruncateWithUnquotedTableSchema() public void ThrowExceptionOnBaseStatementBuilderCreateTruncateIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; @@ -87,7 +87,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateTruncateIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateTruncateIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; @@ -100,7 +100,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateTruncateIfTheTableIsEmpty( public void ThrowExceptionOnBaseStatementBuilderCreateTruncateIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateAllTest.cs index c49a9c330..31b6b4786 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateAllTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateAllTest.cs @@ -11,8 +11,8 @@ public class BaseStatementBuilderCreateUpdateAllTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); - StatementBuilderMapper.Add(typeof(SingleStatementSupportBaseStatementBuilderDbConnection), new CustomSingleStatementSupportBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomSingleStatementSupportBaseStatementBuilder(), true); } #region SubClasses @@ -27,7 +27,7 @@ private class SingleStatementSupportBaseStatementBuilderDbConnection : CustomDbC public void TestBaseStatementBuilderCreateUpdateAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -54,7 +54,7 @@ public void TestBaseStatementBuilderCreateUpdateAll() public void TestBaseStatementBuilderCreateUpdateAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -81,7 +81,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithQuotedTableSchema() public void TestBaseStatementBuilderCreateUpdateAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -108,7 +108,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateUpdateAllWithCoveredPrimaryField() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -135,7 +135,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithCoveredPrimaryField() public void TestBaseStatementBuilderCreateUpdateAllWithCoveredIdentityField() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -163,7 +163,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithCoveredIdentityField() public void TestBaseStatementBuilderCreateUpdateAllWithCoveredPrimaryAsIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -191,7 +191,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithCoveredPrimaryAsIdentity( public void TestBaseStatementBuilderCreateUpdateAllForThreeBatches() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -224,7 +224,7 @@ public void TestBaseStatementBuilderCreateUpdateAllForThreeBatches() public void TestBaseStatementBuilderCreateUpdateAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -252,7 +252,7 @@ public void TestBaseStatementBuilderCreateUpdateAllWithHints() public void TestBaseStatementBuilderCreateUpdateAllForThreeBatchesWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -286,7 +286,7 @@ public void TestBaseStatementBuilderCreateUpdateAllForThreeBatchesWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -306,7 +306,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsNull( public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -326,7 +326,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsEmpty public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -346,7 +346,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheTableIsWhite public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -367,7 +367,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfThePrimaryIsNot public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -388,7 +388,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheIdentityIsNo public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfAnyOfTheQualifierIsNotCovered() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -408,7 +408,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfAnyOfTheQualifi public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfThereAreNoQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -427,7 +427,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfThereAreNoQuali public void ThrowExceptionOnBaseStatementBuilderCreateUpdateAllIfTheBatchSizeIsGreaterThan1AndTheMultipleStatementExecutionIsNotSupported() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SingleStatementSupportBaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateTest.cs index b553345da..5ad4500d8 100644 --- a/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateTest.cs +++ b/RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/StatementBuilders/CreateUpdateTest.cs @@ -10,7 +10,7 @@ public class BaseStatementBuilderCreateUpdateTest [TestInitialize] public void Initialize() { - StatementBuilderMapper.Add(typeof(BaseStatementBuilderDbConnection), new CustomBaseStatementBuilder(), true); + StatementBuilderMapper.Add(new CustomBaseStatementBuilder(), true); } #region SubClasses @@ -23,7 +23,7 @@ private class BaseStatementBuilderDbConnection : CustomDbConnection { } public void TestBaseStatementBuilderCreateUpdate() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -48,7 +48,7 @@ public void TestBaseStatementBuilderCreateUpdate() public void TestBaseStatementBuilderCreateUpdateWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -73,7 +73,7 @@ public void TestBaseStatementBuilderCreateUpdateWithQuotedTableSchema() public void TestBaseStatementBuilderCreateUpdateWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -98,7 +98,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUnquotedTableSchema() public void TestBaseStatementBuilderCreateUpdateWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -127,7 +127,7 @@ public void TestBaseStatementBuilderCreateUpdateWithWhereExpression() public void TestBaseStatementBuilderCreateUpdateWithCoveredPrimaryField() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -157,7 +157,7 @@ public void TestBaseStatementBuilderCreateUpdateWithCoveredPrimaryField() public void TestBaseStatementBuilderCreateUpdateWithCoveredIdentityField() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -187,7 +187,7 @@ public void TestBaseStatementBuilderCreateUpdateWithCoveredIdentityField() public void TestBaseStatementBuilderCreateUpdateWithCoveredPrimaryAsIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -217,7 +217,7 @@ public void TestBaseStatementBuilderCreateUpdateWithCoveredPrimaryAsIdentity() public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndWithUncoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -247,7 +247,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndW public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndWithUncoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -277,7 +277,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndW public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndWithUncoveredPrimaryAsIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -307,7 +307,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionAndW public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionButWithCoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -337,7 +337,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionButW public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionButWithCoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -367,7 +367,7 @@ public void TestBaseStatementBuilderCreateUpdateWithUncoveredWhereExpressionButW public void TestBaseStatementBuilderCreateUpdateWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -393,7 +393,7 @@ public void TestBaseStatementBuilderCreateUpdateWithHints() public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -411,7 +411,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsNull() public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -429,7 +429,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsEmpty() public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -447,7 +447,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheTableIsWhitespa public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -466,7 +466,7 @@ public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfThePrimaryIsNotRea public void ThrowExceptionOnBaseStatementBuilderCreateUpdateIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(BaseStatementBuilderDbConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs index 6a5eb204b..2a0729db3 100644 --- a/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs +++ b/RepoDb.Core/RepoDb/Extensions/DbConnectionExtension.cs @@ -1785,7 +1785,7 @@ public static IStatementBuilder GetStatementBuilder(this IDbConnection connectio } // Get the setting - var statementBuilder = StatementBuilderMapper.Get(connection.GetType()); + var statementBuilder = StatementBuilderMapper.Get(connection); // Check the presence if (statementBuilder == null) diff --git a/RepoDb.Core/RepoDb/Mappers/StatementBuilderMapper.cs b/RepoDb.Core/RepoDb/Mappers/StatementBuilderMapper.cs index dfd5ac07b..edf8bfd06 100644 --- a/RepoDb.Core/RepoDb/Mappers/StatementBuilderMapper.cs +++ b/RepoDb.Core/RepoDb/Mappers/StatementBuilderMapper.cs @@ -1,59 +1,40 @@ using RepoDb.Exceptions; -using RepoDb.Extensions; using RepoDb.Interfaces; using System; using System.Collections.Concurrent; -using System.Data.Common; +using System.Data; namespace RepoDb { /// - /// A class that is being used to map the type of into an instance of object. + /// A class that is being used to map the type of into an instance of object. /// public static class StatementBuilderMapper { #region Privates - private static readonly ConcurrentDictionary maps = new(); + private static readonly ConcurrentDictionary maps = new(); #endregion #region Methods - - /* - * Add - */ - + /* * Add */ /// - /// Adds a mapping between the type of and an instance of object. + /// Adds a mapping between the type of and an instance of object. /// - /// The type of object. + /// The type of object. /// The instance of object to mapped to. /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. public static void Add(IStatementBuilder statementBuilder, bool @override) - where TDbConnection : DbConnection => - Add(typeof(TDbConnection), statementBuilder, @override); - - /// - /// Adds a mapping between the type of and an instance of object. - /// - /// The type of object. - /// The statement builder to be mapped. - /// Set to true if to override the existing mapping, otherwise an exception will be thrown if the mapping is already present. - public static void Add(Type connectionType, - IStatementBuilder statementBuilder, - bool @override = false) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - // Variables for cache - var key = GenerateHashCode(connectionType); + var key = typeof(TDbConnection); // Try get the mappings if (maps.TryGetValue(key, out var existing)) @@ -66,7 +47,7 @@ public static class StatementBuilderMapper else { // Throw an exception - throw new MappingExistsException($"The statement builder to provider '{connectionType.FullName}' already exists."); + throw new MappingExistsException($"The statement builder to provider '{key.FullName}' already exists."); } } else @@ -81,26 +62,31 @@ public static class StatementBuilderMapper */ /// - /// Gets the mapped from the type of . + /// Gets the mapped from the type of . /// - /// The type of . + /// The type of . /// An instance of defined on the mapping. public static IStatementBuilder Get() - where TDbConnection : DbConnection => - Get(typeof(TDbConnection)); + where TDbConnection : IDbConnection + { + // get the value + maps.TryGetValue(typeof(TDbConnection), out var value); + + // Return the value + return value; + } /// - /// Gets the mapped from the type of . + /// Gets the mapped from the type of . /// - /// The type of . + /// The type of . + /// The instance of . /// An instance of defined on the mapping. - public static IStatementBuilder Get(Type connectionType) + public static IStatementBuilder Get(TDbConnection connection) + where TDbConnection : IDbConnection { - // Guard the type - Guard(connectionType); - // get the value - maps.TryGetValue(GenerateHashCode(connectionType), out var value); + maps.TryGetValue(connection.GetType(), out var value); // Return the value return value; @@ -111,28 +97,17 @@ public static IStatementBuilder Get(Type connectionType) */ /// - /// Removes the mapping between the type of and an instance of object. + /// Removes the mapping between the type of and an instance of object. /// - /// The type of . + /// The type of . public static void Remove() - where TDbConnection : DbConnection => - Remove(typeof(TDbConnection)); - - /// - /// Removes an existing mapping between the type of and an instance of object. - /// - /// The type of object. - public static void Remove(Type connectionType) + where TDbConnection : IDbConnection { - // Check the presence - GuardPresence(connectionType); - // Variables for cache - var key = GenerateHashCode(connectionType); - var existing = (IStatementBuilder)null; + var key = typeof(TDbConnection); - // Try to remove the value - maps.TryRemove(key, out existing); + // Try get the the value + maps.TryRemove(key, out _); } /* @@ -146,40 +121,5 @@ public static void Remove(Type connectionType) maps.Clear(); #endregion - - #region Helpers - - /// - /// Generates a hashcode for caching. - /// - /// The type of the data entity. - /// The generated hashcode. - private static int GenerateHashCode(Type type) => - TypeExtension.GenerateHashCode(type); - - /// - /// Throws an exception if null. - /// - private static void GuardPresence(Type type) - { - if (type == null) - { - throw new NullReferenceException("Statement builder type."); - } - } - - /// - /// Throws an exception if the type is not a subclass of type . - /// - private static void Guard(Type type) - { - GuardPresence(type); - if (type.IsSubclassOf(StaticType.DbConnection) == false) - { - throw new InvalidTypeException($"Type must be a subclass of '{StaticType.DbConnection}'."); - } - } - - #endregion } } diff --git a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs index ab37c3236..f666e3465 100644 --- a/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs +++ b/RepoDb.MySql/RepoDb.MySql/MySqlBootstrap.cs @@ -39,7 +39,7 @@ public static void Initialize() DbHelperMapper.Add(new MySqlDbHelper(), true); // Map the Statement Builder - StatementBuilderMapper.Add(typeof(MySqlConnection), new MySqlStatementBuilder(), true); + StatementBuilderMapper.Add(new MySqlStatementBuilder(), true); // Set the flag IsInitialized = true; diff --git a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs index e339d1838..54a83d937 100644 --- a/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs +++ b/RepoDb.MySqlConnector/RepoDb.MySqlConnector/MySqlBootstrap.cs @@ -39,7 +39,7 @@ public static void Initialize() DbHelperMapper.Add(new MySqlConnectorDbHelper(), true); // Map the Statement Builder - StatementBuilderMapper.Add(typeof(MySqlConnection), new MySqlConnectorStatementBuilder(), true); + StatementBuilderMapper.Add(new MySqlConnectorStatementBuilder(), true); // Set the flag IsInitialized = true; diff --git a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs index fca9c4943..a77265bac 100644 --- a/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs +++ b/RepoDb.PostgreSql/RepoDb.PostgreSql/PostgreSqlBootstrap.cs @@ -39,7 +39,7 @@ public static void Initialize() DbHelperMapper.Add(new PostgreSqlDbHelper(), true); // Map the Statement Builder - StatementBuilderMapper.Add(typeof(NpgsqlConnection), new PostgreSqlStatementBuilder(), true); + StatementBuilderMapper.Add(new PostgreSqlStatementBuilder(), true); // Set the flag IsInitialized = true; diff --git a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs index af4d9e5e9..169a45fd4 100644 --- a/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs +++ b/RepoDb.SqLite/RepoDb.SqLite/SqLiteBootstrap.cs @@ -44,7 +44,7 @@ public static void Initialize() DbHelperMapper.Add(new SqLiteDbHelper(sdsDbSetting, new SdsSqLiteDbTypeNameToClientTypeResolver()), true); // Map the Statement Builder - StatementBuilderMapper.Add(typeof(SQLiteConnection), new SqLiteStatementBuilder(sdsDbSetting, + StatementBuilderMapper.Add(new SqLiteStatementBuilder(sdsDbSetting, new SqLiteConvertFieldResolver(), new ClientTypeToAverageableClientTypeResolver()), true); @@ -60,7 +60,7 @@ public static void Initialize() DbHelperMapper.Add(new SqLiteDbHelper(mdsDbSetting, new MdsSqLiteDbTypeNameToClientTypeResolver()), true); // Map the Statement Builder - StatementBuilderMapper.Add(typeof(SqliteConnection), new SqLiteStatementBuilder(mdsDbSetting, + StatementBuilderMapper.Add(new SqLiteStatementBuilder(mdsDbSetting, new SqLiteConvertFieldResolver(), new ClientTypeToAverageableClientTypeResolver()), true); diff --git a/RepoDb.SqlServer/RepoDb.SqlServer.UnitTests/StatementBuilderTest.cs b/RepoDb.SqlServer/RepoDb.SqlServer.UnitTests/StatementBuilderTest.cs index ce8ee307d..79c842a0c 100644 --- a/RepoDb.SqlServer/RepoDb.SqlServer.UnitTests/StatementBuilderTest.cs +++ b/RepoDb.SqlServer/RepoDb.SqlServer.UnitTests/StatementBuilderTest.cs @@ -21,7 +21,7 @@ public void Initialize() public void TestSqlServerStatementBuilderCreateBatchQueryFirstBatch() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -54,7 +54,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryFirstBatch() public void TestSqlServerStatementBuilderCreateBatchQuerySecondBatch() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -87,7 +87,7 @@ public void TestSqlServerStatementBuilderCreateBatchQuerySecondBatch() public void TestSqlServerStatementBuilderCreateBatchQueryWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -121,7 +121,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryWithHints() public void TestSqlServerStatementBuilderCreateBatchQueryWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -154,7 +154,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateBatchQueryWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -187,7 +187,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryWithUnquotedTableSchema public void TestSqlServerStatementBuilderCreateBatchQueryWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -222,7 +222,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryWithWhereExpression() public void TestSqlServerStatementBuilderCreateBatchQueryWithWhereExpressionUniqueField() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -257,7 +257,7 @@ public void TestSqlServerStatementBuilderCreateBatchQueryWithWhereExpressionUniq public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -276,7 +276,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableI public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -295,7 +295,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableI public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -314,7 +314,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheTableI public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheFieldsAreNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var orderBy = OrderField.Parse(new { Field1 = Order.Ascending }); @@ -333,7 +333,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheFields public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfThereAreNoOrderFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -352,7 +352,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfThereAreN public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfThePageIsLessThanZero() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -372,7 +372,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfThePageIs public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheRowsPerBatchIsLessThanOne() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2" }); @@ -395,7 +395,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateBatchQueryIfTheRowsPe public void TestSqlServerStatementBuilderCreateCountAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -413,7 +413,7 @@ public void TestSqlServerStatementBuilderCreateCountAll() public void TestSqlServerStatementBuilderCreateCountAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var hints = "WITH (NOLOCK)"; @@ -432,7 +432,7 @@ public void TestSqlServerStatementBuilderCreateCountAllWithHints() public void TestSqlServerStatementBuilderCreateCountAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -450,7 +450,7 @@ public void TestSqlServerStatementBuilderCreateCountAllWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateCountAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -472,7 +472,7 @@ public void TestSqlServerStatementBuilderCreateCountAllWithUnquotedTableSchema() public void TestSqlServerStatementBuilderCreateCount() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; @@ -490,7 +490,7 @@ public void TestSqlServerStatementBuilderCreateCount() public void TestSqlServerStatementBuilderCreateCountWithWhereExpression() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -512,7 +512,7 @@ public void TestSqlServerStatementBuilderCreateCountWithWhereExpression() public void TestSqlServerStatementBuilderCreateCountWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var hints = "WITH (NOLOCK)"; @@ -531,7 +531,7 @@ public void TestSqlServerStatementBuilderCreateCountWithHints() public void TestSqlServerStatementBuilderCreateCountWithWhereExpressionAndWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var where = new QueryGroup(new QueryField("Id", 1)); @@ -555,7 +555,7 @@ public void TestSqlServerStatementBuilderCreateCountWithWhereExpressionAndWithHi public void TestSqlServerStatementBuilderCreateCountWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; @@ -573,7 +573,7 @@ public void TestSqlServerStatementBuilderCreateCountWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateCountWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; @@ -595,7 +595,7 @@ public void TestSqlServerStatementBuilderCreateCountWithUnquotedTableSchema() public void TestSqlServerStatementBuilderCreateInsertAllWithIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -623,7 +623,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithIdentity() public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityAsBigInt() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -651,7 +651,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityAsBigInt() public void TestSqlServerStatementBuilderCreateInsertAllWithPrimaryAndIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -680,7 +680,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithPrimaryAndIdentity() public void TestSqlServerStatementBuilderCreateInsertAllWithPrimaryAndIdentityAsBigInt() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -709,7 +709,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithPrimaryAndIdentityAs public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityForThreeBatches() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -747,7 +747,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityForThreeBatc public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -776,7 +776,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityWithHints() public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityForThreeBatchesWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -819,7 +819,7 @@ public void TestSqlServerStatementBuilderCreateInsertAllWithIdentityForThreeBatc public void TestSqlServerStatementBuilderCreateInsert() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -845,7 +845,7 @@ public void TestSqlServerStatementBuilderCreateInsert() public void TestSqlServerStatementBuilderCreateInsertWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -871,7 +871,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateInsertWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -897,7 +897,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithUnquotedTableSchema() public void TestSqlServerStatementBuilderCreateInsertWithPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -924,7 +924,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithPrimary() public void TestSqlServerStatementBuilderCreateInsertWithIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -951,7 +951,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithIdentity() public void TestSqlServerStatementBuilderCreateInsertWithIdentityAsBigInt() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -978,7 +978,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithIdentityAsBigInt() public void TestSqlServerStatementBuilderCreateInsertWithPrimaryAndIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1006,7 +1006,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithPrimaryAndIdentity() public void TestSqlServerStatementBuilderCreateInsertWithPrimaryAndIdentityAsBigInt() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1034,7 +1034,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithPrimaryAndIdentityAsBig public void TestSqlServerStatementBuilderCreateInsertWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1065,7 +1065,7 @@ public void TestSqlServerStatementBuilderCreateInsertWithHints() public void TestSqlServerStatementBuilderCreateMergeAll() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1097,7 +1097,7 @@ public void TestSqlServerStatementBuilderCreateMergeAll() public void TestSqlServerStatementBuilderCreateMergeAllWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1129,7 +1129,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateMergeAllWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1161,7 +1161,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithUnquotedTableSchema() public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1195,7 +1195,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimary() public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryAsIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1230,7 +1230,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryAsIdent public void TestSqlServerStatementBuilderCreateMergeAllWithUncoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1264,7 +1264,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithUncoveredPrimary() public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1298,7 +1298,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredIdentity() public void TestSqlServerStatementBuilderCreateMergeAllWithUncoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1332,7 +1332,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithUncoveredIdentity() public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryButWithoutQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1365,7 +1365,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryButWith public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryAndWithCoveredIdentityButWithoutQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1399,7 +1399,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithCoveredPrimaryAndWith public void TestSqlServerStatementBuilderCreateMergeAllWithIdentityForThreeBatches() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1451,7 +1451,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithIdentityForThreeBatch public void TestSqlServerStatementBuilderCreateMergeAllWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1484,7 +1484,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithHints() public void TestSqlServerStatementBuilderCreateMergeAllWithIdentityForThreeBatchesWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1537,7 +1537,7 @@ public void TestSqlServerStatementBuilderCreateMergeAllWithIdentityForThreeBatch public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var qualifiers = Field.From("Id"); @@ -1556,7 +1556,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThereAreNoF public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThereAreNoPrimaryAndNoQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1575,7 +1575,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThereAreNoP public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheQualifiersAreNotPresentAtTheGivenFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1595,7 +1595,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheQualifie public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThePrimaryAsQualifierIsNotPresentAtTheGivenFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1615,7 +1615,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThePrimaryA public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1635,7 +1635,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsN public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1655,7 +1655,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsE public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1675,7 +1675,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheTableIsW public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1695,7 +1695,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfThePrimaryI public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1720,7 +1720,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeAllIfTheIdentity public void TestSqlServerStatementBuilderCreateMerge() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1751,7 +1751,7 @@ public void TestSqlServerStatementBuilderCreateMerge() public void TestSqlServerStatementBuilderCreateMergeWithQuotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "[dbo].[Table]"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1782,7 +1782,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithQuotedTableSchema() public void TestSqlServerStatementBuilderCreateMergeWithUnquotedTableSchema() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "dbo.Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1813,7 +1813,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithUnquotedTableSchema() public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1846,7 +1846,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimary() public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryAsIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1880,7 +1880,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryAsIdentity public void TestSqlServerStatementBuilderCreateMergeWithUncoveredPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1913,7 +1913,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithUncoveredPrimary() public void TestSqlServerStatementBuilderCreateMergeWithCoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1946,7 +1946,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithCoveredIdentity() public void TestSqlServerStatementBuilderCreateMergeWithUncoveredIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -1979,7 +1979,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithUncoveredIdentity() public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryButWithoutQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2011,7 +2011,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryButWithout public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryAndWithCoveredIdentityButWithoutQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2044,7 +2044,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithCoveredPrimaryAndWithCov public void TestSqlServerStatementBuilderCreateMergeWithHints() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2076,7 +2076,7 @@ public void TestSqlServerStatementBuilderCreateMergeWithHints() public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThereAreNoFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var qualifiers = Field.From("Id"); @@ -2094,7 +2094,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThereAreNoFiel public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThereAreNoPrimaryAndNoQualifiers() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2112,7 +2112,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThereAreNoPrim public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheQualifiersAreNotPresentAtTheGivenFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2131,7 +2131,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheQualifiersA public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThePrimaryAsQualifierIsNotPresentAtTheGivenFields() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2150,7 +2150,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThePrimaryAsQu public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsNull() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = (string)null; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2169,7 +2169,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsNull public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsEmpty() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = ""; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2188,7 +2188,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsEmpt public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsWhitespace() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = " "; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2207,7 +2207,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheTableIsWhit public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThePrimaryIsNotReallyAPrimary() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); @@ -2226,7 +2226,7 @@ public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfThePrimaryIsNo public void ThrowExceptionOnSqlServerStatementBuilderCreateMergeIfTheIdentityIsNotReallyAnIdentity() { // Setup - var statementBuilder = StatementBuilderMapper.Get(typeof(SqlConnection)); + var statementBuilder = StatementBuilderMapper.Get(); var queryBuilder = new QueryBuilder(); var tableName = "Table"; var fields = Field.From(new[] { "Field1", "Field2", "Field3" }); diff --git a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs index e3dc47f50..14917f0d3 100644 --- a/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs +++ b/RepoDb.SqlServer/RepoDb.SqlServer/SqlServerBootstrap.cs @@ -43,8 +43,8 @@ public static void Initialize() // Map the Statement Builder var statementBuilder = new SqlServerStatementBuilder(dbSetting); - StatementBuilderMapper.Add(typeof(Microsoft.Data.SqlClient.SqlConnection), statementBuilder, true); - StatementBuilderMapper.Add(typeof(System.Data.SqlClient.SqlConnection), statementBuilder, true); + StatementBuilderMapper.Add(statementBuilder, true); + StatementBuilderMapper.Add(statementBuilder, true); // Set the flag IsInitialized = true;