Move PostgreSQL sequence resynchronisation out into PgSqlTools class.

This commit is contained in:
Andreas Fischer 2014-04-14 18:33:21 +02:00
parent b0e6542dc2
commit 9cc41a2460
2 changed files with 43 additions and 13 deletions

View File

@ -1,6 +1,7 @@
<?php
/**
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
* Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
@ -230,25 +231,15 @@ class ConvertType extends Command {
protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
$this->config->setValue('maintenance', true);
$type = $input->getArgument('type');
try {
// copy table rows
foreach($tables as $table) {
$output->writeln($table);
$this->copyTable($fromDB, $toDB, $table, $input, $output);
}
if ($type == 'pgsql') {
$sequences = $toDB->getSchemaManager()->listSequences();
$dbname = $input->getArgument('database');
foreach($sequences as $sequence) {
$info = $toDB->fetchAssoc('SELECT table_schema, table_name, column_name '
.'FROM information_schema.columns '
.'WHERE column_default = ? AND table_catalog = ?',
array("nextval('".$sequence->getName()."'::regclass)", $dbname));
$table_name = $info['table_name'];
$column_name = $info['column_name'];
$toDB->executeQuery("SELECT setval('" . $sequence->getName() . "', (SELECT MAX(" . $column_name . ") FROM " . $table_name . "))");
}
if ($input->getArgument('type') === 'pgsql') {
$tools = new \OC\DB\PgSqlTools;
$tools->resynchronizeDatabaseSequences($toDB);
}
// save new database config
$this->saveDBInfo($input);

View File

@ -0,0 +1,39 @@
<?php
/**
* Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\DB;
/**
* Various PostgreSQL specific helper functions.
*/
class PgSqlTools {
/**
* @brief Resynchronizes all sequences of a database after using INSERTs
* without leaving out the auto-incremented column.
* @param \OC\DB\Connection $conn
* @return null
*/
public function resynchronizeDatabaseSequences(Connection $conn) {
$databaseName = $conn->getDatabase();
foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
$sequenceName = $sequence->getName();
$sqlInfo = 'SELECT table_schema, table_name, column_name
FROM information_schema.columns
WHERE column_default = ? AND table_catalog = ?';
$sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
"nextval('$sequenceName'::regclass)",
$databaseName
));
$tableName = $sequenceInfo['table_name'];
$columnName = $sequenceInfo['column_name'];
$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
$conn->executeQuery($sqlSetval);
}
}
}