#11 - ISqlGenerator shouldn't require a TRecord generic type parameter (

closes #11)
Yuck · Aug 2, 2023 · bad57b3 · bad57b3
1 parent 6e09fdf
commit bad57b3
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 49 deletions.
diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj b/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Product>YuckQi.Data</Product>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for Amazon DynamoDB databases.</Description>
+    <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj b/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj
@@ -5,9 +5,9 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Product>YuckQi.Data</Product>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for MongoDB databases.</Description>
+    <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj b/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Product>YuckQi.Data</Product>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for a in-memory "database" (ConcurrentDictionary), ideal for rapid development without external dependencies.</Description>
+    <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs
@@ -11,16 +11,16 @@ public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<T
 {
     public RetrievalHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class RetrievalHandler<TEntity, TIdentifier, TScope, TRecord> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs
@@ -11,16 +11,16 @@ public class SearchHandler<TEntity, TIdentifier, TScope> : SearchHandler<TEntity
 {
     public SearchHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public SearchHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class SearchHandler<TEntity, TIdentifier, TScope, TRecord> : SearchHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public SearchHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/SqlGenerator.cs b/src/YuckQi.Data.Sql.Dapper.MySql/SqlGenerator.cs
@@ -8,7 +8,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.MySql;
 
-public class SqlGenerator<TRecord> : ISqlGenerator<TRecord>
+public class SqlGenerator<TRecord> : ISqlGenerator
 {
     private static readonly String DefaultTableName = typeof(TRecord).Name;
     private static readonly TableAttribute? TableAttribute = typeof(TRecord).GetCustomAttribute(typeof(TableAttribute)) as TableAttribute;

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj b/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for MySQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/RetrievalHandler.cs
@@ -11,16 +11,16 @@ public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<T
 {
     public RetrievalHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class RetrievalHandler<TEntity, TIdentifier, TScope, TRecord> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.Oracle/Handlers/SearchHandler.cs
@@ -11,16 +11,16 @@ public class SearchHandler<TEntity, TIdentifier, TScope> : SearchHandler<TEntity
 {
     public SearchHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public SearchHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class SearchHandler<TEntity, TIdentifier, TScope, TRecord> : SearchHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public SearchHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/SqlGenerator.cs b/src/YuckQi.Data.Sql.Dapper.Oracle/SqlGenerator.cs
@@ -8,7 +8,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.Oracle;
 
-public class SqlGenerator<TRecord> : ISqlGenerator<TRecord>
+public class SqlGenerator<TRecord> : ISqlGenerator
 {
     private static readonly String DefaultTableName = typeof(TRecord).Name;
     private static readonly TableAttribute? TableAttribute = typeof(TRecord).GetCustomAttribute(typeof(TableAttribute)) as TableAttribute;

diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj b/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj
@@ -3,10 +3,10 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Description>An implementation of YuckQi.Data for Oracle databases using Dapper and SimpleCRUD.</Description>
-    <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Kevin J Lambert</Authors>
+    <Version>6.3.2</Version>
+    <Description>An implementation of YuckQi.Data for Oracle databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/RetrievalHandler.cs
@@ -11,16 +11,16 @@ public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<T
 {
     public RetrievalHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public RetrievalHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class RetrievalHandler<TEntity, TIdentifier, TScope, TRecord> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public RetrievalHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public RetrievalHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.SqlServer/Handlers/SearchHandler.cs
@@ -11,16 +11,16 @@ public class SearchHandler<TEntity, TIdentifier, TScope> : SearchHandler<TEntity
 {
     public SearchHandler() : this(new SqlGenerator<TEntity>()) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
+    public SearchHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.Default) { }
 
-    public SearchHandler(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class SearchHandler<TEntity, TIdentifier, TScope, TRecord> : SearchHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public SearchHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IMapper mapper) : this(sqlGenerator, DbTypeMap.Default, mapper) { }
 
-    public SearchHandler(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
+    public SearchHandler(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(sqlGenerator, dbTypeMap, mapper) { }
 }
diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/SqlGenerator.cs b/src/YuckQi.Data.Sql.Dapper.SqlServer/SqlGenerator.cs
@@ -8,7 +8,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.SqlServer;
 
-public class SqlGenerator<TRecord> : ISqlGenerator<TRecord>
+public class SqlGenerator<TRecord> : ISqlGenerator
 {
     private const String DefaultSchemaName = "dbo";
     private static readonly String DefaultTableName = typeof(TRecord).Name;

diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj b/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for MSSQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper/Abstract/ISqlGenerator.cs b/src/YuckQi.Data.Sql.Dapper/Abstract/ISqlGenerator.cs
@@ -4,7 +4,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.Abstract;
 
-public interface ISqlGenerator<TRecord> // TODO: Do I need TRecord? Check projects that use this...there should only be a single generator registered and I don't think implementations need the constraint?
+public interface ISqlGenerator
 {
     String GenerateCountQuery(IReadOnlyCollection<FilterCriteria> parameters);
 

diff --git a/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/RetrievalHandlerBase.cs b/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/RetrievalHandlerBase.cs
@@ -10,15 +10,15 @@ namespace YuckQi.Data.Sql.Dapper.Handlers.Abstract;
 
 public class RetrievalHandlerBase<TEntity, TIdentifier, TScope> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
-    protected RetrievalHandlerBase(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    protected RetrievalHandlerBase(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public class RetrievalHandlerBase<TEntity, TIdentifier, TScope, TRecord> : Data.Handlers.Abstract.RetrievalHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     private readonly IReadOnlyDictionary<Type, DbType> _dbTypeMap;
-    private readonly ISqlGenerator<TRecord> _sqlGenerator;
+    private readonly ISqlGenerator _sqlGenerator;
 
-    protected RetrievalHandlerBase(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(mapper)
+    protected RetrievalHandlerBase(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(mapper)
     {
         _sqlGenerator = sqlGenerator ?? throw new ArgumentNullException(nameof(sqlGenerator));
         _dbTypeMap = dbTypeMap;

diff --git a/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/SearchHandlerBase.cs b/src/YuckQi.Data.Sql.Dapper/Handlers/Abstract/SearchHandlerBase.cs
@@ -12,15 +12,15 @@ namespace YuckQi.Data.Sql.Dapper.Handlers.Abstract;
 
 public abstract class SearchHandlerBase<TEntity, TIdentifier, TScope> : SearchHandlerBase<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
-    protected SearchHandlerBase(ISqlGenerator<TEntity> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
+    protected SearchHandlerBase(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap) : base(sqlGenerator, dbTypeMap, null) { }
 }
 
 public abstract class SearchHandlerBase<TEntity, TIdentifier, TScope, TRecord> : Data.Handlers.Abstract.SearchHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     private readonly IReadOnlyDictionary<Type, DbType> _dbTypeMap;
-    private readonly ISqlGenerator<TRecord> _sqlGenerator;
+    private readonly ISqlGenerator _sqlGenerator;
 
-    protected SearchHandlerBase(ISqlGenerator<TRecord> sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(mapper)
+    protected SearchHandlerBase(ISqlGenerator sqlGenerator, IReadOnlyDictionary<Type, DbType> dbTypeMap, IMapper? mapper) : base(mapper)
     {
         _sqlGenerator = sqlGenerator ?? throw new ArgumentNullException(nameof(sqlGenerator));
         _dbTypeMap = dbTypeMap;

diff --git a/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj b/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj b/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Entity Framework.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data/YuckQi.Data.csproj b/src/YuckQi.Data/YuckQi.Data.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.1</Version>
+    <Version>6.3.2</Version>
     <Description>A .NET library of lightweight data access handlers which can be used to compose repositories and domain services.</Description>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>