.Net 8

phongnguyend · phongnguyend · commit 7e832c9b8f07 · 2026-02-28T09:41:20.000+07:00
diff --git a/src/ConnectionExtensionsExamples/Program.cs b/src/ConnectionExtensionsExamples/Program.cs
@@ -135,7 +135,8 @@ await connection.BulkInsertAsync(configurationEntries,
             return new WhenNotMatchedBySourceAction
             {
                 AndCondition = $"{ctx.GetTargetTableColumnWithAlias("Key")} LIKE 'Key%'",
-                ThenAction = $"UPDATE SET {ctx.GetTargetTableColumnWithoutAlias("Key")} = 'xxx'"
+                ThenAction = $"UPDATE SET {ctx.GetTargetTableColumnWithoutAlias("Key")} = @Key",
+                Parameters = new { Key = "XXX" }
             };
         }
     });
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMerge/BulkMergeBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMerge/BulkMergeBuilder.cs
@@ -111,11 +111,11 @@ private string CreateJoinCondition(System.Data.DataTable dataTable)
         }));
     }
 
-    private string CreateWhenNotMatchedBySourceClause()
+    private (string Clause, WhenNotMatchedBySourceAction? Action) CreateWhenNotMatchedBySourceClause()
     {
         if (_options.ConfigureWhenNotMatchedBySource == null)
         {
-            return null;
+            return (null, null);
         }
 
         var context = new MergeContext
@@ -129,7 +129,7 @@ private string CreateWhenNotMatchedBySourceClause()
 
         if (string.IsNullOrEmpty(action.ThenAction))
         {
-            return null;
+            return (null, null);
         }
 
         var clause = new StringBuilder();
@@ -143,7 +143,7 @@ private string CreateWhenNotMatchedBySourceClause()
         clause.AppendLine();
         clause.AppendLine($"    THEN {action.ThenAction}");
 
-        return clause.ToString();
+        return (clause.ToString(), action);
     }
 
     public BulkMergeResult Execute(IReadOnlyCollection<T> data)
@@ -153,7 +153,7 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)
             return SingleMerge(data.First());
         }
 
-        var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();
+        var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();
 
         if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))
         {
@@ -241,6 +241,13 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)
 
         using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
         {
+            var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];
+            foreach (var param in actionParameters)
+            {
+                updateCommand.Parameters.Add(param.Parameter);
+            }
+            LogParameters(actionParameters);
+
             using var reader = updateCommand.ExecuteReader();
 
             while (reader.Read())
@@ -288,7 +295,7 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)
 
     public BulkMergeResult SingleMerge(T data)
     {
-        var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();
+        var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();
 
         if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))
         {
@@ -363,6 +370,13 @@ public BulkMergeResult SingleMerge(T data)
         {
             LogParameters(_table.CreateSqlParameters(updateCommand, data, propertyNames, includeDiscriminator: true, autoAdd: true));
 
+            var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];
+            foreach (var param in actionParameters)
+            {
+                updateCommand.Parameters.Add(param.Parameter);
+            }
+            LogParameters(actionParameters);
+
             using var reader = updateCommand.ExecuteReader();
 
             while (reader.Read())
@@ -423,7 +437,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can
             return await SingleMergeAsync(data.First(), cancellationToken);
         }
 
-        var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();
+        var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();
 
         if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))
         {
@@ -511,6 +525,13 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can
 
         using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
         {
+            var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];
+            foreach (var param in actionParameters)
+            {
+                updateCommand.Parameters.Add(param.Parameter);
+            }
+            LogParameters(actionParameters);
+
             using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);
 
             while (await reader.ReadAsync(cancellationToken))
@@ -558,7 +579,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can
 
     public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken cancellationToken = default)
     {
-        var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();
+        var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();
 
         if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))
         {
@@ -633,6 +654,13 @@ public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken ca
         {
             LogParameters(_table.CreateSqlParameters(updateCommand, data, propertyNames, includeDiscriminator: true, autoAdd: true));
 
+            var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];
+            foreach (var param in actionParameters)
+            {
+                updateCommand.Parameters.Add(param.Parameter);
+            }
+            LogParameters(actionParameters);
+
             using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);
 
             while (await reader.ReadAsync(cancellationToken))

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ await connection.BulkInsertAsync(configurationEntries,`
`135`	`135`	`return new WhenNotMatchedBySourceAction`
`136`	`136`	`{`
`137`	`137`	`AndCondition = $"{ctx.GetTargetTableColumnWithAlias("Key")} LIKE 'Key%'",`
`138`		`- ThenAction = $"UPDATE SET {ctx.GetTargetTableColumnWithoutAlias("Key")} = 'xxx'"`
	`138`	`+ ThenAction = $"UPDATE SET {ctx.GetTargetTableColumnWithoutAlias("Key")} = @Key",`
	`139`	`+ Parameters = new { Key = "XXX" }`
`139`	`140`	`};`
`140`	`141`	`}`
`141`	`142`	`});`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,11 @@ private string CreateJoinCondition(System.Data.DataTable dataTable)`
`111`	`111`	`}));`
`112`	`112`	`}`
`113`	`113`
`114`		`- private string CreateWhenNotMatchedBySourceClause()`
	`114`	`+ private (string Clause, WhenNotMatchedBySourceAction? Action) CreateWhenNotMatchedBySourceClause()`
`115`	`115`	`{`
`116`	`116`	`if (_options.ConfigureWhenNotMatchedBySource == null)`
`117`	`117`	`{`
`118`		`- return null;`
	`118`	`+ return (null, null);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`var context = new MergeContext`
`@@ -129,7 +129,7 @@ private string CreateWhenNotMatchedBySourceClause()`
`129`	`129`
`130`	`130`	`if (string.IsNullOrEmpty(action.ThenAction))`
`131`	`131`	`{`
`132`		`- return null;`
	`132`	`+ return (null, null);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`var clause = new StringBuilder();`
`@@ -143,7 +143,7 @@ private string CreateWhenNotMatchedBySourceClause()`
`143`	`143`	`clause.AppendLine();`
`144`	`144`	`clause.AppendLine($" THEN {action.ThenAction}");`
`145`	`145`
`146`		`- return clause.ToString();`
	`146`	`+ return (clause.ToString(), action);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public BulkMergeResult Execute(IReadOnlyCollection<T> data)`
`@@ -153,7 +153,7 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)`
`153`	`153`	`return SingleMerge(data.First());`
`154`	`154`	`}`
`155`	`155`
`156`		`- var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();`
	`156`	`+ var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();`
`157`	`157`
`158`	`158`	`if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))`
`159`	`159`	`{`
`@@ -241,6 +241,13 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)`
`241`	`241`
`242`	`242`	`using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))`
`243`	`243`	`{`
	`244`	`+ var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];`
	`245`	`+ foreach (var param in actionParameters)`
	`246`	`+ {`
	`247`	`+ updateCommand.Parameters.Add(param.Parameter);`
	`248`	`+ }`
	`249`	`+ LogParameters(actionParameters);`
	`250`	`+`
`244`	`251`	`using var reader = updateCommand.ExecuteReader();`
`245`	`252`
`246`	`253`	`while (reader.Read())`
`@@ -288,7 +295,7 @@ public BulkMergeResult Execute(IReadOnlyCollection<T> data)`
`288`	`295`
`289`	`296`	`public BulkMergeResult SingleMerge(T data)`
`290`	`297`	`{`
`291`		`- var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();`
	`298`	`+ var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();`
`292`	`299`
`293`	`300`	`if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))`
`294`	`301`	`{`
`@@ -363,6 +370,13 @@ public BulkMergeResult SingleMerge(T data)`
`363`	`370`	`{`
`364`	`371`	`LogParameters(_table.CreateSqlParameters(updateCommand, data, propertyNames, includeDiscriminator: true, autoAdd: true));`
`365`	`372`
	`373`	`+ var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];`
	`374`	`+ foreach (var param in actionParameters)`
	`375`	`+ {`
	`376`	`+ updateCommand.Parameters.Add(param.Parameter);`
	`377`	`+ }`
	`378`	`+ LogParameters(actionParameters);`
	`379`	`+`
`366`	`380`	`using var reader = updateCommand.ExecuteReader();`
`367`	`381`
`368`	`382`	`while (reader.Read())`
`@@ -423,7 +437,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can`
`423`	`437`	`return await SingleMergeAsync(data.First(), cancellationToken);`
`424`	`438`	`}`
`425`	`439`
`426`		`- var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();`
	`440`	`+ var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();`
`427`	`441`
`428`	`442`	`if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))`
`429`	`443`	`{`
`@@ -511,6 +525,13 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can`
`511`	`525`
`512`	`526`	`using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))`
`513`	`527`	`{`
	`528`	`+ var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];`
	`529`	`+ foreach (var param in actionParameters)`
	`530`	`+ {`
	`531`	`+ updateCommand.Parameters.Add(param.Parameter);`
	`532`	`+ }`
	`533`	`+ LogParameters(actionParameters);`
	`534`	`+`
`514`	`535`	`using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);`
`515`	`536`
`516`	`537`	`while (await reader.ReadAsync(cancellationToken))`
`@@ -558,7 +579,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IReadOnlyCollection<T> data, Can`
`558`	`579`
`559`	`580`	`public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken cancellationToken = default)`
`560`	`581`	`{`
`561`		`- var whenNotMatchedBySourceClause = CreateWhenNotMatchedBySourceClause();`
	`582`	`+ var (whenNotMatchedBySourceClause, whenNotMatchedBySourceAction) = CreateWhenNotMatchedBySourceClause();`
`562`	`583`
`563`	`584`	`if (!_updateColumnNames.Any() && !_insertColumnNames.Any() && string.IsNullOrEmpty(whenNotMatchedBySourceClause))`
`564`	`585`	`{`
`@@ -633,6 +654,13 @@ public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken ca`
`633`	`654`	`{`
`634`	`655`	`LogParameters(_table.CreateSqlParameters(updateCommand, data, propertyNames, includeDiscriminator: true, autoAdd: true));`
`635`	`656`
	`657`	`+ var actionParameters = whenNotMatchedBySourceAction?.Parameters.ToSqlParameterInfors() ?? [];`
	`658`	`+ foreach (var param in actionParameters)`
	`659`	`+ {`
	`660`	`+ updateCommand.Parameters.Add(param.Parameter);`
	`661`	`+ }`
	`662`	`+ LogParameters(actionParameters);`
	`663`	`+`
`636`	`664`	`using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);`
`637`	`665`
`638`	`666`	`while (await reader.ReadAsync(cancellationToken))`