Merge pull request #235 from angrybrad/master

Fixed a migration error that could occur when updating to Craft 4
sebastian-lenz · Aug 18, 2022 · 1b011d7 · 1b011d7
2 parents 23fb11f + 758c5e5
commit 1b011d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,8 @@
 # Release Notes for Typed Link Field
 
+## Unreleased
+- Fix: Fixed a migration error that could occur when updating to Craft 4. (see https://github.com/sebastian-lenz/craft-linkfield/issues/230)
+
 ## 2.1.4
 - Fix: Respect the default link type setting in matrix fields (see https://github.com/sebastian-lenz/craft-linkfield/issues/221)
 - Fix: Element query executed before Craft is fully initialized (see https://github.com/sebastian-lenz/craft-linkfield/issues/231)

diff --git a/src/migrations/m190417_202153_migrateDataToTable.php b/src/migrations/m190417_202153_migrateDataToTable.php
@@ -132,9 +132,11 @@ private function updateLinkField(LinkField $field, string $table, string $handle
       }
     };
 
+    // Make sure the rows actually exist in the elements table.
     $rows = (new Query())
-      ->select(['elementId', 'siteId', $columnName])
-      ->from($table)
+      ->select(['t.elementId', 't.siteId', 't.'.$columnName])
+      ->from(['t' => $table])
+      ->innerJoin(['e' => Table::ELEMENTS], '[[t.elementId]] = [[e.id]]')
       ->all();
 
     foreach ($rows as $row) {