Author: jwage Date: 2008-09-26 00:19:59 +0100 (Fri, 26 Sep 2008) New Revision: 4982
Added: branches/1.0/tests/Ticket/1461TestCase.php Modified: branches/1.0/tests/run.php Log: [1.0] Added coverage for #1461 Added: branches/1.0/tests/Ticket/1461TestCase.php =================================================================== --- branches/1.0/tests/Ticket/1461TestCase.php (rev 0) +++ branches/1.0/tests/Ticket/1461TestCase.php 2008-09-25 23:19:59 UTC (rev 4982) @@ -0,0 +1,86 @@ +<?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_1461_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_1461_TestCase extends Doctrine_UnitTestCase +{ + public function testFetchArraySupportsTwoAggregates() + { + $q = new Doctrine_Query(); + + $q->select("u.*, p.*, CONCAT(u.name, '_1') concat1, CONCAT(u.name, '_2') concat2") + ->from('User u') + ->innerJoin('u.Phonenumber p') + ->where("u.name = 'zYne'"); + + $users = $q->execute(array(), Doctrine::HYDRATE_ARRAY); + + $this->assertEqual($users[0]['concat1'], 'zYne_1'); + + $this->assertEqual($users[0]['concat2'], 'zYne_2'); + } + + public function testFetchArraySupportsTwoAggregatesInRelation() + { + $q = new Doctrine_Query(); + + $q->select("u.*, p.*, CONCAT(p.phonenumber, '_1') concat1, CONCAT(p.phonenumber, '_2') concat2") + ->from('User u') + ->innerJoin('u.Phonenumber p') + ->where("u.name = 'zYne'"); + + $users = $q->execute(array(), Doctrine::HYDRATE_ARRAY); + + $this->assertEqual($users[0]['Phonenumber'][0]['concat2'], '123 123_2'); + + $this->assertEqual($users[0]['Phonenumber'][0]['concat1'], '123 123_1'); + } + + public function testFetchArraySupportsTwoAggregatesInRelationAndRoot() + { + $q = new Doctrine_Query(); + + $q->select("u.*, p.*, CONCAT(u.name, '_1') concat1, CONCAT(u.name, '_2') concat2, CONCAT(p.phonenumber, '_3') concat3, CONCAT(p.phonenumber, '_3') concat4") + ->from('User u') + ->innerJoin('u.Phonenumber p') + ->where("u.name = 'zYne'"); + + $users = $q->execute(array(), Doctrine::HYDRATE_ARRAY); + + $this->assertEqual($users[0]['concat1'], 'zYne_1'); + + $this->assertEqual($users[0]['concat2'], 'zYne_2'); + + $this->assertEqual($users[0]['Phonenumber'][0]['concat3'], '123 123_3'); + + $this->assertTrue(isset($users[0]['Phonenumber'][0]['concat4'])); + } +} \ No newline at end of file Modified: branches/1.0/tests/run.php =================================================================== --- branches/1.0/tests/run.php 2008-09-25 22:46:13 UTC (rev 4981) +++ branches/1.0/tests/run.php 2008-09-25 23:19:59 UTC (rev 4982) @@ -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_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 -~----------~----~----~----~------~----~------~--~---
