identifiers don't need to be structs

Yuck · Jun 27, 2024 · cbf135b · cbf135b
1 parent ab9fef7
commit cbf135b
Show file tree

Hide file tree

Showing 24 changed files with 46 additions and 59 deletions.
diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/CreationHandler.cs b/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/CreationHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Amazon.DynamoDBv2.DataModel;
+using Amazon.DynamoDBv2.DataModel;
 using CSharpFunctionalExtensions;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
@@ -13,7 +8,7 @@
 
 namespace YuckQi.Data.DocumentDb.DynamoDb.Handlers;
 
-public class CreationHandler<TEntity, TIdentifier, TScope> : CreationHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDynamoDBContext?
+public class CreationHandler<TEntity, TIdentifier, TScope> : CreationHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : IEquatable<TIdentifier> where TScope : IDynamoDBContext?
 {
     public CreationHandler() : this(null) { }
 

diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/PhysicalDeletionHandler.cs b/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/PhysicalDeletionHandler.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Amazon.DynamoDBv2.DataModel;
+using Amazon.DynamoDBv2.DataModel;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Domain.Entities.Abstract;
 using YuckQi.Extensions.Mapping.Abstractions;
 
 namespace YuckQi.Data.DocumentDb.DynamoDb.Handlers;
 
-public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope> : PhysicalDeletionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDynamoDBContext?
+public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope> : PhysicalDeletionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDynamoDBContext?
 {
     public PhysicalDeletionHandler() : base(null) { }
 }

diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/RetrievalHandler.cs
@@ -8,7 +8,7 @@
 
 namespace YuckQi.Data.DocumentDb.DynamoDb.Handlers;
 
-public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDynamoDBContext?
+public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDynamoDBContext?
 {
     public RetrievalHandler(Func<TIdentifier, Primitive> hashKeyValueFactory) : base(hashKeyValueFactory, null) { }
 

diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/RevisionHandler.cs b/src/YuckQi.Data.DocumentDb.DynamoDb/Handlers/RevisionHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Amazon.DynamoDBv2.DataModel;
+using Amazon.DynamoDBv2.DataModel;
 using YuckQi.Data.Handlers.Abstract;
 using YuckQi.Data.Handlers.Options;
 using YuckQi.Domain.Aspects.Abstract;
@@ -12,7 +7,7 @@
 
 namespace YuckQi.Data.DocumentDb.DynamoDb.Handlers;
 
-public class RevisionHandler<TEntity, TIdentifier, TScope> : RevisionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDynamoDBContext?
+public class RevisionHandler<TEntity, TIdentifier, TScope> : RevisionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : IEquatable<TIdentifier> where TScope : IDynamoDBContext?
 {
     public RevisionHandler() : this(null) { }
 

diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj b/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.4.2</Version>
+    <Version>6.5.0</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>

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Extensions/DocumentModelExtensions.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Extensions/DocumentModelExtensions.cs
@@ -18,7 +18,7 @@ public static class DocumentModelExtensions
 
     public static String? GetDatabaseName(this Type? type) => type != null ? DatabaseNameByType.GetOrAdd(type, identifier => GetDatabaseAttribute(identifier).Name) : null;
 
-    public static TIdentifier GetIdentifier<TDocument, TIdentifier>(this TDocument document) where TIdentifier : struct
+    public static TIdentifier? GetIdentifier<TDocument, TIdentifier>(this TDocument document)
     {
         if (document == null)
             return default;
@@ -31,7 +31,7 @@ public static TIdentifier GetIdentifier<TDocument, TIdentifier>(this TDocument d
         return default;
     }
 
-    public static StringFieldDefinition<TDocument, TIdentifier?>? GetIdentifierFieldDefinition<TDocument, TIdentifier>(this Type? type) where TIdentifier : struct
+    public static StringFieldDefinition<TDocument, TIdentifier?>? GetIdentifierFieldDefinition<TDocument, TIdentifier>(this Type? type)
     {
         if (type == null)
             return null;

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/CreationHandler.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/CreationHandler.cs
@@ -9,14 +9,14 @@
 
 namespace YuckQi.Data.DocumentDb.MongoDb.Handlers;
 
-public class CreationHandler<TEntity, TIdentifier, TScope> : CreationHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class CreationHandler<TEntity, TIdentifier, TScope> : CreationHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     public CreationHandler() : this(null) { }
 
     public CreationHandler(CreationOptions<TIdentifier>? options) : base(options, null) { }
 }
 
-public class CreationHandler<TEntity, TIdentifier, TScope, TDocument> : CreationHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class CreationHandler<TEntity, TIdentifier, TScope, TDocument> : CreationHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier>, ICreated where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     private static readonly Type DocumentType = typeof(TDocument);
 
@@ -54,7 +54,7 @@ public override async Task<IEnumerable<TEntity>> Create(IEnumerable<TEntity> ent
         return list;
     }
 
-    protected override Maybe<TIdentifier> DoCreate(TEntity entity, TScope? scope)
+    protected override Maybe<TIdentifier?> DoCreate(TEntity entity, TScope? scope)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));
@@ -68,7 +68,7 @@ protected override Maybe<TIdentifier> DoCreate(TEntity entity, TScope? scope)
         return document.GetIdentifier<TDocument, TIdentifier>();
     }
 
-    protected override async Task<Maybe<TIdentifier>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
+    protected override async Task<Maybe<TIdentifier?>> DoCreate(TEntity entity, TScope? scope, CancellationToken cancellationToken)
     {
         if (scope == null)
             throw new ArgumentNullException(nameof(scope));

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/PhysicalDeletionHandler.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/PhysicalDeletionHandler.cs
@@ -6,12 +6,12 @@
 
 namespace YuckQi.Data.DocumentDb.MongoDb.Handlers;
 
-public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope> : PhysicalDeletionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope> : PhysicalDeletionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     public PhysicalDeletionHandler() : base(null) { }
 }
 
-public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope, TDocument> : PhysicalDeletionHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class PhysicalDeletionHandler<TEntity, TIdentifier, TScope, TDocument> : PhysicalDeletionHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     private static readonly Type DocumentType = typeof(TDocument);
 
@@ -26,7 +26,7 @@ protected override Boolean DoDelete(TEntity entity, TScope? scope)
         var collection = database.GetCollection<TDocument>(DocumentType.GetCollectionName());
         var document = GetDocument(entity);
         var field = DocumentType.GetIdentifierFieldDefinition<TDocument, TIdentifier>();
-        var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+        var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
         var filter = Builders<TDocument>.Filter.Eq(field, identifier);
         var result = collection.DeleteOne(scope, filter);
 
@@ -42,7 +42,7 @@ protected override async Task<Boolean> DoDelete(TEntity entity, TScope? scope, C
         var collection = database.GetCollection<TDocument>(DocumentType.GetCollectionName());
         var document = GetDocument(entity);
         var field = DocumentType.GetIdentifierFieldDefinition<TDocument, TIdentifier>();
-        var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+        var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
         var filter = Builders<TDocument>.Filter.Eq(field, identifier);
         var result = await collection.DeleteOneAsync(scope, filter, cancellationToken: cancellationToken);
 

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/RetrievalHandler.cs
@@ -7,12 +7,12 @@
 
 namespace YuckQi.Data.DocumentDb.MongoDb.Handlers;
 
-public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     public RetrievalHandler() : base(null) { }
 }
 
-public class RetrievalHandler<TEntity, TIdentifier, TScope, TDocument> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class RetrievalHandler<TEntity, TIdentifier, TScope, TDocument> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     private static readonly Type DocumentType = typeof(TDocument);
 

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/RevisionHandler.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Handlers/RevisionHandler.cs
@@ -8,14 +8,14 @@
 
 namespace YuckQi.Data.DocumentDb.MongoDb.Handlers;
 
-public class RevisionHandler<TEntity, TIdentifier, TScope> : RevisionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class RevisionHandler<TEntity, TIdentifier, TScope> : RevisionHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     public RevisionHandler() : this(null) { }
 
     public RevisionHandler(RevisionOptions? options) : base(options, null) { }
 }
 
-public class RevisionHandler<TEntity, TIdentifier, TScope, TDocument> : RevisionHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IClientSessionHandle?
+public class RevisionHandler<TEntity, TIdentifier, TScope, TDocument> : RevisionHandlerBase<TEntity, TIdentifier, TScope?> where TEntity : IEntity<TIdentifier>, IRevised where TIdentifier : IEquatable<TIdentifier> where TScope : IClientSessionHandle?
 {
     private static readonly Type DocumentType = typeof(TDocument);
 
@@ -36,7 +36,7 @@ public override IEnumerable<TEntity> Revise(IEnumerable<TEntity> entities, TScop
 
         foreach (var document in documents)
         {
-            var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+            var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
             var filter = Builders<TDocument>.Filter.Eq(field, identifier);
 
             collection.ReplaceOne(scope, filter, document);
@@ -58,7 +58,7 @@ public override async Task<IEnumerable<TEntity>> Revise(IEnumerable<TEntity> ent
 
         foreach (var document in documents)
         {
-            var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+            var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
             var filter = Builders<TDocument>.Filter.Eq(field, identifier);
 
             await collection.ReplaceOneAsync(scope, filter, document, cancellationToken: cancellationToken);
@@ -76,7 +76,7 @@ protected override Boolean DoRevise(TEntity entity, TScope? scope)
         var collection = database.GetCollection<TDocument>(DocumentType.GetCollectionName());
         var field = DocumentType.GetIdentifierFieldDefinition<TDocument, TIdentifier>();
         var document = MapToData<TDocument>(entity);
-        var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+        var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
         var filter = Builders<TDocument>.Filter.Eq(field, identifier);
         if (document == null)
             throw new NullReferenceException();
@@ -95,7 +95,7 @@ protected override async Task<Boolean> DoRevise(TEntity entity, TScope? scope, C
         var collection = database.GetCollection<TDocument>(DocumentType.GetCollectionName());
         var field = DocumentType.GetIdentifierFieldDefinition<TDocument, TIdentifier>();
         var document = MapToData<TDocument>(entity);
-        var identifier = document?.GetIdentifier<TDocument, TIdentifier>();
+        var identifier = document != null ? document.GetIdentifier<TDocument, TIdentifier>() : default;
         var filter = Builders<TDocument>.Filter.Eq(field, identifier);
         if (document == null)
             throw new NullReferenceException();

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,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.4.2</Version>
+    <Version>6.5.0</Version>
     <Description>An implementation of YuckQi.Data for MongoDB databases.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj b/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.4.2</Version>
+    <Version>6.5.0</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>

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/RetrievalHandler.cs
@@ -7,7 +7,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.MySql.Handlers;
 
-public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
+public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler() : this(new SqlGenerator<TEntity>()) { }
 
@@ -16,7 +16,7 @@ public RetrievalHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeM
     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 class RetrievalHandler<TEntity, TIdentifier, TScope, TRecord> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs b/src/YuckQi.Data.Sql.Dapper.MySql/Handlers/SearchHandler.cs
@@ -7,7 +7,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.MySql.Handlers;
 
-public class SearchHandler<TEntity, TIdentifier, TScope> : SearchHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
+public class SearchHandler<TEntity, TIdentifier, TScope> : SearchHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public SearchHandler() : this(new SqlGenerator<TEntity>()) { }
 
@@ -16,7 +16,7 @@ public SearchHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeMap.
     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 class SearchHandler<TEntity, TIdentifier, TScope, TRecord> : SearchHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public SearchHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }
 

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.4.2</Version>
+    <Version>6.5.0</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
@@ -7,7 +7,7 @@
 
 namespace YuckQi.Data.Sql.Dapper.Oracle.Handlers;
 
-public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : struct, IEquatable<TIdentifier> where TScope : IDbTransaction?
+public class RetrievalHandler<TEntity, TIdentifier, TScope> : RetrievalHandler<TEntity, TIdentifier, TScope?, TEntity> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler() : this(new SqlGenerator<TEntity>()) { }
 
@@ -16,7 +16,7 @@ public RetrievalHandler(ISqlGenerator sqlGenerator) : this(sqlGenerator, DbTypeM
     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 class RetrievalHandler<TEntity, TIdentifier, TScope, TRecord> : RetrievalHandlerBase<TEntity, TIdentifier, TScope?, TRecord> where TEntity : IEntity<TIdentifier> where TIdentifier : IEquatable<TIdentifier> where TScope : IDbTransaction?
 {
     public RetrievalHandler(IMapper mapper) : this(new SqlGenerator<TRecord>(), mapper) { }