RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 22:56:04 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-05-15 15:14:09 +00:00
parent 04d0ffb989
commit a87e418354
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
draft/new-core/Query.php
View File

@ -876,7 +876,7 @@ class Doctrine_Query2 extends Doctrine_Hydrate2 implements Countable
. $joinCondition; . $joinCondition;
if ($relation instanceof Doctrine_Relation_Association_Self) { if ($relation instanceof Doctrine_Relation_Association_Self) {
$queryPart .= ' OR ' . $foreignTable . '.' . $table->getIdentifier() . ' = ' $queryPart .= ' OR ' . $foreignAlias . '.' . $table->getIdentifier() . ' = '
. $assocAlias . '.' . $relation->getLocal(); . $assocAlias . '.' . $relation->getLocal();
} }

6
tests/Query/JoinTestCase.php
View File

@ -58,7 +58,7 @@ class Doctrine_Query_Join_TestCase extends Doctrine_UnitTestCase
} }
public function testRecordHydrationWorksWithDeeplyNestedStructures() public function testRecordHydrationWorksWithDeeplyNestedStructures()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query2();
$q->select('c.*, c2.*, d.*') $q->select('c.*, c2.*, d.*')
->from('Record_Country c')->leftJoin('c.City c2')->leftJoin('c2.District d') ->from('Record_Country c')->leftJoin('c.City c2')->leftJoin('c2.District d')
@ -77,7 +77,7 @@ class Doctrine_Query_Join_TestCase extends Doctrine_UnitTestCase
} }
public function testManyToManyJoinUsesProperTableAliases() public function testManyToManyJoinUsesProperTableAliases()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query2();
$q->select('u.name')->from('User u INNER JOIN u.Group g'); $q->select('u.name')->from('User u INNER JOIN u.Group g');
@ -86,7 +86,7 @@ class Doctrine_Query_Join_TestCase extends Doctrine_UnitTestCase
public function testSelfReferentialAssociationJoinsAreSupported() public function testSelfReferentialAssociationJoinsAreSupported()
{ {
$q = new Doctrine_Query(); $q = new Doctrine_Query2();
$q->select('e.name')->from('Entity e INNER JOIN e.Entity e2'); $q->select('e.name')->from('Entity e INNER JOIN e.Entity e2');