Do not rename primary key index when renaming table

When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".

diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index 517be8399e86a1c4d832c5f25c45bb01f5328100..8dbfabe443ca1dcbc7e7d90c55011f7ae13b33bd 100644 (file)
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -128,7 +128,13 @@ class Migrator {
                $indexes = $table->getIndexes();
                $newIndexes = array();
                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());
                }