From f54f8f8a958483bf2db89eae2f2cc3652ce050f7 Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Wed, 23 May 2012 00:55:05 -0400
Subject: [PATCH] Fixed anomalous bug of temporary existance table collision in
 case of any update/delete issue by dropping temp table, no matter what's the
 result of other executes.

---
 .../Query/Exec/MultiTableDeleteExecutor.php   | 18 +++++++---
 .../Query/Exec/MultiTableUpdateExecutor.php   | 36 +++++++++++--------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
index 51f4b8c5b..1f74cdd2f 100644
--- a/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
+++ b/lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
@@ -108,12 +108,20 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor
         // Create temporary id table
         $conn->executeUpdate($this->_createTempTableSql);
 
-        // Insert identifiers
-        $numDeleted = $conn->executeUpdate($this->_insertSql, $params, $types);
+        try {
+            // Insert identifiers
+            $numDeleted = $conn->executeUpdate($this->_insertSql, $params, $types);
 
-        // Execute DELETE statements
-        foreach ($this->_sqlStatements as $sql) {
-            $conn->executeUpdate($sql);
+            // Execute DELETE statements
+            foreach ($this->_sqlStatements as $sql) {
+                $conn->executeUpdate($sql);
+            }
+        } catch (\Exception $exception) {
+            // FAILURE! Drop temporary table to avoid possible collisions
+            $conn->executeUpdate($this->_dropTempTableSql);
+
+            // Re-throw exception
+            throw $exception;
         }
 
         // Drop temporary table
diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
index 8be24e555..63f4d6c5f 100644
--- a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
+++ b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
@@ -150,24 +150,32 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
         // Create temporary id table
         $conn->executeUpdate($this->_createTempTableSql);
 
-        // Insert identifiers. Parameters from the update clause are cut off.
-        $numUpdated = $conn->executeUpdate(
-            $this->_insertSql,
-            array_slice($params, $this->_numParametersInUpdateClause),
-            array_slice($types, $this->_numParametersInUpdateClause)
-        );
+        try {
+            // Insert identifiers. Parameters from the update clause are cut off.
+            $numUpdated = $conn->executeUpdate(
+                $this->_insertSql,
+                array_slice($params, $this->_numParametersInUpdateClause),
+                array_slice($types, $this->_numParametersInUpdateClause)
+            );
 
-        // Execute UPDATE statements
-        for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) {
-            $parameters = array();
-            $types      = array();
+            // Execute UPDATE statements
+            for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) {
+                $parameters = array();
+                $types      = array();
 
-            if (isset($this->_sqlParameters[$i])) {
-                $parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array();
-                $types = isset($this->_sqlParameters[$i]['types']) ? $this->_sqlParameters[$i]['types'] : array();
+                if (isset($this->_sqlParameters[$i])) {
+                    $parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array();
+                    $types = isset($this->_sqlParameters[$i]['types']) ? $this->_sqlParameters[$i]['types'] : array();
+                }
+
+                $conn->executeUpdate($this->_sqlStatements[$i], $parameters, $types);
             }
+        } catch (\Exception $exception) {
+            // FAILURE! Drop temporary table to avoid possible collisions
+            $conn->executeUpdate($this->_dropTempTableSql);
 
-            $conn->executeUpdate($this->_sqlStatements[$i], $parameters, $types);
+            // Re-throw exception
+            throw $exception;
         }
 
         // Drop temporary table