Author: jwage
Date: 2008-09-26 00:37:23 +0100 (Fri, 26 Sep 2008)
New Revision: 4983

Added:
   branches/1.0/tests/Ticket/1454TestCase.php
Modified:
   branches/1.0/tests/run.php
Log:
[1.0] Adding coverage for #1454


Added: branches/1.0/tests/Ticket/1454TestCase.php
===================================================================
--- branches/1.0/tests/Ticket/1454TestCase.php                          (rev 0)
+++ branches/1.0/tests/Ticket/1454TestCase.php  2008-09-25 23:37:23 UTC (rev 
4983)
@@ -0,0 +1,45 @@
+<?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_1454_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_1454_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('p.id = (SELECT MAX(p2.id) FROM Phonenumber p2 LIMIT 1)')
+            ->orWhere('p.id = (SELECT MIN(p3.id) FROM Phonenumber p3 LIMIT 
1)');
+            
+        $this->assertEqual($q->getSql(), 'SELECT e.id AS e__id, e.name AS 
e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS 
e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS 
e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS 
p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE 
p.id = (SELECT MAX(p2.id) AS p2__0 FROM phonenumber p2 WHERE (e.type = 0) LIMIT 
1) OR p.id = (SELECT MIN(p3.id) AS p3__0 FROM phonenumber p3 WHERE (e.type = 0) 
LIMIT 1) AND (e.type = 0)');
+    }
+}
\ No newline at end of file

Modified: branches/1.0/tests/run.php
===================================================================
--- branches/1.0/tests/run.php  2008-09-25 23:19:59 UTC (rev 4982)
+++ branches/1.0/tests/run.php  2008-09-25 23:37:23 UTC (rev 4983)
@@ -137,6 +137,7 @@
 $tickets->addTestCase(new Doctrine_Ticket_1419_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1436_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1452_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1454_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1461_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1480_TestCase());
 $test->addTestCase($tickets);


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