mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9809 from owncloud/check-transaction-before-commit-migration-master 

only commit in case a transaction is active
This commit is contained in:
Thomas Müller 2014-07-23 21:35:54 +02:00
parent a547bf8fe6 363ba04f5e
commit fb0416884f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/db/migrator.php
View File

@ -110,7 +110,9 @@ class Migrator {
$this->dropTable($tmpName); $this->dropTable($tmpName);
} catch (DBALException $e) { } catch (DBALException $e) {
// pgsql needs to commit it's failed transaction before doing anything else // pgsql needs to commit it's failed transaction before doing anything else
$this->connection->commit(); if ($this->connection->isTransactionActive()) {
$this->connection->commit();
}
$this->dropTable($tmpName); $this->dropTable($tmpName);
throw new MigrationException($table->getName(), $e->getMessage()); throw new MigrationException($table->getName(), $e->getMessage());
} }