Skip to content

D
doctrine-dbal
Commit 907156fd authored by zYne's avatar zYne
Browse files
Options

--no commit message 

--no commit message
parent b373cb8e
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 27 deletions
lib/Doctrine/Transaction.php
View file @ 907156fd
...@@ -127,35 +127,41 @@ class Doctrine_Transaction extends Doctrine_Connection_Module ...@@ -127,35 +127,41 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
foreach ($this->delete as $name => $deletes) { foreach ($this->delete as $name => $deletes) {
$record = false; $record = false;
$ids = array(); $ids = array();
if (is_array($deletes[count($deletes)-1]->getTable()->getIdentifier())){
foreach($deletes as $k => $record){ if (is_array($deletes[count($deletes)-1]->getTable()->getIdentifier())) {
$cond = ''; foreach($deletes as $k => $record) {
$ids = $record->obtainIdentifier(); $cond = '';
$query = 'DELETE FROM '.$record->getTable()->getTableName().' WHERE '; $ids = $record->obtainIdentifier();
foreach(array_keys($ids) as $id){ $query = 'DELETE FROM '.$record->getTable()->getTableName().' WHERE ';
if ($cond){ $cond .= " AND ";}
$cond .= " $id = ? "; foreach(array_keys($ids) as $id ){
if ($cond) {
$cond .= " AND ";
} }
$query = $query . $cond;
$this->conn->execute($query, array_values($ids));
}
}else{
foreach ($deletes as $k => $record) {
$ids[] = $record->getIncremented();
$record->assignIdentifier(false);
}
if ($record instanceof Doctrine_Record) {
$params = substr(str_repeat("?, ",count($ids)),0,-2);
$query = 'DELETE FROM '
. $record->getTable()->getTableName()
. ' WHERE '
. $record->getTable()->getIdentifier()
. ' IN(' . $params . ')';
$this->conn->execute($query, $ids); $cond .= " $id = ? ";
} }
}
$query = $query . $cond;
$this->conn->execute($query, array_values($ids));
}
} else {
foreach ($deletes as $k => $record) {
$ids[] = $record->getIncremented();
$record->assignIdentifier(false);
}
if ($record instanceof Doctrine_Record) {
$params = substr(str_repeat("?, ",count($ids)),0,-2);
$query = 'DELETE FROM '
. $record->getTable()->getTableName()
. ' WHERE '
. $record->getTable()->getIdentifier()
. ' IN(' . $params . ')';
$this->conn->execute($query, $ids);
}
}
} }
$this->delete = array(); $this->delete = array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment