Added a failing test.

tests/Query/MultiJoin2TestCase.php

@@ -0,0 +1,72 @@
+<?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.com>.
+ */
+
+/**
+ * Doctrine_Query_MultiJoin2_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MultiJoin2_TestCase extends Doctrine_UnitTestCase {
+    public function testInitializeData() {
+        $query = new Doctrine_Query($this->connection);
+        
+        $cat = new QueryTest_Category();
+        $cat->rootCategoryId = 0;
+        $cat->parentCategoryId = 0;
+        $cat->name = "Cat1";
+        $cat->position = 0;
+        $cat->save();
+        
+        $board = new QueryTest_Board();
+        $board->name = "B1";
+        $board->categoryId = $cat->id;
+        $board->position = 0;
+        $board->save();
+        
+        $author = new QueryTest_User();
+        $author->username = "romanb";
+        $author->save();
+        
+        $lastEntry = new QueryTest_Entry();
+        $lastEntry->authorId = $author->id;
+        $lastEntry->date = 1234;
+        $lastEntry->save();
+        
+    }
+    public function testMultipleJoinFetchingWithDeepJoins() {
+        $query = new Doctrine_Query($this->connection);
+        $categories = $query->select("c.*, subCats.*, b.*, le.*, a.*")
+                    ->from("QueryTest_Category c")
+                    ->leftJoin("c.subCategories subCats")
+                    ->leftJoin("c.boards b")
+                    ->leftJoin("b.lastEntry le")
+                    ->leftJoin("le.author a")
+                    ->where("c.parentCategoryId = 0")
+                    ->orderBy("c.position ASC, subCats.position ASC, b.position ASC")
+                    ->execute();
+    }
+}

tests/classes.php

@@ -625,4 +625,99 @@ class ValidatorTest_FootballPlayer extends Doctrine_Record {
    }
 } 
 
+class QueryTest_Category extends Doctrine_Record
+{    
+    /**
+     * The depth of the category inside the tree.
+     * Non-persistent field. 
+     * 
+     * @var integer
+     */
+    public $depth;
+    
+    /**
+     * Table definition.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('rootCategoryId as rootCategoryId', 'integer', 4,
+                array('default' => 0));
+        $this->hasColumn('parentCategoryId as parentCategoryId', 'integer', 4,
+                array('notnull', 'default' => 0));
+        $this->hasColumn('name as name', 'string', 50,
+                array('notnull', 'unique'));
+        $this->hasColumn('position as position', 'integer', 4,
+                array('default' => 0, 'notnull'));
+    }
+    
+    /**
+     * Relations definition.
+     */
+    public function setUp()
+    {
+        $this->ownsMany('QueryTest_Category as subCategories','subCategories.parentCategoryId');
+        $this->hasOne('QueryTest_Category as rootCategory','QueryTest_Category.rootCategoryId');
+        $this->ownsMany('QueryTest_Board as boards', 'QueryTest_Board.categoryId');
+    }
+}
+
+class QueryTest_Board extends Doctrine_Record
+{
+    /**
+     * Initializes the table definition.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('categoryId as categoryId', 'integer', 4,
+                array('notnull'));
+        $this->hasColumn('name as name', 'string', 100,
+                array('notnull', 'unique'));
+        $this->hasColumn('lastEntryId as lastEntryId', 'integer', 4,
+                array('default' => 0, 'notnull'));
+        $this->hasColumn('position as position', 'integer', 4,
+                array('default' => 0, 'notnull'));
+    }
+    
+    /**
+     * Initializes the relations.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_Category as category', 'QueryTest_Board.categoryId');
+        $this->ownsOne('QueryTest_Entry as lastEntry', 'QueryTest_Board.lastEntryId');
+    }
+}
+
+class QueryTest_Entry extends Doctrine_Record
+{
+    /**
+     * Table structure.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('authorId as authorId', 'integer', 4,
+                array('notnull'));
+        $this->hasColumn('date as date', 'integer', 4,
+                array('notnull'));
+    }
+    
+    /**
+     * Runtime definition of the relationships to other entities.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_User as author', 'QueryTest_Entry.authorId');
+    }
+}
+
+class QueryTest_User extends Doctrine_Record 
+{   
+
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('username as username', 'string', 50,
+                array('notnull', 'unique'));
+    }
+}
+    
 ?>

tests/run.php

@@ -202,6 +202,8 @@ $test->addTestCase(new Doctrine_CustomResultSetOrderTestCase());
 
 $test->addTestCase(new Doctrine_Query_MultiJoin_TestCase());
 
+$test->addTestCase(new Doctrine_Query_MultiJoin2_TestCase());
+
 $test->addTestCase(new Doctrine_Query_ReferenceModel_TestCase());
 
 $test->addTestCase(new Doctrine_Query_ComponentAlias_TestCase());