Improved error messages in Paginator: LimitSubqueryOutputWalker

flip111 · flip111 · commit b803f06c8f3c · 2013-09-17T15:07:08.000+02:00
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '&gt;' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.
diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -149,7 +149,9 @@ public function walkSelectStatement(SelectStatement $AST)
             }
         }
 
-        if (count($rootIdentifier) != count($sqlIdentifier)) {
+        if (count($sqlIdentifier) === 0) {
+            throw new \RuntimeException('The Paginator does not support Queries which only yield ScalarResults.');
+        } elseif (count($rootIdentifier) != count($sqlIdentifier)) {
             throw new \RuntimeException(sprintf(
                 'Not all identifier properties can be found in the ResultSetMapping: %s',
                 implode(', ', array_diff($rootIdentifier, array_keys($sqlIdentifier)))

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,9 @@ public function walkSelectStatement(SelectStatement $AST)`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (count($rootIdentifier) != count($sqlIdentifier)) {`
	`152`	`+ if (count($sqlIdentifier) === 0) {`
	`153`	`+ throw new \RuntimeException('The Paginator does not support Queries which only yield ScalarResults.');`
	`154`	`+ } elseif (count($rootIdentifier) != count($sqlIdentifier)) {`
`153`	`155`	`throw new \RuntimeException(sprintf(`
`154`	`156`	`'Not all identifier properties can be found in the ResultSetMapping: %s',`
`155`	`157`	`implode(', ', array_diff($rootIdentifier, array_keys($sqlIdentifier)))`