tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '5.2' into 5

This commit is contained in:
github-actions 2024-04-13 14:23:22 +00:00
parent 39c9e0d31c 6743de4356
commit 3e1b5e6452
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ORM/PolymorphicHasManyList.php
View File

@ -57,7 +57,8 @@ class PolymorphicHasManyList extends HasManyList
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 @@ class PolymorphicHasManyList extends HasManyList
// 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)
));
}