From 1488a509b24c918e2321ca736895e6418c17e7ad Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Wed, 16 Apr 2014 05:44:54 +0000
Subject: [PATCH] DDC-2937 More informative response when using single scalar
 hydrator when it returns single row but multiple columns.

---
 .../ORM/Internal/Hydration/SingleScalarHydrator.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
index 297aa98a0..d75bfcefa 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
@@ -43,9 +43,13 @@ class SingleScalarHydrator extends AbstractHydrator
             throw new NoResultException();
         }
 
-        if ($numRows > 1 || count($data[key($data)]) > 1) {
+        if ($numRows > 1) {
             throw new NonUniqueResultException('The query returned multiple rows. Change the query or use a different result function like getScalarResult().');
         }
+        
+        if (count($data[key($data)]) > 1) {
+            throw new NonUniqueResultException('The row contains multiple columns. Change the query or use a different result function like getScalarResult().');
+        }
 
         $cache  = array();
         $result = $this->gatherScalarRowData($data[key($data)], $cache);