Default srid (#43)

SebastianStehle · web-flow · commit c1e99c108a7a · 2025-05-26T17:25:01.000+02:00
* Fix tests.

* Drop table.

* another fix.

* Fix tests

* Default SRID.
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlBulkInsertProvider.cs
@@ -71,7 +71,7 @@ CancellationToken ctk
             sourceOrdinal++;
         }
 
-        var dataReader = new EnumerableDataReader<T>(entities, properties, options.Converters);
+        var dataReader = new EnumerableDataReader<T>(entities, properties, options);
         
         if (sync)
         {
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlGeometryConverter.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/MySqlGeometryConverter.cs
@@ -1,8 +1,9 @@
-﻿using MySqlConnector;
+using MySqlConnector;
 
 using NetTopologySuite.Geometries;
 
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.MySql;
 
@@ -14,11 +15,11 @@ private MySqlGeometryConverter()
     {
     }
 
-    public bool TryConvertValue(object source, out object result)
+    public bool TryConvertValue(object source, BulkInsertOptions options, out object result)
     {
         if (source is Geometry geometry)
         {
-            result = MySqlGeometry.FromWkb(geometry.SRID, geometry.ToBinary());
+            result = MySqlGeometry.FromWkb(options.SRID, geometry.ToBinary());
             return true;
         }
 
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlBulkInsertProvider.cs
@@ -57,8 +57,6 @@ protected override async Task BulkInsert<T>(
             ? connection.BeginBinaryImport(command)
             : await connection.BeginBinaryImportAsync(command, ctk);
 
-        var bulkValueConverters = options.Converters;
-
         // The type mapping can be null for obvious types like string.
         var columnTypes = columns.Select(c => GetPostgreSqlType(c, options)).ToArray();
 
@@ -76,7 +74,7 @@ protected override async Task BulkInsert<T>(
 
             for (var columnIndex = 0; columnIndex < columns.Count; columnIndex++)
             {
-                var value = columns[columnIndex].GetValue(entity, bulkValueConverters);
+                var value = columns[columnIndex].GetValue(entity, options);
 
                 // Get the actual type, so that the writer can do the conversation to the target type automatically.
                 var type = columnTypes[columnIndex];
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlGeometryConverter.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlGeometryConverter.cs
@@ -1,10 +1,11 @@
-﻿using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 using NetTopologySuite.Geometries;
 
 using NpgsqlTypes;
 
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.PostgreSql;
 
@@ -16,10 +17,16 @@ private PostgreSqlGeometryConverter()
     {
     }
 
-    public bool TryConvertValue(object source, out object result)
+    public bool TryConvertValue(object source, BulkInsertOptions options, out object result)
     {
         if (source is Geometry geometry)
         {
+            if (geometry.SRID != options.SRID)
+            {
+                geometry = geometry.Copy();
+                geometry.SRID = options.SRID;
+            }
+
             result = geometry.ToBinary();
             return true;
         }
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerBulkInsertProvider.cs
@@ -51,7 +51,7 @@ protected override async Task BulkInsert<T>(
             bulkCopy.ColumnMappings.Add(column.PropertyName, column.ColumnName);
         }
 
-        var dataReader = new EnumerableDataReader<T>(entities, columns, options.Converters);
+        var dataReader = new EnumerableDataReader<T>(entities, columns, options);
 
         if (sync)
         {
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerGeometryConverter.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerGeometryConverter.cs
@@ -1,10 +1,11 @@
-﻿using System.Data.SqlTypes;
+using System.Data.SqlTypes;
 
 using Microsoft.SqlServer.Types;
 
 using NetTopologySuite.Geometries;
 
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.SqlServer;
 
@@ -16,12 +17,12 @@ private SqlServerGeometryConverter()
     {
     }
 
-    public bool TryConvertValue(object source, out object result)
+    public bool TryConvertValue(object source, BulkInsertOptions options, out object result)
     {
         if (source is Geometry geometry)
         {
             var reversed = Reverse(geometry);
-            result = SqlGeometry.STGeomFromWKB(new SqlBytes(reversed.AsBinary()), geometry.SRID);
+            result = SqlGeometry.STGeomFromWKB(new SqlBytes(reversed.AsBinary()), options.SRID);
             return true;
         }
 
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.Sqlite/SqliteBulkInsertProvider.cs b/src/PhenX.EntityFrameworkCore.BulkInsert.Sqlite/SqliteBulkInsertProvider.cs
@@ -144,37 +144,48 @@ CancellationToken ctk
         var columnList = tableInfo.GetColumns(options.CopyGeneratedColumns);
         var columnTypes = columnList.Select(GetSqliteType).ToArray();
 
-        await using var insertCommand =
-            GetInsertCommand(
-                context,
-                tableName,
-                columnList,
-                columnTypes,
-                sb,
-                batchSize);
-
-        foreach (var chunk in entities.Chunk(batchSize))
+        DbCommand? insertCommand = null;
+        try
         {
-            // Full chunks
-            if (chunk.Length == batchSize)
+            foreach (var chunk in entities.Chunk(batchSize))
             {
-                FillValues(chunk, insertCommand.Parameters, columns);
-                await ExecuteCommand(sync, insertCommand, ctk);
+                // Full chunks
+                if (chunk.Length == batchSize)
+                {
+                    insertCommand ??=
+                        GetInsertCommand(
+                            context,
+                            tableName,
+                            columnList,
+                            columnTypes,
+                            sb,
+                            batchSize);
+
+                    FillValues(chunk, insertCommand.Parameters, columns, options);
+                    await ExecuteCommand(sync, insertCommand, ctk);
+                }
+                // Last chunk
+                else
+                {
+                    await using var partialInsertCommand =
+                        GetInsertCommand(
+                            context,
+                            tableName,
+                            columnList,
+                            columnTypes,
+                            sb,
+                            chunk.Length);
+
+                    FillValues(chunk, partialInsertCommand.Parameters, columns, options);
+                    await ExecuteCommand(sync, partialInsertCommand, ctk);
+                }
             }
-            // Last chunk
-            else
+        }
+        finally
+        {
+            if (insertCommand != null)
             {
-                await using var partialInsertCommand =
-                GetInsertCommand(
-                    context,
-                    tableName,
-                    columnList,
-                    columnTypes,
-                    sb,
-                    chunk.Length);
-
-                FillValues(chunk, partialInsertCommand.Parameters, columns);
-                await ExecuteCommand(sync, partialInsertCommand, ctk);
+                await insertCommand.DisposeAsync();
             }
         }
     }
@@ -192,7 +203,11 @@ private static async Task ExecuteCommand(bool sync, DbCommand insertCommand, Can
         }
     }
 
-    private static void FillValues<T>(T[] chunk, DbParameterCollection parameters, IReadOnlyList<ColumnMetadata> columns) where T : class
+    private static void FillValues<T>(
+        T[] chunk,
+        DbParameterCollection parameters,
+        IReadOnlyList<ColumnMetadata> columns,
+        BulkInsertOptions options) where T : class
     {
         var p = 0;
 
@@ -203,7 +218,7 @@ private static void FillValues<T>(T[] chunk, DbParameterCollection parameters, I
             for (var columnIndex = 0; columnIndex < columns.Count; columnIndex++)
             {
                 var column = columns[columnIndex];
-                var value = column.GetValue(entity, null);
+                var value = column.GetValue(entity, options);
                 parameters[p].Value = value;
                 p++;
             }
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkValueConverter.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Abstractions/IBulkValueConverter.cs
@@ -1,4 +1,6 @@
-﻿namespace PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
 
 /// <summary>
 /// Provide an interface to control how objects are written.
@@ -10,6 +12,7 @@ public interface IBulkValueConverter
     /// </summary>
     /// <param name="source">The source object.</param>
     /// <param name="result">The result type.</param>
+    /// <param name="options">The options.</param>
     /// <returns>Indicates if an object should be written.</returns>
-    bool TryConvertValue(object source, out object result);
+    bool TryConvertValue(object source, BulkInsertOptions options, out object result);
 }
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/EnumerableDataReader.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/EnumerableDataReader.cs
@@ -2,10 +2,14 @@
 
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
 using PhenX.EntityFrameworkCore.BulkInsert.Metadata;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert;
 
-internal sealed class EnumerableDataReader<T>(IEnumerable<T> rows, IReadOnlyList<ColumnMetadata> columns, List<IBulkValueConverter>? converters) : IDataReader
+internal sealed class EnumerableDataReader<T>(
+    IEnumerable<T> rows,
+    IReadOnlyList<ColumnMetadata> columns,
+    BulkInsertOptions options) : IDataReader
 {
     private readonly IEnumerator<T> _enumerator = rows.GetEnumerator();
     private readonly Dictionary<string, int> _ordinalMap =
@@ -24,7 +28,7 @@ public object GetValue(int i)
             return DBNull.Value;
         }
 
-        return columns[i].GetValue(current, converters)!;
+        return columns[i].GetValue(current, options)!;
     }
 
     public int GetValues(object[] values)
@@ -37,7 +41,7 @@ public int GetValues(object[] values)
 
         for (var i = 0; i < columns.Count; i++)
         {
-            values[i] = columns[i].GetValue(current, converters)!;
+            values[i] = columns[i].GetValue(current, options)!;
         }
 
         return columns.Count;
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/ColumnMetadata.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/ColumnMetadata.cs
@@ -3,6 +3,7 @@
 
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
 using PhenX.EntityFrameworkCore.BulkInsert.Dialect;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.Metadata;
 
@@ -24,15 +25,15 @@ internal sealed class ColumnMetadata(IProperty property,  SqlDialectBuilder dial
 
     public bool IsGenerated { get; } = property.ValueGenerated == ValueGenerated.OnAdd;
 
-    public object? GetValue(object entity, List<IBulkValueConverter>? converters)
+    public object? GetValue(object entity, BulkInsertOptions options)
     {
         var result = _getter(entity);
 
-        if (converters != null && result != null)
+        if (options.Converters != null && result != null)
         {
-            foreach (var converter in converters)
+            foreach (var converter in options.Converters)
             {
-                if (converter.TryConvertValue(result, out var temp))
+                if (converter.TryConvertValue(result, options, out var temp))
                 {
                     result = temp;
                     break;
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert/Options/BulkInsertOptions.cs b/src/PhenX.EntityFrameworkCore.BulkInsert/Options/BulkInsertOptions.cs
@@ -50,6 +50,11 @@ public class BulkInsertOptions
     /// </summary>
     public List<IBulkValueConverter>? Converters { get; set; }
 
+    /// <summary>
+    /// Sets the ID of the Spatial Reference System used by the Geometries to be inserted.
+    /// </summary>
+    public int SRID { get; set; } = 4326;
+
     internal int GetCopyTimeoutInSeconds()
     {
         return Math.Max(0, (int)CopyTimeout.TotalSeconds);
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs
@@ -46,4 +46,29 @@ public async Task InsertEntities_WithGeo(InsertStrategy strategy)
         insertedEntities.Should().BeEquivalentTo(entities,
             o => o.RespectingRuntimeTypes().Excluding((TestEntityWithGeo e) => e.Id));
     }
+
+    [SkippableTheory]
+    [CombinatorialData]
+    public async Task InsertEntities_WithGeo_And_Default_SRID(InsertStrategy strategy)
+    {
+        // Arrange
+        var geo1 = new Point(1, 2);
+        var geo2 = new Point(3, 4);
+
+        var entities = new List<TestEntityWithGeo>
+        {
+            new TestEntityWithGeo { GeoObject = geo1 },
+            new TestEntityWithGeo { GeoObject = geo2 }
+        };
+
+        // Act
+        var insertedEntities = await _context.InsertWithStrategyAsync(strategy, entities);
+
+        geo1.SRID = 4326;
+        geo2.SRID = 4326;
+
+        // Assert
+        insertedEntities.Should().BeEquivalentTo(entities,
+            o => o.RespectingRuntimeTypes().Excluding((TestEntityWithGeo e) => e.Id));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ CancellationToken ctk`
`71`	`71`	`sourceOrdinal++;`
`72`	`72`	`}`
`73`	`73`
`74`		`- var dataReader = new EnumerableDataReader<T>(entities, properties, options.Converters);`
	`74`	`+ var dataReader = new EnumerableDataReader<T>(entities, properties, options);`
`75`	`75`
`76`	`76`	`if (sync)`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`		`-using MySqlConnector;`
	`1`	`+using MySqlConnector;`
`2`	`2`
`3`	`3`	`using NetTopologySuite.Geometries;`
`4`	`4`
`5`	`5`	`using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;`
	`6`	`+using PhenX.EntityFrameworkCore.BulkInsert.Options;`
`6`	`7`
`7`	`8`	`namespace PhenX.EntityFrameworkCore.BulkInsert.MySql;`
`8`	`9`
`@@ -14,11 +15,11 @@ private MySqlGeometryConverter()`
`14`	`15`	`{`
`15`	`16`	`}`
`16`	`17`
`17`		`- public bool TryConvertValue(object source, out object result)`
	`18`	`+ public bool TryConvertValue(object source, BulkInsertOptions options, out object result)`
`18`	`19`	`{`
`19`	`20`	`if (source is Geometry geometry)`
`20`	`21`	`{`
`21`		`- result = MySqlGeometry.FromWkb(geometry.SRID, geometry.ToBinary());`
	`22`	`+ result = MySqlGeometry.FromWkb(options.SRID, geometry.ToBinary());`
`22`	`23`	`return true;`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-using Microsoft.EntityFrameworkCore.Metadata;`
	`1`	`+using Microsoft.EntityFrameworkCore.Metadata;`
`2`	`2`
`3`	`3`	`using NetTopologySuite.Geometries;`
`4`	`4`
`5`	`5`	`using NpgsqlTypes;`
`6`	`6`
`7`	`7`	`using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;`
	`8`	`+using PhenX.EntityFrameworkCore.BulkInsert.Options;`
`8`	`9`
`9`	`10`	`namespace PhenX.EntityFrameworkCore.BulkInsert.PostgreSql;`
`10`	`11`
`@@ -16,10 +17,16 @@ private PostgreSqlGeometryConverter()`
`16`	`17`	`{`
`17`	`18`	`}`
`18`	`19`
`19`		`- public bool TryConvertValue(object source, out object result)`
	`20`	`+ public bool TryConvertValue(object source, BulkInsertOptions options, out object result)`
`20`	`21`	`{`
`21`	`22`	`if (source is Geometry geometry)`
`22`	`23`	`{`
	`24`	`+ if (geometry.SRID != options.SRID)`
	`25`	`+ {`
	`26`	`+ geometry = geometry.Copy();`
	`27`	`+ geometry.SRID = options.SRID;`
	`28`	`+ }`
	`29`	`+`
`23`	`30`	`result = geometry.ToBinary();`
`24`	`31`	`return true;`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected override async Task BulkInsert<T>(`
`51`	`51`	`bulkCopy.ColumnMappings.Add(column.PropertyName, column.ColumnName);`
`52`	`52`	`}`
`53`	`53`
`54`		`- var dataReader = new EnumerableDataReader<T>(entities, columns, options.Converters);`
	`54`	`+ var dataReader = new EnumerableDataReader<T>(entities, columns, options);`
`55`	`55`
`56`	`56`	`if (sync)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-using System.Data.SqlTypes;`
	`1`	`+using System.Data.SqlTypes;`
`2`	`2`
`3`	`3`	`using Microsoft.SqlServer.Types;`
`4`	`4`
`5`	`5`	`using NetTopologySuite.Geometries;`
`6`	`6`
`7`	`7`	`using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;`
	`8`	`+using PhenX.EntityFrameworkCore.BulkInsert.Options;`
`8`	`9`
`9`	`10`	`namespace PhenX.EntityFrameworkCore.BulkInsert.SqlServer;`
`10`	`11`
`@@ -16,12 +17,12 @@ private SqlServerGeometryConverter()`
`16`	`17`	`{`
`17`	`18`	`}`
`18`	`19`
`19`		`- public bool TryConvertValue(object source, out object result)`
	`20`	`+ public bool TryConvertValue(object source, BulkInsertOptions options, out object result)`
`20`	`21`	`{`
`21`	`22`	`if (source is Geometry geometry)`
`22`	`23`	`{`
`23`	`24`	`var reversed = Reverse(geometry);`
`24`		`- result = SqlGeometry.STGeomFromWKB(new SqlBytes(reversed.AsBinary()), geometry.SRID);`
	`25`	`+ result = SqlGeometry.STGeomFromWKB(new SqlBytes(reversed.AsBinary()), options.SRID);`
`25`	`26`	`return true;`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,14 @@`
`2`	`2`
`3`	`3`	`using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;`
`4`	`4`	`using PhenX.EntityFrameworkCore.BulkInsert.Metadata;`
	`5`	`+using PhenX.EntityFrameworkCore.BulkInsert.Options;`
`5`	`6`
`6`	`7`	`namespace PhenX.EntityFrameworkCore.BulkInsert;`
`7`	`8`
`8`		`-internal sealed class EnumerableDataReader<T>(IEnumerable<T> rows, IReadOnlyList<ColumnMetadata> columns, List<IBulkValueConverter>? converters) : IDataReader`
	`9`	`+internal sealed class EnumerableDataReader<T>(`
	`10`	`+ IEnumerable<T> rows,`
	`11`	`+ IReadOnlyList<ColumnMetadata> columns,`
	`12`	`+ BulkInsertOptions options) : IDataReader`
`9`	`13`	`{`
`10`	`14`	`private readonly IEnumerator<T> _enumerator = rows.GetEnumerator();`
`11`	`15`	`private readonly Dictionary<string, int> _ordinalMap =`
`@@ -24,7 +28,7 @@ public object GetValue(int i)`
`24`	`28`	`return DBNull.Value;`
`25`	`29`	`}`
`26`	`30`
`27`		`- return columns[i].GetValue(current, converters)!;`
	`31`	`+ return columns[i].GetValue(current, options)!;`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`public int GetValues(object[] values)`
`@@ -37,7 +41,7 @@ public int GetValues(object[] values)`
`37`	`41`
`38`	`42`	`for (var i = 0; i < columns.Count; i++)`
`39`	`43`	`{`
`40`		`- values[i] = columns[i].GetValue(current, converters)!;`
	`44`	`+ values[i] = columns[i].GetValue(current, options)!;`
`41`	`45`	`}`
`42`	`46`
`43`	`47`	`return columns.Count;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;`
`5`	`5`	`using PhenX.EntityFrameworkCore.BulkInsert.Dialect;`
	`6`	`+using PhenX.EntityFrameworkCore.BulkInsert.Options;`
`6`	`7`
`7`	`8`	`namespace PhenX.EntityFrameworkCore.BulkInsert.Metadata;`
`8`	`9`
`@@ -24,15 +25,15 @@ internal sealed class ColumnMetadata(IProperty property, SqlDialectBuilder dial`
`24`	`25`
`25`	`26`	`public bool IsGenerated { get; } = property.ValueGenerated == ValueGenerated.OnAdd;`
`26`	`27`
`27`		`- public object? GetValue(object entity, List<IBulkValueConverter>? converters)`
	`28`	`+ public object? GetValue(object entity, BulkInsertOptions options)`
`28`	`29`	`{`
`29`	`30`	`var result = _getter(entity);`
`30`	`31`
`31`		`- if (converters != null && result != null)`
	`32`	`+ if (options.Converters != null && result != null)`
`32`	`33`	`{`
`33`		`- foreach (var converter in converters)`
	`34`	`+ foreach (var converter in options.Converters)`
`34`	`35`	`{`
`35`		`- if (converter.TryConvertValue(result, out var temp))`
	`36`	`+ if (converter.TryConvertValue(result, options, out var temp))`
`36`	`37`	`{`
`37`	`38`	`result = temp;`
`38`	`39`	`break;`