Merge branch 'releases/8.x.x'

PawelGerr · PawelGerr · commit 71161b6651b1 · 2024-12-04T20:48:56.000+01:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
@@ -12,7 +12,7 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" PrivateAssets="all" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutor.cs b/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/BulkOperations/SqliteBulkOperationExecutor.cs
@@ -196,6 +196,11 @@ private async Task<int> ExecuteBulkOperationAsync<T>(
 
       try
       {
+         // Execute bulk operations within a transaction, otherwise SQLite will start a new transaction for every statement
+         await using var tx = _ctx.Database.CurrentTransaction == null
+                                 ? await _ctx.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false)
+                                 : null;
+
          var tableIdentifier = _sqlGenerationHelper.DelimitIdentifier(tableName, schema);
 
          using var reader = bulkOperationContext.CreateReader(entitiesOrValues);
@@ -207,6 +212,9 @@ private async Task<int> ExecuteBulkOperationAsync<T>(
             numberOfAffectedRows += await ExecuteBulkOperationForSeparatedOwnedEntitiesAsync((IReadOnlyList<object>)readEntities, bulkOperationContext, cancellationToken);
          }
 
+         if (tx is not null)
+            await tx.CommitAsync(cancellationToken);
+
          return numberOfAffectedRows;
       }
       finally

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,11 @@ private async Task<int> ExecuteBulkOperationAsync<T>(`
`196`	`196`
`197`	`197`	`try`
`198`	`198`	`{`
	`199`	`+ // Execute bulk operations within a transaction, otherwise SQLite will start a new transaction for every statement`
	`200`	`+ await using var tx = _ctx.Database.CurrentTransaction == null`
	`201`	`+ ? await _ctx.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false)`
	`202`	`+ : null;`
	`203`	`+`
`199`	`204`	`var tableIdentifier = _sqlGenerationHelper.DelimitIdentifier(tableName, schema);`
`200`	`205`
`201`	`206`	`using var reader = bulkOperationContext.CreateReader(entitiesOrValues);`
`@@ -207,6 +212,9 @@ private async Task<int> ExecuteBulkOperationAsync<T>(`
`207`	`212`	`numberOfAffectedRows += await ExecuteBulkOperationForSeparatedOwnedEntitiesAsync((IReadOnlyList<object>)readEntities, bulkOperationContext, cancellationToken);`
`208`	`213`	`}`
`209`	`214`
	`215`	`+ if (tx is not null)`
	`216`	`+ await tx.CommitAsync(cancellationToken);`
	`217`	`+`
`210`	`218`	`return numberOfAffectedRows;`
`211`	`219`	`}`
`212`	`220`	`finally`