RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

added the fix for ticket #398. also fixed the missing $coll->setReference() in Doctrine_Relation_Association::fetchRelatedFor()

Browse source
This commit is contained in:
nightfreak 2007-08-11 18:24:19 +00:00
parent b243286bee
commit 6c0b5fd36c
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Doctrine/Relation/Association.php
View file

@ -57,16 +57,11 @@ class Doctrine_Relation_Association extends Doctrine_Relation
$component = $this->definition['refTable']->getComponentName(); $component = $this->definition['refTable']->getComponentName();
switch ($context) { switch ($context) {
case "record": case "record":
$sub = 'SQL:SELECT ' . $this->definition['foreign']. $sub = substr(str_repeat("?, ", $count),0,-2);
' FROM ' . $this->definition['refTable']->getTableName().
' WHERE ' . $this->definition['local'] .
' IN (' . substr(str_repeat("?, ", $count),0,-2) .
')';
$dql = 'FROM ' . $this->getTable()->getComponentName(); $dql = 'FROM ' . $this->getTable()->getComponentName();
$dql .= '.' . $component; $dql .= '.' . $component;
$dql .= ' WHERE ' . $this->getTable()->getComponentName() $dql .= ' WHERE ' . $this->getTable()->getComponentName()
. '.' . $this->getTable()->getIdentifier() . ' IN (' . $sub . ')'; . '.' . $component . '.' . $this->definition['local'] . ' IN (' . $sub . ')';
break; break;
case "collection": case "collection":
$sub = substr(str_repeat("?, ", $count),0,-2); $sub = substr(str_repeat("?, ", $count),0,-2);
@ -93,6 +88,7 @@ class Doctrine_Relation_Association extends Doctrine_Relation
} else { } else {
$coll = Doctrine_Query::create()->parseQuery($this->getRelationDql(1))->execute(array($id)); $coll = Doctrine_Query::create()->parseQuery($this->getRelationDql(1))->execute(array($id));
} }
$coll->setReference($record, $this);
return $coll; return $coll;
} }
} }

4
tests/classes.php
View file

@ -67,8 +67,8 @@ class Address extends Doctrine_Record
{ {
public function setUp() public function setUp()
{ {
$this->hasMany('User', array('local' => 'user_id', $this->hasMany('User', array('local' => 'address_id',
'foreign' => 'address_id', 'foreign' => 'user_id',
'refClass' => 'EntityAddress')); 'refClass' => 'EntityAddress'));
} }
public function setTableDefinition() { public function setTableDefinition() {