FIX eagerLoad crash with nonterminal hasOne relation

silverstripe · Nov 29, 2024 · 2378751 · 2378751
1 parent 4d78f78
commit 2378751
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/ORM/DataList.php b/src/ORM/DataList.php
@@ -1055,7 +1055,14 @@ private function fetchEagerLoadRelations(Query $query): void
             $parentIDs = $topLevelIDs;
             $parentRelationData = $query;
             $chainToDate = [];
+            $polymorphicEncountered = false;
             foreach (explode('.', $relationChain) as $relationName) {
+                if ($polymorphicEncountered) {
+                    $polymorphicRelation = $chainToDate[count($chainToDate) - 1];
+                    throw new InvalidArgumentException(
+                        "Invalid relation passed to eagerLoad() - $relationChain. Further nested relations are not supported after polymorphic has_one relation $polymorphicRelation."
+                    );
+                }
                 /** @var Query|array<DataObject|EagerLoadedList> $parentRelationData */
                 $chainToDate[] = $relationName;
                 list(
@@ -1074,6 +1081,9 @@ private function fetchEagerLoadRelations(Query $query): void
                             $relationName,
                             $relationType
                         );
+                        if ($relationComponent['joinClass']) {
+                            $polymorphicEncountered = true;
+                        }
                         break;
                     case 'belongs_to':
                         list($parentRelationData, $parentIDs) = $this->fetchEagerLoadBelongsTo(
@@ -1205,6 +1215,10 @@ private function fetchEagerLoadHasOne(
         // into the has_one components - DataObject does that for us in getComponent() without any extra
         // db calls.
 
+        // fetchEagerLoadRelations expects these to be flat arrays if the relation is not polymorphic
+        if (!$hasOneClassField) {
+            return [$fetchedRecords[$relationDataClass] ?? [], $fetchedIDs[$relationDataClass] ?? []];
+        }
         return [$fetchedRecords, $fetchedIDs];
     }