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

Changed the link() method's use of getLocal() and getForeign() to getLocalFieldName() and getForeignFieldName().

Browse source
This commit is contained in:
wernerm 2007-12-11 11:31:13 +00:00
parent c655b6023c
commit 094dab1d4f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine/Record.php
View file

@ -1705,12 +1705,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
if ($rel instanceof Doctrine_Relation_Association) { if ($rel instanceof Doctrine_Relation_Association) {
$modelClassName = $rel->getAssociationTable()->getComponentName(); $modelClassName = $rel->getAssociationTable()->getComponentName();
$localFieldName = $rel->getLocal(); $localFieldName = $rel->getLocalFieldName();
$localFieldDef = $rel->getAssociationTable()->getColumnDefinition($localFieldName); $localFieldDef = $rel->getAssociationTable()->getColumnDefinition($localFieldName);
if ($localFieldDef['type'] == 'integer') { if ($localFieldDef['type'] == 'integer') {
$identifier = (integer) $identifier; $identifier = (integer) $identifier;
} }
$foreignFieldName = $rel->getForeign(); $foreignFieldName = $rel->getForeignFieldName();
$foreignFieldDef = $rel->getAssociationTable()->getColumnDefinition($foreignFieldName); $foreignFieldDef = $rel->getAssociationTable()->getColumnDefinition($foreignFieldName);
if ($foreignFieldDef['type'] == 'integer') { if ($foreignFieldDef['type'] == 'integer') {
for ($i = 0; $i < count($ids); $i++) { for ($i = 0; $i < count($ids); $i++) {
@ -1742,7 +1742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$q = new Doctrine_Query(); $q = new Doctrine_Query();
$q->update($this->getTable()->getComponentName()) $q->update($this->getTable()->getComponentName())
->set($rel->getLocal(), '?', $ids); ->set($rel->getLocalFieldName(), '?', $ids);
if (count($ids) > 0) { if (count($ids) > 0) {
$q->whereIn($rel->getTable()->getIdentifier(), array_values($this->identifier())); $q->whereIn($rel->getTable()->getIdentifier(), array_values($this->identifier()));