Merge pull request #207 from born05/craft-3

Fixes #127 error.
verbb · Oct 24, 2018 · 923f5f8 · 923f5f8
2 parents d26e2dd + b711b87
commit 923f5f8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/migrations/m180219_000000_sites.php b/src/migrations/m180219_000000_sites.php
@@ -50,16 +50,16 @@ public function safeUp()
 
         foreach ($this->db->getSchema()->getTableNames() as $tableName) {
             if (StringHelper::startsWith($tableName, $superTableTablePrefix)) {
-                // Rename column
-                if ($this->db->columnExists($tableName, 'locale__siteId')) {
-                    $this->renameColumn($tableName, 'locale__siteId', 'siteId');
-                }
-
                 // There's actually an issue here in the MigrationHelper::dropAllIndexesOnTable class, not using the current migration
                 // as context to find existing indexes. This is important, because the indexes have changed from their current names
                 $this->dropAllForeignKeysOnTable($tableName);
                 $this->dropAllIndexesOnTable($tableName);
 
+                // Rename column
+                if ($this->db->columnExists($tableName, 'locale__siteId')) {
+                    $this->renameColumn($tableName, 'locale__siteId', 'siteId');
+                }
+
                 // Add them back (like creating a new Matrix would)
                 $this->createIndex(null, $tableName, ['elementId', 'siteId'], true);
                 $this->addForeignKey(null, $tableName, ['elementId'], '{{%elements}}', ['id'], 'CASCADE', null);