Author: romanb
Date: 2008-09-25 19:52:33 +0100 (Thu, 25 Sep 2008)
New Revision: 4973
Added:
branches/1.0/tests/Query/HydrateNoneTestCase.php
Modified:
branches/1.0/lib/Doctrine/Query.php
branches/1.0/tests/run.php
Log:
Fixed #1499. Fixed #1492.
Modified: branches/1.0/lib/Doctrine/Query.php
===================================================================
--- branches/1.0/lib/Doctrine/Query.php 2008-09-23 02:47:11 UTC (rev 4972)
+++ branches/1.0/lib/Doctrine/Query.php 2008-09-25 18:52:33 UTC (rev 4973)
@@ -455,8 +455,8 @@
$fields = $table->getFieldNames();
} else {
// only auto-add the primary key fields if this query object is not
- // a subquery of another query object
- if ( ! $this->_isSubquery || $this->_hydrator->getHydrationMode()
=== Doctrine::HYDRATE_NONE) {
+ // a subquery of another query object and we're not using
HYDRATE_NONE
+ if ( ! $this->_isSubquery && $this->_hydrator->getHydrationMode()
!= Doctrine::HYDRATE_NONE) {
$fields = array_unique(array_merge((array)
$table->getIdentifier(), $fields));
}
}
Added: branches/1.0/tests/Query/HydrateNoneTestCase.php
===================================================================
--- branches/1.0/tests/Query/HydrateNoneTestCase.php
(rev 0)
+++ branches/1.0/tests/Query/HydrateNoneTestCase.php 2008-09-25 18:52:33 UTC
(rev 4973)
@@ -0,0 +1,43 @@
+<?php
+/*
+ * $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.org>.
+ */
+
+/**
+ * Doctrine_Query_Check_TestCase
+ *
+ * @package Doctrine
+ * @author Konsta Vesterinen <[EMAIL PROTECTED]>
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category Object Relational Mapping
+ * @link www.phpdoctrine.org
+ * @since 1.0
+ * @version $Revision$
+ */
+class Doctrine_Query_HydrateNone_TestCase extends Doctrine_UnitTestCase
+{
+ public function testCheckParserSupportsStandardFunctions()
+ {
+ $q = Doctrine_Query::create();
+ $res = $q->select('u.name')->from('User u')->execute(array(),
Doctrine::HYDRATE_NONE);
+ foreach ($res as $row) {
+ $this->assertEqual(1, count($row)); // just 1 column, the name
+ }
+ }
+}
Modified: branches/1.0/tests/run.php
===================================================================
--- branches/1.0/tests/run.php 2008-09-23 02:47:11 UTC (rev 4972)
+++ branches/1.0/tests/run.php 2008-09-25 18:52:33 UTC (rev 4973)
@@ -331,6 +331,7 @@
$query_tests->addTestCase(new Doctrine_Query_Registry_TestCase());
$query_tests->addTestCase(new Doctrine_Query_RemoveQueryPart_TestCase());
$query_tests->addTestCase(new Doctrine_Query_Copy_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_HydrateNone_TestCase());
$test->addTestCase($query_tests);
// Record Tests
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
