Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typed mappers #848

Merged
merged 3 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public class ClassHandlerInvocationTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(ClassHandlerConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<ClassHandlerConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<ClassHandlerConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<ClassHandlerConnection>(new CustomStatementBuilder(), true);
}

[TestCleanup]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ public class ClassHandlerPrecedenceTest
public void Initialize()
{
// For Non-Attributed Entity
DbSettingMapper.Add(typeof(ClassHandlerConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(ClassHandlerConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(ClassHandlerConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<ClassHandlerConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<ClassHandlerConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<ClassHandlerConnection>(new CustomStatementBuilder(), true);

// For Attributed Entity
DbSettingMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(ClassHandlerForEntityWithAttributeConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<ClassHandlerForEntityWithAttributeConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<ClassHandlerForEntityWithAttributeConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<ClassHandlerForEntityWithAttributeConnection>(new CustomStatementBuilder(), true);
}

[TestCleanup]
Expand Down
40 changes: 20 additions & 20 deletions RepoDb.Core/RepoDb.Tests/RepoDb.UnitTests/DbHelpers/DbHelperTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class DbHelperTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(DbHelperDbConnection), new CustomDbSetting(), true);
StatementBuilderMapper.Add(typeof(DbHelperDbConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<DbHelperDbConnection>(new CustomDbSetting(), true);
StatementBuilderMapper.Add<DbHelperDbConnection>(new CustomStatementBuilder(), true);
}

#region SubClasses
Expand Down Expand Up @@ -66,7 +66,7 @@ public void TestDbHelperForBatchQuery()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.BatchQuery<DbHelperDataEntity>(0,
Expand All @@ -92,7 +92,7 @@ public void TestDbHelperForInsert()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Insert<DbHelperDataEntity>(new DbHelperDataEntity { Id = 1, Name = "Name" });
Expand All @@ -115,7 +115,7 @@ public void TestDbHelperForInsertAll()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.InsertAll<DbHelperDataEntity>(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } });
Expand All @@ -138,7 +138,7 @@ public void TestDbHelperForMerge()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Merge<DbHelperDataEntity>(new DbHelperDataEntity { Id = 1, Name = "Name" });
Expand All @@ -161,7 +161,7 @@ public void TestDbHelperForMergeAll()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.MergeAll<DbHelperDataEntity>(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } });
Expand All @@ -184,7 +184,7 @@ public void TestDbHelperForQuery()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Query<DbHelperDataEntity>((object)null);
Expand All @@ -207,7 +207,7 @@ public void TestDbHelperForQueryAll()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.QueryAll<DbHelperDataEntity>();
Expand All @@ -230,7 +230,7 @@ public void TestDbHelperForUpdate()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Update<DbHelperDataEntity>(new DbHelperDataEntity { Id = 1, Name = "Name" });
Expand All @@ -253,7 +253,7 @@ public void TestDbHelperForUpdateAll()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.UpdateAll<DbHelperDataEntity>(new[] { new DbHelperDataEntity { Id = 1, Name = "Name" } });
Expand All @@ -280,7 +280,7 @@ public void TestDbHelperForBatchQueryViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.BatchQuery(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -307,7 +307,7 @@ public void TestDbHelperForInsertViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Insert(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -331,7 +331,7 @@ public void TestDbHelperForInsertAllViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.InsertAll(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -355,7 +355,7 @@ public void TestDbHelperForMergeViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Merge(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -379,7 +379,7 @@ public void TestDbHelperForMergeAllViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.MergeAll(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -403,7 +403,7 @@ public void TestDbHelperForQueryViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Query(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -427,7 +427,7 @@ public void TestDbHelperForQueryAllViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.QueryAll(ClassMappedNameCache.Get<DbHelperDataEntity>());
Expand All @@ -450,7 +450,7 @@ public void TestDbHelperForUpdateViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.Update(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand All @@ -474,7 +474,7 @@ public void TestDbHelperForUpdateAllViaTableName()
// Act
CommandTextCache.Flush();
DbFieldCache.Flush();
DbHelperMapper.Add(typeof(DbHelperDbConnection), dbHelper.Object, true);
DbHelperMapper.Add<DbHelperDbConnection>(dbHelper.Object, true);

// Act
connection.UpdateAll(ClassMappedNameCache.Get<DbHelperDataEntity>(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private class PrivateDbConnection : CustomDbConnection { }
[TestMethod]
public void TestSqlConnectionExecuteQueryViaDynamicsWithEmptyArrayParameters()
{
DbSettingMapper.Add(typeof(PrivateDbConnection), new CustomDbSetting(), true);
DbSettingMapper.Add<PrivateDbConnection>(new CustomDbSetting(), true);
using (var connection = new PrivateDbConnection())
{
var sql = @"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public class ICacheForDbConnectionTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(CacheDbConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(CacheDbConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(CacheDbConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<CacheDbConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<CacheDbConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<CacheDbConnection>(new CustomStatementBuilder(), true);
}

#region SubClasses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class IStatementBuilderForDbConnectionTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(StatementBuilderDbConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(StatementBuilderDbConnection), new CustomDbHelper(), true);
DbSettingMapper.Add<StatementBuilderDbConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<StatementBuilderDbConnection>(new CustomDbHelper(), true);
}

#region SubClasses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class ITraceForDbConnectionTest
[ClassInitialize]
public static void ClassInitialize(TestContext context)
{
DbSettingMapper.Add(typeof(TraceDbConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(TraceDbConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(TraceDbConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<TraceDbConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<TraceDbConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<TraceDbConnection>(new CustomStatementBuilder(), true);
}

#region SubClasses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private class PrivateDbConnection : CustomDbConnection { }
public void Initialize()
{
Cleanup();
DbSettingMapper.Add(typeof(PrivateDbConnection), new CustomDbSetting(), true);
DbSettingMapper.Add<PrivateDbConnection>(new CustomDbSetting(), true);
}

[TestCleanup]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public class PropertyHandlerInvocationTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(PropertyHandlerConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<PropertyHandlerConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<PropertyHandlerConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<PropertyHandlerConnection>(new CustomStatementBuilder(), true);
}

[TestCleanup]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public class PropertyHandlerPrecedenceTest
[TestInitialize]
public void Initialize()
{
DbSettingMapper.Add(typeof(PropertyHandlerConnection), new CustomDbSetting(), true);
DbHelperMapper.Add(typeof(PropertyHandlerConnection), new CustomDbHelper(), true);
StatementBuilderMapper.Add(typeof(PropertyHandlerConnection), new CustomStatementBuilder(), true);
DbSettingMapper.Add<PropertyHandlerConnection>(new CustomDbSetting(), true);
DbHelperMapper.Add<PropertyHandlerConnection>(new CustomDbHelper(), true);
StatementBuilderMapper.Add<PropertyHandlerConnection>(new CustomStatementBuilder(), true);
}

[TestCleanup]
Expand Down