Merge pull request #454 from DataObjects-NET/7.2-no-exception-overwrite-on-commit-upgrade

No exception overwriting when it happens on upgrade transaction commit

Author: alex-kulakov

ChangeLog/7.2.1-dev.txt

@@ -1,2 +1,4 @@
 [main] Added Query.SingleAsync()/SingleOrDefaultAsync and QueryEndpoint.SingleAsync()/SingleOrDefaultAsync methods
 [main] Addressed issue of not disposing IAsyncEnumerator which caused query being open
+[main] Addressed issue of overwriting exception on attempt to rollback the transaction of Domain upgrade if commit operation failed
+[postgresql] Update Npgsql to 9.0.4

Orm/Xtensive.Orm/Orm/Upgrade/UpgradingDomainBuilder.cs

@@ -172,7 +172,13 @@ private void CompleteUpgradeTransaction()
         driver.CommitTransaction(null, connection);
       }
       catch {
-        driver.RollbackTransaction(null, connection);
+        // If transaction has become broken during commit its rollback leads to new exception
+        // which will overwrite the original one.
+        // Check for active transaction should work because on exception within 
+        // driver.Commit it is set to NULL.
+        if (connection.ActiveTransaction != null) {
+          driver.RollbackTransaction(null, connection);
+        }
         throw;
       }
     }
@@ -190,7 +196,13 @@ private async ValueTask CompleteUpgradeTransactionAsync(CancellationToken token)
         await driver.CommitTransactionAsync(null, connection, token);
       }
       catch {
-        await driver.RollbackTransactionAsync(null, connection, token);
+        // If transaction has become broken during commit its rollback leads to new exception
+        // which will overwrite the original one.
+        // Check for active transaction should work because on exception within 
+        // driver.Commit it is set to NULL.
+        if (connection.ActiveTransaction != null) {
+          await driver.RollbackTransactionAsync(null, connection, token);
+        }
         throw;
       }
     }