Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation

Change the row-format before changing the collation
This commit is contained in:
Joas Schilling 2017-01-13 14:43:06 +01:00 committed by GitHub
commit 91beb178a7
1 changed files with 12 additions and 0 deletions

View File

@ -75,6 +75,18 @@ class Collation implements IRepairStep {
$tables = $this->getAllNonUTF8BinTables($this->connection);
foreach ($tables as $table) {
$output->info("Change row format for $table ...");
$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
try {
$query->execute();
} catch (DriverException $e) {
// Just log this
$this->logger->logException($e);
if (!$this->ignoreFailures) {
throw $e;
}
}
$output->info("Change collation for $table ...");
$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
try {