From 54d7efd92c4f80847cf28bb907c621d36690d4dc Mon Sep 17 00:00:00 2001 From: Bill Schaller Date: Wed, 25 Mar 2015 21:24:28 -0400 Subject: [PATCH] Fix LimitSubqueryOutputWalker when used on tables with joined table inheritance --- .../ORM/Tools/Pagination/LimitSubqueryOutputWalker.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php index 0c17a1357..0d23463bf 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php @@ -344,6 +344,14 @@ class LimitSubqueryOutputWalker extends SqlWalker // Generate search patterns for each field's path expression in the order by clause foreach($this->rsm->fieldMappings as $fieldAlias => $columnName) { $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias]; + $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias]; + + // If the field is from a joined child table, we won't be ordering + // on it. + if (!isset($class->fieldMappings[$columnName])) { + continue; + } + $columnName = $this->quoteStrategy->getColumnName( $columnName, $dqlAliasToClassMap[$dqlAliasForFieldAlias],