Merge branch '5.2' into 5

silverstripe · Apr 13, 2024 · 3e1b5e6 · 3e1b5e6
2 parents 39c9e0d + 6743de4
commit 3e1b5e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ORM/PolymorphicHasManyList.php b/src/ORM/PolymorphicHasManyList.php
@@ -57,7 +57,8 @@ public function getForeignRelation(): ?string
     public function setForeignRelation(string $relationName): static
     {
         Deprecation::notice('5.2.0', 'Will be replaced with a parameter in the constructor');
-        $this->dataQuery->where(["\"{$this->relationForeignKey}\"" => $relationName]);
+        $foreignRelationColumn = DataObject::getSchema()->sqlColumnForField($this->dataClass, $this->relationForeignKey);
+        $this->dataQuery->where([$foreignRelationColumn => $relationName]);
         $this->dataQuery->setQueryParam('Foreign.Relation', $relationName);
         return $this;
     }
@@ -102,8 +103,9 @@ public function __construct($dataClass, $foreignField, $foreignClass)
         // For queries with multiple foreign IDs (such as that generated by
         // DataList::relation) the filter must be generalised to filter by subclasses
         $classNames = Convert::raw2sql(ClassInfo::subclassesFor($foreignClass));
+        $foreignClassColumn = DataObject::getSchema()->sqlColumnForField($dataClass, $this->classForeignKey);
         $this->dataQuery->where(sprintf(
-            "\"{$this->classForeignKey}\" IN ('%s')",
+            "$foreignClassColumn IN ('%s')",
             implode("', '", $classNames)
         ));
     }