Add SQL dialect mappings and enhance SQL expression handling for bulk insert operations

Author: fabien.menager

.idea/.idea.EntityFrameworkCore.ExecuteInsert/.idea/sqldialects.xml

@@ -7,6 +7,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFrameworkCore.ExecuteInsert.SqlServer", "src\EntityFrameworkCore.ExecuteInsert.SqlServer\EntityFrameworkCore.ExecuteInsert.SqlServer.csproj", "{8098F37B-FA5E-4BDB-B64A-00FBDE2001C9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CBEBA2A8-79E0-412E-93C1-C88F4473D78B}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8A83782-311C-454D-8B97-B3FB86478BF4}"
 EndProject

EntityFrameworkCore.ExecuteInsert.sln

@@ -7,4 +7,8 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+    </ItemGroup>
+
 </Project>

src/Directory.Build.props

@@ -5,7 +5,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
       <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
     </ItemGroup>
 

src/EntityFrameworkCore.ExecuteInsert.PostgreSql/EntityFrameworkCore.ExecuteInsert.PostgreSql.csproj

@@ -1,11 +1,14 @@
 using EntityFrameworkCore.ExecuteInsert.Options;
 
+using JetBrains.Annotations;
+
 using Microsoft.EntityFrameworkCore;
 
 using Npgsql;
 
 namespace EntityFrameworkCore.ExecuteInsert.PostgreSql;
 
+[UsedImplicitly]
 public class PostgreSqlBulkInsertProvider : BulkInsertProviderBase<PostgreSqlDialectBuilder>
 {
     //language=sql

src/EntityFrameworkCore.ExecuteInsert.PostgreSql/PostgreSqlBulkInsertProvider.cs

@@ -5,7 +5,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
     </ItemGroup>
 

src/EntityFrameworkCore.ExecuteInsert.SqlServer/EntityFrameworkCore.ExecuteInsert.SqlServer.csproj

@@ -1,10 +1,13 @@
 using EntityFrameworkCore.ExecuteInsert.Options;
 
+using JetBrains.Annotations;
+
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace EntityFrameworkCore.ExecuteInsert.SqlServer;
 
+[UsedImplicitly]
 public class SqlServerBulkInsertProvider : BulkInsertProviderBase<SqlServerDialectBuilder>
 {
     //language=sql
@@ -30,7 +33,7 @@ protected override async Task BulkInsert<T>(DbContext context, IEnumerable<T> en
 
         foreach (var prop in properties)
         {
-            bulkCopy.ColumnMappings.Add(prop.Name, SqlDialect.Escape(prop.Name));
+            bulkCopy.ColumnMappings.Add(prop.Name, SqlDialect.Escape(prop.ColumnName));
         }
 
         await bulkCopy.WriteToServerAsync(new EnumerableDataReader<T>(entities, properties), ctk);

src/EntityFrameworkCore.ExecuteInsert.SqlServer/SqlServerBulkInsertProvider.cs

@@ -13,8 +13,11 @@ public class SqlServerDialectBuilder : SqlDialectBuilder
 {
     protected override string OpenDelimiter => "[";
     protected override string CloseDelimiter => "]";
+    protected override string ConcatOperator => "+";
+
+    protected override bool SupportsMoveRows => false;
 
-    public override string BuildMoveDataSql<T>(string source,
+    public override string BuildMoveDataSql<T>(DbContext context, string source,
         string target,
         IProperty[] insertedProperties,
         IProperty[] properties,
@@ -23,30 +26,20 @@ public override string BuildMoveDataSql<T>(string source,
         var insertedColumns = insertedProperties.Select(p => Escape(p.GetColumnName())).ToArray();
         var insertedColumnList = string.Join(", ", insertedColumns);
 
-        var returnedColumns = properties.Select(p => $"INSERTED.{p.GetColumnName()} AS [{p.Name}]");
+        var returnedColumns = properties.Select(p => $"INSERTED.{p.GetColumnName()} AS {p.GetColumnName()}");
         var columnList = string.Join(", ", returnedColumns);
 
         var q = new StringBuilder();
 
-//         if (options.MoveRows)
-//         {
-//             var deletedColumnList = string.Join(", ", insertedColumns.Select(c => $"DELETED.{c}"));
-//
-//             q.AppendLine($"""
-//                 DELETE FROM {tableName}
-//                 OUTPUT {deletedColumnList}
-//                 """);
-//         }
-
         // Merge handling
         if (onConflict is OnConflictOptions<T> onConflictTyped && onConflictTyped.Match != null)
         {
-            var matchColumns = GetColumns(onConflictTyped.Match);
+            var matchColumns = GetColumns(context, onConflictTyped.Match);
             var matchOn = string.Join(" AND ",
-                matchColumns.Select(col => $"TARGET.{Escape(col)} = SOURCE.{Escape(col)}"));
+                matchColumns.Select(col => $"TARGET.{col} = SOURCE.{col}"));
 
             var updateSet = onConflictTyped.Update != null
-                ? string.Join(", ", GetUpdates(onConflictTyped.Update))
+                ? string.Join(", ", GetUpdates(context, onConflictTyped.Update))
                 : null;
 
             q.AppendLine($"MERGE INTO {target} AS TARGET");
@@ -89,11 +82,8 @@ public override string BuildMoveDataSql<T>(string source,
         return q.ToString();
     }
 
-    protected override string GetExcludedColumnName(MemberExpression member)
+    protected override string GetExcludedColumnName<TEntity>(DbContext context, MemberExpression member)
     {
-        var prefix = "SOURCE";
-        return $"{prefix}.{Escape(member.Member.Name)}";
+        return $"SOURCE.{GetColumnName<TEntity>(context, member.Member.Name)}";
     }
-
-    protected override string ConcatOperator => "+";
 }

src/EntityFrameworkCore.ExecuteInsert.SqlServer/SqlServerDialectBuilder.cs

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
-    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
   </ItemGroup>
 
 </Project>

src/EntityFrameworkCore.ExecuteInsert.Sqlite/EntityFrameworkCore.ExecuteInsert.Sqlite.csproj

@@ -3,11 +3,14 @@
 using EntityFrameworkCore.ExecuteInsert.Extensions;
 using EntityFrameworkCore.ExecuteInsert.Options;
 
+using JetBrains.Annotations;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Data.Sqlite;
 
 namespace EntityFrameworkCore.ExecuteInsert.Sqlite;
 
+[UsedImplicitly]
 public class SqliteBulkInsertProvider : BulkInsertProviderBase<SqliteDialectBuilder>
 {
     protected override string BulkInsertId => "rowid";