From 45d95ad13044249ac4e6182490f471d16ff1ca9b Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Tue, 15 Nov 2011 01:09:48 -0200 Subject: [PATCH] Fixed wrong indentation by my previous commit. --- lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php | 2 ++ lib/Doctrine/ORM/Query/SqlWalker.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index fc41f067f..308397c16 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -310,7 +310,9 @@ class ObjectHydrator extends AbstractHydrator // Extract scalar values. They're appended at the end. if (isset($rowData['scalars'])) { $scalars = $rowData['scalars']; + unset($rowData['scalars']); + if (empty($rowData)) { ++$this->_resultCounter; } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index ba5d29714..99dce64a8 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -524,9 +524,9 @@ class SqlWalker implements TreeWalker $this->_query->getHint(Query::HINT_INCLUDE_META_COLUMNS); foreach ($this->_selectedClasses as $selectedClass) { - $class = $selectedClass['class']; - $dqlAlias = $selectedClass['dqlAlias']; - $resultAlias = $selectedClass['resultAlias']; + $class = $selectedClass['class']; + $dqlAlias = $selectedClass['dqlAlias']; + $resultAlias = $selectedClass['resultAlias']; // Register as entity or joined entity result if ($this->_queryComponents[$dqlAlias]['relation'] === null) {