tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

rename var

Browse Source
This commit is contained in:
Thomas Portelange 2024-02-08 09:13:40 +01:00 committed by GitHub
parent 1dd81488aa
commit 2ac68a55a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/DataQuery.php
View File

@ -299,8 +299,8 @@ class DataQuery
$collisionClasses = ClassInfo::subclassesFor($collisionClass); $collisionClasses = ClassInfo::subclassesFor($collisionClass);
$collisionClassesSQL = implode(', ', Convert::raw2sql($collisionClasses, true)); $collisionClassesSQL = implode(', ', Convert::raw2sql($collisionClasses, true));
// Only add clause if this is already joined "Unknown column 'ClassName' error" // Only add clause if this is already joined "Unknown column 'ClassName' error"
$collisionTable = $schema->tableForField($collisionClass, 'ClassName'); $collisionTableForClassName = $schema->tableForField($collisionClass, 'ClassName');
if (array_key_exists($collisionTable, $query->getFrom())) { if (array_key_exists($collisionTableForClassName, $query->getFrom())) {
$caseClauses[] = "WHEN {$collisionClassColumn} IN ({$collisionClassesSQL}) THEN $collision"; $caseClauses[] = "WHEN {$collisionClassColumn} IN ({$collisionClassesSQL}) THEN $collision";
} }
} }