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

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.

Browse source
This commit is contained in:
Guilherme Blanco 2012-05-23 00:55:05 -04:00
parent 738bfd8082
commit f54f8f8a95
2 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
View file

@ -108,12 +108,20 @@ class MultiTableDeleteExecutor extends AbstractSqlExecutor
// Create temporary id table // Create temporary id table
$conn->executeUpdate($this->_createTempTableSql); $conn->executeUpdate($this->_createTempTableSql);
// Insert identifiers try {
$numDeleted = $conn->executeUpdate($this->_insertSql, $params, $types); // Insert identifiers
$numDeleted = $conn->executeUpdate($this->_insertSql, $params, $types);
// Execute DELETE statements // Execute DELETE statements
foreach ($this->_sqlStatements as $sql) { foreach ($this->_sqlStatements as $sql) {
$conn->executeUpdate($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 // Drop temporary table

36
lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
View file

@ -150,24 +150,32 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor
// Create temporary id table // Create temporary id table
$conn->executeUpdate($this->_createTempTableSql); $conn->executeUpdate($this->_createTempTableSql);
// Insert identifiers. Parameters from the update clause are cut off. try {
$numUpdated = $conn->executeUpdate( // Insert identifiers. Parameters from the update clause are cut off.
$this->_insertSql, $numUpdated = $conn->executeUpdate(
array_slice($params, $this->_numParametersInUpdateClause), $this->_insertSql,
array_slice($types, $this->_numParametersInUpdateClause) array_slice($params, $this->_numParametersInUpdateClause),
); array_slice($types, $this->_numParametersInUpdateClause)
);
// Execute UPDATE statements // Execute UPDATE statements
for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) { for ($i=0, $count=count($this->_sqlStatements); $i<$count; ++$i) {
$parameters = array(); $parameters = array();
$types = array(); $types = array();
if (isset($this->_sqlParameters[$i])) { if (isset($this->_sqlParameters[$i])) {
$parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array(); $parameters = isset($this->_sqlParameters[$i]['parameters']) ? $this->_sqlParameters[$i]['parameters'] : array();
$types = isset($this->_sqlParameters[$i]['types']) ? $this->_sqlParameters[$i]['types'] : 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 // Drop temporary table