diff options
author | Robin Appelman <robin@icewind.nl> | 2017-11-17 15:48:10 +0100 |
---|---|---|
committer | Robin Appelman <robin@icewind.nl> | 2017-11-22 17:57:17 +0100 |
commit | da3004b8f5f6f96f817568c5cba002540d61150b (patch) | |
tree | 5d342d5d67434c960765c36fe187989a264fe2f8 /lib/private | |
parent | f347e2e4a6cab71c35d58ff21692e23d7443db60 (diff) | |
download | nextcloud-server-da3004b8f5f6f96f817568c5cba002540d61150b.tar.gz nextcloud-server-da3004b8f5f6f96f817568c5cba002540d61150b.zip |
add postgresql10 compatibility to dbal
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/DB/ConnectionFactory.php | 3 | ||||
-rw-r--r-- | lib/private/DB/OCPostgreSqlPlatform.php | 95 |
2 files changed, 0 insertions, 98 deletions
diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index 082e81dfa74..fcb0117a0db 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -139,9 +139,6 @@ class ConnectionFactory { unset($additionalConnectionParams['host']); break; - case 'pgsql': - $additionalConnectionParams['platform'] = new OCPostgreSqlPlatform(); - break; case 'sqlite3': $journalMode = $additionalConnectionParams['sqlite.journal_mode']; $additionalConnectionParams['platform'] = new OCSqlitePlatform(); diff --git a/lib/private/DB/OCPostgreSqlPlatform.php b/lib/private/DB/OCPostgreSqlPlatform.php deleted file mode 100644 index e66ab84252a..00000000000 --- a/lib/private/DB/OCPostgreSqlPlatform.php +++ /dev/null @@ -1,95 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2017, ownCloud GmbH - * - * @author Joas Schilling <coding@schilljs.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OC\DB; - -use Doctrine\DBAL\Platforms\PostgreSqlPlatform; -use Doctrine\DBAL\Schema\ColumnDiff; -use Doctrine\DBAL\Schema\TableDiff; -use Doctrine\DBAL\Types\Type; - -class OCPostgreSqlPlatform extends PostgreSqlPlatform { - - /** - * {@inheritDoc} - */ - public function getAlterTableSQL(TableDiff $diff){ - $queries = parent::getAlterTableSQL($diff); - foreach ($queries as $index => $sql){ - // BIGSERIAL could not be used in statements altering column type - // That's why we replace it with BIGINT - // see https://github.com/owncloud/core/pull/28364#issuecomment-315006853 - if (preg_match('|(ALTER TABLE\s+\S+\s+ALTER\s+\S+\s+TYPE\s+)(BIGSERIAL)|i', $sql, $matches)) { - $alterTable = $matches[1]; - $queries[$index] = $alterTable . 'BIGINT'; - } - - // Changing integer to bigint kills next autoincrement value - // see https://github.com/owncloud/core/pull/28364#issuecomment-315006853 - if (preg_match('|ALTER TABLE\s+(\S+)\s+ALTER\s+(\S+)\s+DROP DEFAULT|i', $sql, $matches)) { - $queryColumnName = $matches[2]; - $columnDiff = $this->findColumnDiffByName($diff, $queryColumnName); - if ($columnDiff && $this->shouldSkipDropDefault($columnDiff)) { - unset($queries[$index]); - continue; - } - } - } - - return $queries; - } - - /** - * We should NOT drop next sequence value if - * - type was changed from INTEGER to BIGINT - * - column keeps an autoincrement - * - default value is kept NULL - * - * @param ColumnDiff $columnDiff - * @return bool - */ - private function shouldSkipDropDefault(ColumnDiff $columnDiff) { - $column = $columnDiff->column; - $fromColumn = $columnDiff->fromColumn; - return $fromColumn->getType()->getName() === Type::INTEGER - && $column->getType()->getName() === Type::BIGINT - && $fromColumn->getDefault() === null - && $column->getDefault() === null - && $fromColumn->getAutoincrement() - && $column->getAutoincrement(); - } - - /** - * @param TableDiff $diff - * @param string $name - * @return ColumnDiff | false - */ - private function findColumnDiffByName(TableDiff $diff, $name) { - foreach ($diff->changedColumns as $columnDiff) { - $oldColumnName = $columnDiff->getOldColumnName()->getQuotedName($this); - if ($oldColumnName === $name) { - return $columnDiff; - } - } - return false; - } -} |