From 30521a7020b56f1c4c7beae3e441ad41753bc848 Mon Sep 17 00:00:00 2001 From: zYne Date: Tue, 14 Aug 2007 20:30:33 +0000 Subject: [PATCH] --- lib/Doctrine/Record.php | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php index 27b40a208..12e1c73bb 100644 --- a/lib/Doctrine/Record.php +++ b/lib/Doctrine/Record.php @@ -1434,10 +1434,12 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count return $this; } /** - * removeLink + * removeLinks + * removes links from this record to given records * - * @param string $alias - * @param array $ids + * @param string $alias related component alias + * @param array $ids the identifiers of the related records + * @return Doctrine_Record this object */ public function removeLinks($alias, $ids) { @@ -1447,21 +1449,22 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count $rel = $this->getTable()->getRelation($alias); - $q->delete() - ->from($rel->getAssociationTable()->getComponentName()) - ->where($rel->getLocal() . ' = ?', $this->identifier()) - ->whereIn($rel->getForeign(), $ids) - ->execute(); - - if (isset($this->references[$alias])) { - foreach ($this->references[$alias] as $k => $record) { - if (in_array($record->identifier(), $ids)) { - $this->references[$alias]->remove($k); + if ($rel instanceof Doctrine_Relation_Association) { + $q->delete() + ->from($rel->getAssociationTable()->getComponentName()) + ->where($rel->getLocal() . ' = ?', $this->identifier()) + ->whereIn($rel->getForeign(), $ids) + ->execute(); + + if (isset($this->references[$alias])) { + foreach ($this->references[$alias] as $k => $record) { + if (in_array($record->identifier(), $ids)) { + $this->references[$alias]->remove($k); + } } + $this->references[$alias]->takeSnapshot(); } - $this->references[$alias]->takeSnapshot(); } - return $this; } /**