Doctrine

Timestamp:

09/25/08 18:52:33 (9 months ago)

Author:

romanb

Message:

Fixed #1499. Fixed #1492.

Location:

branches/1.0

Files:

• lib/Doctrine/Query.php (modified) (1 diff)
• tests/Query/HydrateNoneTestCase.php (added)
• tests/run.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Query.php

@@ -456 +456 @@
         } 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));
             }

branches/1.0/tests/run.php

@@ -332 +332 @@
 $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);