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

Changes to make hasOne relations with 'foreign' and 'local' work as expected

Browse Source
This commit is contained in:
njero 2007-08-10 05:54:21 +00:00
parent 5aaa598fc5
commit 7f1666efc0
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Record.php
View File

@ -883,7 +883,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second argument should be an instance of Doctrine_Record or Doctrine_Null when setting one-to-one references."); throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second argument should be an instance of Doctrine_Record or Doctrine_Null when setting one-to-one references.");
} }
if ($rel instanceof Doctrine_Relation_LocalKey) { if ($rel instanceof Doctrine_Relation_LocalKey) {
$this->set($rel->getLocal(), $value, false); $this->set($rel->getLocal(), $value->rawGet($rel->getForeign()), false);
} else { } else {
$value->set($rel->getForeign(), $this, false); $value->set($rel->getForeign(), $this, false);
} }

22
lib/Doctrine/Relation/LocalKey.php
View File

@ -48,7 +48,13 @@ class Doctrine_Relation_LocalKey extends Doctrine_Relation
if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) { if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
$related = $this->getTable()->create(); $related = $this->getTable()->create();
} else { } else {
$related = $this->getTable()->find($id); $dql = 'FROM ' . $this->getTable()->getComponentName()
. ' WHERE ' . $this->getCondition();
$related = $this->getTable()
->getConnection()
->query($dql, array($id))
->getFirst();
if ( ! $related) { if ( ! $related) {
$related = $this->getTable()->create(); $related = $this->getTable()->create();
@ -59,4 +65,18 @@ class Doctrine_Relation_LocalKey extends Doctrine_Relation
return $related; return $related;
} }
/**
* getCondition
*
* @param string $alias
*/
public function getCondition($alias = null)
{
if ( ! $alias) {
$alias = $this->getTable()->getComponentName();
}
return $alias . '.' . $this->definition['foreign'] . ' = ?';
}
} }