Simplified TypeMappingSourcePlugin code - #50

Co-authored-by: Shay Rojansky <[email protected]>

Author: ankane

src/Pgvector.EntityFrameworkCore/HalfvecTypeMapping.cs

@@ -17,8 +17,6 @@ public void ApplyServices(IServiceCollection services)
             .TryAdd<IMethodCallTranslatorPlugin, VectorDbFunctionsTranslatorPlugin>();
 
         services.AddSingleton<IRelationalTypeMappingSourcePlugin, VectorTypeMappingSourcePlugin>();
-        services.AddSingleton<IRelationalTypeMappingSourcePlugin, HalfvecTypeMappingSourcePlugin>();
-        services.AddSingleton<IRelationalTypeMappingSourcePlugin, SparsevecTypeMappingSourcePlugin>();
     }
 
     public void Validate(IDbContextOptions options) { }

src/Pgvector.EntityFrameworkCore/HalfvecTypeMappingSourcePlugin.cs

@@ -10,7 +10,5 @@ public class VectorDesignTimeServices : IDesignTimeServices
     public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollection)
         => serviceCollection
             .AddSingleton<IRelationalTypeMappingSourcePlugin, VectorTypeMappingSourcePlugin>()
-            .AddSingleton<IRelationalTypeMappingSourcePlugin, HalfvecTypeMappingSourcePlugin>()
-            .AddSingleton<IRelationalTypeMappingSourcePlugin, SparsevecTypeMappingSourcePlugin>()
             .AddSingleton<IProviderCodeGeneratorPlugin, VectorCodeGeneratorPlugin>();
 }

src/Pgvector.EntityFrameworkCore/SparsevecTypeMapping.cs

@@ -12,6 +12,8 @@ public VectorTypeMapping() : base("vector", typeof(Vector)) { }
 
     public VectorTypeMapping(string storeType) : base(storeType, typeof(Vector)) { }
 
+    public VectorTypeMapping(string storeType, Type clrType) : base(storeType, clrType) { }
+
     protected VectorTypeMapping(RelationalTypeMappingParameters parameters) : base(parameters) { }
 
     protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters parameters)

src/Pgvector.EntityFrameworkCore/SparsevecTypeMappingSourcePlugin.cs

@@ -5,7 +5,24 @@ namespace Pgvector.EntityFrameworkCore;
 public class VectorTypeMappingSourcePlugin : IRelationalTypeMappingSourcePlugin
 {
     public RelationalTypeMapping? FindMapping(in RelationalTypeMappingInfo mappingInfo)
-        => mappingInfo.ClrType == typeof(Vector) || (mappingInfo.ClrType == null && (mappingInfo.StoreTypeNameBase ?? mappingInfo.StoreTypeName) == "vector")
-            ? new VectorTypeMapping(mappingInfo.StoreTypeName ?? "vector")
-            : null;
+    {
+        if (mappingInfo.ClrType == null)
+        {
+            return (mappingInfo.StoreTypeNameBase ?? mappingInfo.StoreTypeName) switch
+            {
+                "vector" => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "vector", typeof(Vector)),
+                "halfvec" => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "halfvec", typeof(HalfVector)),
+                "sparsevec" => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "sparsevec", typeof(SparseVector)),
+                _ => null,
+            };
+        }
+
+        return mappingInfo.ClrType switch
+        {
+            var t when t == typeof(Vector) => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "vector", typeof(Vector)),
+            var t when t == typeof(HalfVector) => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "halfvec", typeof(HalfVector)),
+            var t when t == typeof(SparseVector) => new VectorTypeMapping(mappingInfo.StoreTypeName ?? "sparsevec", typeof(SparseVector)),
+            _ => null,
+        };
+    }
 }