[Pkg-owncloud-commits] [owncloud] 46/153: Move PostgreSQL sequence resynchronisation out into PgSqlTools class.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9cc41a24603b250b9c657edfc7007bf10e795899
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Mon Apr 14 18:33:21 2014 +0200

    Move PostgreSQL sequence resynchronisation out into PgSqlTools class.
---
 core/command/db/converttype.php | 17 ++++-------------
 lib/private/db/pgsqltools.php   | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 64178d1..3b40576 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2013 Bart Visscher <bartv at thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu at 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);
diff --git a/lib/private/db/pgsqltools.php b/lib/private/db/pgsqltools.php
new file mode 100644
index 0000000..01e7614
--- /dev/null
+++ b/lib/private/db/pgsqltools.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu at 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);
+		}
+	}
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git