Doctrine

Timestamp:

12/01/09 14:02:56 (8 months ago)

Author:

jwage

Message:

[1.2][DC-302] Fixing issue with relationship ordering

Location:

branches/1.2

Files:

• lib/Doctrine/Relation/Nest.php (modified) (1 diff)
• tests/Relation/OrderByTestCase.php (modified) (1 diff)
• tests/Ticket/DC302TestCase.php (added)

branches/1.2/lib/Doctrine/Relation/Nest.php

@@ -66 +66 @@
             $q->select('{'.$tableName.'.*}, {'.$assocTable.'.*}')
               ->from($tableName . ' INNER JOIN ' . $assocTable . ' ON ' . implode(' OR ', $joinCondition))
-              ->where(implode(' OR ', $condition))
-              ->orderBy($tableName . '.' . $identifier . ' ASC');
+              ->where(implode(' OR ', $condition));
             if ($orderBy = $this->getOrderByStatement($tableName, true)) {
                 $q->addOrderBy($orderBy);
+            } else {
+                $q->addOrderBy($tableName . '.' . $identifier . ' ASC');
             }
             $q->addComponent($tableName,  $this->getClass());

branches/1.2/tests/Relation/OrderByTestCase.php

@@ -90 +90 @@
 
         $friends = $user->Friends;
-        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT order_by_test__user.id AS order_by_test__user__id, order_by_test__user.login AS order_by_test__user__login, order_by_test__user.password AS order_by_test__user__password, order_by_test__user.parent_user_id AS order_by_test__user__parent_user_id, order_by_test__friend.user_id1 AS order_by_test__friend__user_id1, order_by_test__friend.user_id2 AS order_by_test__friend__user_id2 FROM order_by_test__user INNER JOIN order_by_test__friend ON order_by_test__user.id = order_by_test__friend.user_id2 OR order_by_test__user.id = order_by_test__friend.user_id1 WHERE order_by_test__user.id IN (SELECT user_id2 FROM order_by_test__friend WHERE user_id1 = ?) OR order_by_test__user.id IN (SELECT user_id1 FROM order_by_test__friend WHERE user_id2 = ?) ORDER BY order_by_test__user.id ASC, order_by_test__user.login ASC');
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT order_by_test__user.id AS order_by_test__user__id, order_by_test__user.login AS order_by_test__user__login, order_by_test__user.password AS order_by_test__user__password, order_by_test__user.parent_user_id AS order_by_test__user__parent_user_id, order_by_test__friend.user_id1 AS order_by_test__friend__user_id1, order_by_test__friend.user_id2 AS order_by_test__friend__user_id2 FROM order_by_test__user INNER JOIN order_by_test__friend ON order_by_test__user.id = order_by_test__friend.user_id2 OR order_by_test__user.id = order_by_test__friend.user_id1 WHERE order_by_test__user.id IN (SELECT user_id2 FROM order_by_test__friend WHERE user_id1 = ?) OR order_by_test__user.id IN (SELECT user_id1 FROM order_by_test__friend WHERE user_id2 = ?) ORDER BY order_by_test__user.login ASC');
 
         $childrenUsers = $user->ChildrenUsers;