Browse Source
fix(sqlite): Remove no longer required autoincrement fix
fix(sqlite): Remove no longer required autoincrement fix
- I installed current master and exported the schema as SQL - Then I went to this branch, removed the content of the run() method (so made it no-op) - I installed again and exported the schema as SQL - The files are exactly the same, so whatever we tried to fix was fixed since 2015 in doctrine dbal Signed-off-by: Joas Schilling <coding@schilljs.com>pull/38556/head
Joas Schilling
2 years ago
No known key found for this signature in database
GPG Key ID: 74434EFE0D2E2205
6 changed files with 2 additions and 198 deletions
-
1lib/composer/composer/autoload_classmap.php
-
1lib/composer/composer/autoload_static.php
-
4lib/private/DB/Connection.php
-
4lib/private/Repair.php
-
100lib/private/Repair/SqliteAutoincrement.php
-
90tests/lib/Repair/RepairSqliteAutoincrementTest.php
@ -1,100 +0,0 @@ |
|||
<?php |
|||
/** |
|||
* @copyright Copyright (c) 2016, ownCloud, Inc. |
|||
* |
|||
* @author Roeland Jago Douma <roeland@famdouma.nl> |
|||
* @author Thomas Müller <thomas.mueller@tmit.eu> |
|||
* @author Vincent Petry <vincent@nextcloud.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\Repair; |
|||
|
|||
use Doctrine\DBAL\Platforms\SqlitePlatform; |
|||
use Doctrine\DBAL\Schema\ColumnDiff; |
|||
use Doctrine\DBAL\Schema\SchemaDiff; |
|||
use Doctrine\DBAL\Schema\SchemaException; |
|||
use Doctrine\DBAL\Schema\TableDiff; |
|||
use OCP\Migration\IOutput; |
|||
use OCP\Migration\IRepairStep; |
|||
|
|||
/** |
|||
* Fixes Sqlite autoincrement by forcing the SQLite table schemas to be |
|||
* altered in order to retrigger SQL schema generation through OCSqlitePlatform. |
|||
*/ |
|||
class SqliteAutoincrement implements IRepairStep { |
|||
/** |
|||
* @var \OC\DB\Connection |
|||
*/ |
|||
protected $connection; |
|||
|
|||
/** |
|||
* @param \OC\DB\Connection $connection |
|||
*/ |
|||
public function __construct($connection) { |
|||
$this->connection = $connection; |
|||
} |
|||
|
|||
public function getName() { |
|||
return 'Repair SQLite autoincrement'; |
|||
} |
|||
|
|||
/** |
|||
* Fix mime types |
|||
*/ |
|||
public function run(IOutput $out) { |
|||
if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) { |
|||
return; |
|||
} |
|||
|
|||
$sourceSchema = $this->connection->getSchemaManager()->createSchema(); |
|||
|
|||
$schemaDiff = new SchemaDiff(); |
|||
|
|||
foreach ($sourceSchema->getTables() as $tableSchema) { |
|||
$primaryKey = $tableSchema->getPrimaryKey(); |
|||
if (!$primaryKey) { |
|||
continue; |
|||
} |
|||
|
|||
$columnNames = $primaryKey->getColumns(); |
|||
|
|||
// add a column diff for every primary key column,
|
|||
// but do not actually change anything, this will
|
|||
// force the generation of SQL statements to alter
|
|||
// those tables, which will then trigger the
|
|||
// specific SQL code from OCSqlitePlatform
|
|||
try { |
|||
$tableDiff = new TableDiff($tableSchema->getName()); |
|||
$tableDiff->fromTable = $tableSchema; |
|||
foreach ($columnNames as $columnName) { |
|||
$columnSchema = $tableSchema->getColumn($columnName); |
|||
$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema); |
|||
$tableDiff->changedColumns[$columnSchema->getName()] = $columnDiff; |
|||
$schemaDiff->changedTables[] = $tableDiff; |
|||
} |
|||
} catch (SchemaException $e) { |
|||
// ignore
|
|||
} |
|||
} |
|||
|
|||
$this->connection->beginTransaction(); |
|||
foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) { |
|||
$this->connection->executeQuery($sql); |
|||
} |
|||
$this->connection->commit(); |
|||
} |
|||
} |
|||
@ -1,90 +0,0 @@ |
|||
<?php |
|||
/** |
|||
* Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com> |
|||
* This file is licensed under the Affero General Public License version 3 or |
|||
* later. |
|||
* See the COPYING-README file. |
|||
*/ |
|||
|
|||
namespace Test\Repair; |
|||
|
|||
use OC\DB\Connection; |
|||
use OCP\Migration\IOutput; |
|||
|
|||
/** |
|||
* Tests for fixing the SQLite id recycling |
|||
* |
|||
* @group DB |
|||
*/ |
|||
class RepairSqliteAutoincrementTest extends \Test\TestCase { |
|||
/** |
|||
* @var \OC\Repair\SqliteAutoincrement |
|||
*/ |
|||
private $repair; |
|||
|
|||
/** |
|||
* @var Connection |
|||
*/ |
|||
private $connection; |
|||
|
|||
/** |
|||
* @var string |
|||
*/ |
|||
private $tableName; |
|||
|
|||
/** |
|||
* @var \OCP\IConfig |
|||
*/ |
|||
private $config; |
|||
|
|||
protected function setUp(): void { |
|||
parent::setUp(); |
|||
|
|||
$this->connection = \OC::$server->get(\OC\DB\Connection::class); |
|||
$this->config = \OC::$server->getConfig(); |
|||
if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) { |
|||
$this->markTestSkipped("Test only relevant on Sqlite"); |
|||
} |
|||
|
|||
$dbPrefix = $this->config->getSystemValueString('dbtableprefix', 'oc_'); |
|||
$this->tableName = $this->getUniqueID($dbPrefix . 'autoinc_test'); |
|||
$this->connection->prepare('CREATE TABLE ' . $this->tableName . '("someid" INTEGER NOT NULL, "text" VARCHAR(16), PRIMARY KEY("someid"))')->execute(); |
|||
|
|||
$this->repair = new \OC\Repair\SqliteAutoincrement($this->connection); |
|||
} |
|||
|
|||
protected function tearDown(): void { |
|||
$this->connection->getSchemaManager()->dropTable($this->tableName); |
|||
parent::tearDown(); |
|||
} |
|||
|
|||
/** |
|||
* Tests whether autoincrement works |
|||
* |
|||
* @return boolean true if autoincrement works, false otherwise |
|||
*/ |
|||
protected function checkAutoincrement() { |
|||
$this->connection->executeUpdate('INSERT INTO ' . $this->tableName . ' ("text") VALUES ("test")'); |
|||
$insertId = $this->connection->lastInsertId(); |
|||
$this->connection->executeUpdate('DELETE FROM ' . $this->tableName . ' WHERE "someid" = ?', [$insertId]); |
|||
|
|||
// insert again
|
|||
$this->connection->executeUpdate('INSERT INTO ' . $this->tableName . ' ("text") VALUES ("test2")'); |
|||
$newInsertId = $this->connection->lastInsertId(); |
|||
|
|||
return ($insertId !== $newInsertId); |
|||
} |
|||
|
|||
public function testConvertIdColumn() { |
|||
$this->assertFalse($this->checkAutoincrement()); |
|||
|
|||
/** @var IOutput | \PHPUnit\Framework\MockObject\MockObject $outputMock */ |
|||
$outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') |
|||
->disableOriginalConstructor() |
|||
->getMock(); |
|||
|
|||
$this->repair->run($outputMock); |
|||
|
|||
$this->assertTrue($this->checkAutoincrement()); |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue