Merge branch 'master' of https://github.com/borisdj/EFCore.BulkExtens…

…ions
borisdj · Mar 12, 2024 · 7de0593 · 7de0593
2 parents 932eefb + a32d8ec
commit 7de0593
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/EFCore.BulkExtensions/DbContextBulkTransactionSaveChanges.cs b/EFCore.BulkExtensions/DbContextBulkTransactionSaveChanges.cs
@@ -10,6 +10,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Transactions;
 
 namespace EFCore.BulkExtensions;
 
@@ -91,16 +92,12 @@ private static async Task SaveChangesAsync(DbContext context, BulkConfig? bulkCo
         }
         var connection = context.GetUnderlyingConnection(bulkConfig);
 
-        bool doExplicitCommit = false;
-        if (context.Database.CurrentTransaction == null)
-        {
-            doExplicitCommit = true;
-        }
+        var hasExistingTransaction = context.Database.CurrentTransaction != null || Transaction.Current != null;
 
         try
         {
 
-            var transaction = context.Database.CurrentTransaction ?? context.Database.BeginTransaction();
+            var transaction = hasExistingTransaction ? null : context.Database.CurrentTransaction ?? context.Database.BeginTransaction();
 
             if (option == 1)
             {
@@ -207,15 +204,15 @@ private static async Task SaveChangesAsync(DbContext context, BulkConfig? bulkCo
                     }
                 }
             }
-            if (doExplicitCommit)
+            if (!hasExistingTransaction)
             {
-                transaction.Commit();
+                transaction!.Commit();
                 context.ChangeTracker.AcceptAllChanges();
             }
         }
         finally
         {
-            if (doExplicitCommit)
+            if (!hasExistingTransaction)
             {
 
                 if (isAsync)

diff --git a/EFCore.BulkExtensions/SqlAdapters/PostgreSql/PostgreSqlQueryBuilder.cs b/EFCore.BulkExtensions/SqlAdapters/PostgreSql/PostgreSqlQueryBuilder.cs
@@ -264,7 +264,7 @@ public static string CountUniqueConstrain(TableInfo tableInfo)
         bool usePG_Catalog = true; // PG_Catalog used instead of Information_Schema
         if (usePG_Catalog)
         {
-            q = @"SELECT COUNT(*)
+            q = @"SELECT COUNT(distinct c.conname)
                   FROM pg_catalog.pg_namespace nr,
                       pg_catalog.pg_class r,
                       pg_catalog.pg_attribute a,