mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9065 from owncloud/migrator-keepprimaryindexname 

Do not rename primary key index when renaming table
This commit is contained in:
Vincent Petry 2014-06-17 16:43:33 +02:00
parent c5e33f5172 ffdc1c2fcf
commit cce58368ad
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/db/migrator.php
View File

@ -128,7 +128,13 @@ class Migrator {
$indexes = $table->getIndexes(); $indexes = $table->getIndexes();
$newIndexes = array(); $newIndexes = array();
foreach ($indexes as $index) { foreach ($indexes as $index) {
$indexName = 'oc_' . uniqid(); // avoid conflicts in index names if ($index->isPrimary()) {
// do not rename primary key
$indexName = $index->getName();
} else {
// avoid conflicts in index names
$indexName = 'oc_' . uniqid();
}
$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary()); $newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
} }

21
tests/lib/db/migrator.php
View File

@ -119,4 +119,25 @@ class Migrator extends \PHPUnit_Framework_TestCase {
$this->assertTrue(true); $this->assertTrue(true);
} }
} }
public function testAddingPrimaryKeyWithAutoIncrement() {
$startSchema = new Schema(array(), array(), $this->getSchemaConfig());
$table = $startSchema->createTable($this->tableName);
$table->addColumn('id', 'integer');
$table->addColumn('name', 'string');
$endSchema = new Schema(array(), array(), $this->getSchemaConfig());
$table = $endSchema->createTable($this->tableName);
$table->addColumn('id', 'integer', array('autoincrement' => true));
$table->addColumn('name', 'string');
$table->setPrimaryKey(array('id'));
$migrator = $this->getMigrator();
$migrator->migrate($startSchema);
$migrator->checkMigrate($endSchema);
$migrator->migrate($endSchema);
$this->assertTrue(true);
}
} }