Skip to content

Don't try a transaction for the migrator on MySQL #25038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Jan 11, 2021
Merged

Don't try a transaction for the migrator on MySQL #25038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cdfe7b
Don't try a transaction for the migrator on MySQL
nickvergessen Jan 8, 2021
2d34ca4
Only rollback when not MySQL
nickvergessen Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/private/DB/Migrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
namespace OC\DB;

use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Schema\AbstractAsset;
use Doctrine\DBAL\Schema\Comparator;
use Doctrine\DBAL\Schema\Index;
Expand Down Expand Up @@ -238,14 +239,18 @@ protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $

$schemaDiff = $this->getDiff($targetSchema, $connection);

$connection->beginTransaction();
if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
$connection->beginTransaction();
}
$sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
$step = 0;
foreach ($sqls as $sql) {
$this->emit($sql, $step++, count($sqls));
$connection->query($sql);
}
$connection->commit();
if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
$connection->commit();
}
}

/**
Expand Down
12 changes: 10 additions & 2 deletions tests/lib/DB/MigratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
namespace Test\DB;

use Doctrine\DBAL\Exception;
use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Schema\SchemaConfig;
use OC\DB\SchemaWrapper;
Expand Down Expand Up @@ -122,7 +124,11 @@ private function getSchemaConfig() {
}

private function isSQLite() {
return $this->connection->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver;
return $this->connection->getDatabasePlatform() instanceof SqlitePlatform;
}

private function isMySQL() {
return $this->connection->getDatabasePlatform() instanceof MySQLPlatform;
}


Expand All @@ -143,7 +149,9 @@ public function testDuplicateKeyUpgrade() {
try {
$migrator->migrate($endSchema);
} catch (Exception\UniqueConstraintViolationException $e) {
$this->connection->rollBack();
if (!$this->isMySQL()) {
$this->connection->rollBack();
}
throw $e;
}
}
Expand Down