Merge branch 'main' into feature/oracle

Author: fabien.menager

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [PhenX]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/dotnet-test.yml

@@ -5,9 +5,9 @@ name: dotnet test
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
   build:

.github/workflows/release.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Verify commit exists in origin/master
+      - name: Verify commit exists in origin/main
         run: |
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
-          git branch --remote --contains | grep origin/master
+          git branch --remote --contains | grep origin/main
 
       - name: Set Version Variable
         if: ${{ github.ref_type == 'tag' }}

README.md

@@ -134,19 +134,19 @@ Legend :
 
 SQL Server results with 500 000 rows :
 
-![bench-sqlserver.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/master/images/bench-sqlserver.png)
+![bench-sqlserver.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/main/images/bench-sqlserver.png)
 
 PostgreSQL results with 500 000 rows :
 
-![bench-postgresql.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/master/images/bench-postgresql.png)
+![bench-postgresql.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/main/images/bench-postgresql.png)
 
 SQLite results with 500 000 rows :
 
-![bench-sqlite.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/master/images/bench-sqlite.png)
+![bench-sqlite.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/main/images/bench-sqlite.png)
 
 MySQL results with 500 000 rows :
 
-![bench-mysql.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/master/images/bench-mysql.png)
+![bench-mysql.png](https://raw.githubusercontent.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/refs/heads/main/images/bench-mysql.png)
 
 ## Contributing
 

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)
         {

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;
         }
 

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

@@ -10,7 +10,7 @@
 
   <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)' == 'net8.0'" Version="8.0.*" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.0-preview.3.efcore.9.0.0" />
   </ItemGroup>
 

src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql.csproj

@@ -6,8 +6,8 @@
 
     <ItemGroup>
       <PackageReference Include="NetTopologySuite" Version="2.6.0" />
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.11" />
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.4" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.*" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Condition="'$(TargetFramework)' == 'net9.0'" Version="9.0.*" />
     </ItemGroup>
 
 </Project>

src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlBulkInsertProvider.cs

@@ -35,7 +35,6 @@ private static string GetBinaryImportCommand(IReadOnlyList<ColumnMetadata> prope
     {
         BatchSize = 50_000,
         Converters = [PostgreSqlGeometryConverter.Instance],
-        TypeProviders = [PostgreSqlGeometryConverter.Instance],
     };
 
     /// <inheritdoc />
@@ -57,8 +56,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 +73,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];

src/PhenX.EntityFrameworkCore.BulkInsert.PostgreSql/PostgreSqlGeometryConverter.cs

@@ -1,42 +1,33 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-
 using NetTopologySuite.Geometries;
 
-using NpgsqlTypes;
-
 using PhenX.EntityFrameworkCore.BulkInsert.Abstractions;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
 
 namespace PhenX.EntityFrameworkCore.BulkInsert.PostgreSql;
 
-internal sealed class PostgreSqlGeometryConverter : IBulkValueConverter, IPostgresTypeProvider
+internal sealed class PostgreSqlGeometryConverter : IBulkValueConverter
 {
     public static readonly PostgreSqlGeometryConverter Instance = new();
 
     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)
         {
-            result = geometry.ToBinary();
-            return true;
-        }
+            if (geometry.SRID != options.SRID)
+            {
+                geometry = geometry.Copy();
+                geometry.SRID = options.SRID;
+            }
 
-        result = source;
-        return false;
-    }
-
-    public bool TryGetType(IProperty property, out NpgsqlDbType result)
-    {
-        if (property.ClrType.IsAssignableTo(typeof(Geometry)))
-        {
-            result = NpgsqlDbType.Bytea;
+            result = geometry;
             return true;
         }
 
-        result = default;
+        result = source;
         return false;
     }
 }