Author: jwage
Date: 2008-09-09 00:22:28 +0100 (Tue, 09 Sep 2008)
New Revision: 4897

Added:
   branches/1.0/tests/Ticket/1380TestCase.php
Modified:
   branches/1.0/tests/run.php
Log:
Added coverage for #1380


Added: branches/1.0/tests/Ticket/1380TestCase.php
===================================================================
--- branches/1.0/tests/Ticket/1380TestCase.php                          (rev 0)
+++ branches/1.0/tests/Ticket/1380TestCase.php  2008-09-08 23:22:28 UTC (rev 
4897)
@@ -0,0 +1,58 @@
+<?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_Ticket_1380_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_Ticket_1380_TestCase extends Doctrine_UnitTestCase 
+{
+    public function 
testCalculatedColumnsHydratedInToFirstEncounteredComponent()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.*, p.*, a.*, COUNT(a.id) + COUNT(p.id) AS 
test_calculated_column')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->leftJoin('u.Album a')
+            ->limit(1);
+        $user = $q->fetchOne();
+        $this->assertTrue(isset($user['Album'][0]['test_calculated_column']));
+    }
+
+    public function testCalculatedColumnHydratedInToRootAlso()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.*, p.*, a.*, COUNT(a.id) + COUNT(p.id) AS 
test_calculated_column')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->leftJoin('u.Album a')
+            ->limit(1);
+        $user = $q->fetchOne();
+        $this->assertTrue(isset($user['test_calculated_column']));
+    }
+}
\ No newline at end of file

Modified: branches/1.0/tests/run.php
===================================================================
--- branches/1.0/tests/run.php  2008-09-08 22:14:31 UTC (rev 4896)
+++ branches/1.0/tests/run.php  2008-09-08 23:22:28 UTC (rev 4897)
@@ -127,6 +127,7 @@
 $tickets->addTestCase(new Doctrine_Ticket_1351_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1365_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1372_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1380_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1381_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1383_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1390_TestCase());


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to