Geometry support.

Author: SebastianStehle

src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs

@@ -22,7 +22,10 @@ internal class MySqlBulkInsertProvider(ILogger<MySqlBulkInsertProvider> logger)
     protected override string GetTempTableName(string tableName) => $"#_temp_bulk_insert_{tableName}";
 
     /// <inheritdoc />
-    protected override MySqlBulkInsertOptions CreateDefaultOptions() => new();
+    protected override MySqlBulkInsertOptions CreateDefaultOptions() => new()
+    {
+        Converters = [MySqlGeometryConverter.Instance]
+    };
 
     /// <inheritdoc />
     protected override IAsyncEnumerable<T> BulkInsertReturnEntities<T>(
@@ -71,11 +74,11 @@ CancellationToken ctk
         if (sync)
         {
             // ReSharper disable once MethodHasAsyncOverloadWithCancellation
-            bulkCopy.WriteToServer(new EnumerableDataReader<T>(entities, properties));
+            bulkCopy.WriteToServer(new EnumerableDataReader<T>(entities, properties, options.Converters));
         }
         else
         {
-            await bulkCopy.WriteToServerAsync(new EnumerableDataReader<T>(entities, properties), ctk);
+            await bulkCopy.WriteToServerAsync(new EnumerableDataReader<T>(entities, properties, options.Converters), ctk);
         }
     }
 }

src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlGeometryConverter.cs

@@ -0,0 +1,28 @@
+using MySqlConnector;
+
+using NetTopologySuite.Geometries;
+
+using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.MySql;
+
+internal sealed class MySqlGeometryConverter : IValueConverter
+{
+    public static readonly MySqlGeometryConverter Instance = new();
+
+    private MySqlGeometryConverter()
+    {
+    }
+
+    public bool TryConvertValue(object source, out object result)
+    {
+        if (source is Geometry geometry)
+        {
+            result = MySqlGeometry.FromWkb(geometry.SRID, geometry.ToBinary());
+            return true;
+        }
+
+        result = source;
+        return false;
+    }
+}

src/PhenX.EntityFrameworkCore.BulkInsert.MySql/PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj

@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="NetTopologySuite" Version="2.6.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.3" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.0-preview.3.efcore.9.0.0" />
   </ItemGroup>

src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerBulkInsertProvider.cs

@@ -53,11 +53,11 @@ protected override async Task BulkInsert<T>(
         if (sync)
         {
             // ReSharper disable once MethodHasAsyncOverloadWithCancellation
-            bulkCopy.WriteToServer(new EnumerableDataReader<T>(entities, columns));
+            bulkCopy.WriteToServer(new EnumerableDataReader<T>(entities, columns, options.Converters));
         }
         else
         {
-            await bulkCopy.WriteToServerAsync(new EnumerableDataReader<T>(entities, columns), ctk);
+            await bulkCopy.WriteToServerAsync(new EnumerableDataReader<T>(entities, columns, options.Converters), ctk);
         }
     }
 }

src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IValueConverter.cs

@@ -0,0 +1,15 @@
+namespace PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+
+/// <summary>
+/// Provide an interface to control how objects are written.
+/// </summary>
+public interface IValueConverter
+{
+    /// <summary>
+    /// Converts a value before written to the output.
+    /// </summary>
+    /// <param name="source">The source object.</param>
+    /// <param name="result">The result type.</param>
+    /// <returns>Indicates if an object should be written.</returns>
+    bool TryConvertValue(object source, out object result);
+}

src/PhenX.EntityFrameworkCore.BulkInsert/EnumerableDataReader.cs

@@ -1,10 +1,11 @@
 using System.Data;
 
+using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
 using PhenX.EntityFrameworkCore.BulkInsert.Metadata;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert;
 
-internal sealed class EnumerableDataReader<T>(IEnumerable<T> rows, IReadOnlyList<ColumnMetadata> columns) : IDataReader
+internal sealed class EnumerableDataReader<T>(IEnumerable<T> rows, IReadOnlyList<ColumnMetadata> columns, List<IValueConverter>? converters) : IDataReader
 {
     private readonly IEnumerator<T> _enumerator = rows.GetEnumerator();
     private readonly Dictionary<string, int> _ordinalMap =
@@ -23,7 +24,7 @@ public object GetValue(int i)
             return DBNull.Value;
         }
 
-        return columns[i].GetValue(current)!;
+        return GetAndConvertValue(columns[i], current);
     }
 
     public int GetValues(object[] values)
@@ -36,12 +37,30 @@ public int GetValues(object[] values)
 
         for (var i = 0; i < columns.Count; i++)
         {
-            values[i] = columns[i].GetValue(current)!;
+            values[i] = GetAndConvertValue(columns[i], current);
         }
 
         return columns.Count;
     }
 
+    private object GetAndConvertValue(ColumnMetadata column, T entity)
+    {
+        var result = column.GetValue(entity!)!;
+        if (converters != null)
+        {
+            foreach (var converter in converters)
+            {
+                if (converter.TryConvertValue(result, out var temp))
+                {
+                    result = temp;
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
     public bool Read() => _enumerator.MoveNext();
 
     public Type GetFieldType(int i) => columns[i].ClrType;

src/PhenX.EntityFrameworkCore.BulkInsert/Options/BulkInsertOptions.cs

@@ -1,3 +1,5 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+
 namespace PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 /// <summary>
@@ -43,6 +45,11 @@ public class BulkInsertOptions
     /// </summary>
     public TimeSpan CopyTimeout { get; set; } = TimeSpan.FromMinutes(10);
 
+    /// <summary>
+    /// The value converters.
+    /// </summary>
+    public List<IValueConverter>? Converters { get; set; }
+
     internal int GetCopyTimeoutInSeconds()
     {
         return Math.Max(0, (int)CopyTimeout.TotalSeconds);

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerMySql.cs

@@ -28,7 +28,10 @@ protected override string GetConnectionString()
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseMySql(ServerVersion.AutoDetect(GetConnectionString()))
+            .UseMySql(ServerVersion.AutoDetect(GetConnectionString()), o =>
+            {
+                o.UseNetTopologySuite();
+            })
             .UseBulkInsertMySql();
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerPostgreSql.cs

@@ -25,7 +25,10 @@ public class TestDbContainerPostgreSql<TDbContext> : TestDbContainer<TDbContext>
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseNpgsql()
+            .UseNpgsql(o =>
+            {
+                o.UseNetTopologySuite();
+            })
             .UseBulkInsertPostgreSql();
     }
 }

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlServer.cs

@@ -22,7 +22,10 @@ public class TestDbContainerSqlServer<TDbContext> : TestDbContainer<TDbContext>
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer()
+            .UseSqlServer(o =>
+            {
+                o.UseNetTopologySuite();
+            })
             .UseBulkInsertSqlServer();
     }
 }