From 34cce3e0c8d1d5fa72aada2fa4de872d9c07da2d Mon Sep 17 00:00:00 2001 From: zYne Date: Wed, 11 Apr 2007 18:56:44 +0000 Subject: [PATCH] --- lib/Doctrine/Transaction.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/Transaction.php b/lib/Doctrine/Transaction.php index 68d3a5aa4..295ac7e79 100644 --- a/lib/Doctrine/Transaction.php +++ b/lib/Doctrine/Transaction.php @@ -127,22 +127,18 @@ class Doctrine_Transaction extends Doctrine_Connection_Module foreach ($this->delete as $name => $deletes) { $record = false; $ids = array(); - + if (is_array($deletes[count($deletes)-1]->getTable()->getIdentifier())) { foreach($deletes as $k => $record) { - $cond = ''; + $cond = array(); $ids = $record->obtainIdentifier(); $query = 'DELETE FROM '.$record->getTable()->getTableName().' WHERE '; - - foreach(array_keys($ids) as $id ){ - if ($cond) { - $cond .= " AND "; - } - $cond .= " $id = ? "; + foreach (array_keys($ids) as $id){ + $cond[] = $id . ' = ? '; } - - $query = $query . $cond; + + $query = $query . implode(' AND ', $cond); $this->conn->execute($query, array_values($ids)); } } else {