Merge pull request #11127 from lekoala/patch-45

FIX Unknown column 'ClassName' in field list
silverstripe · Feb 12, 2024 · 9c4266c · 9c4266c
2 parents e87c724 + e0107e0
commit 9c4266c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/ORM/DataQuery.php b/src/ORM/DataQuery.php
@@ -298,13 +298,19 @@ public function getFinalisedQuery($queriedColumns = null)
                             $collisionClassColumn = $schema->sqlColumnForField($collisionClass, 'ClassName');
                             $collisionClasses = ClassInfo::subclassesFor($collisionClass);
                             $collisionClassesSQL = implode(', ', Convert::raw2sql($collisionClasses, true));
-                            $caseClauses[] = "WHEN {$collisionClassColumn} IN ({$collisionClassesSQL}) THEN $collision";
+                            // Only add clause if this is already joined to avoid "Unknown column 'ClassName'" error
+                            $collisionTableForClassName = $schema->tableForField($collisionClass, 'ClassName');
+                            if (array_key_exists($collisionTableForClassName, $query->getFrom())) {
+                                $caseClauses[] = "WHEN {$collisionClassColumn} IN ({$collisionClassesSQL}) THEN $collision";
+                            }
                         }
                     } else {
                         user_error("Bad collision item '$collision'", E_USER_WARNING);
                     }
                 }
-                $query->selectField("CASE " . implode(" ", $caseClauses) . " ELSE NULL END", $collisionField);
+                if (!empty($caseClauses)) {
+                    $query->selectField("CASE " . implode(" ", $caseClauses) . " ELSE NULL END", $collisionField);
+                }
             }
         }