makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9892] Transaction support for database update sql execution function

Browse source 
Updates would fail before because 'begin' as generated by
db_tools::sql_create_table would be executed literally.

PHPBB3-9892
This commit is contained in:
Nils Adermann 2011-06-12 11:40:57 +02:00
parent ef977abe59
commit 2569d7460a
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/install/database_update.php
View file

@ -534,12 +534,23 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
$db->sql_return_on_error(true); $db->sql_return_on_error(true);
$result = $db->sql_query($sql); if ($sql === 'begin')
if ($db->sql_error_triggered)
{ {
$errored = true; $db->sql_transaction('begin');
$error_ary['sql'][] = $db->sql_error_sql; }
$error_ary['error_code'][] = $db->sql_error_returned; else if ($sql === 'commit')
{
$db->sql_transaction('commit');
}
else
{
$result = $db->sql_query($sql);
if ($db->sql_error_triggered)
{
$errored = true;
$error_ary['sql'][] = $db->sql_error_sql;
$error_ary['error_code'][] = $db->sql_error_returned;
}
} }
$db->sql_return_on_error(false); $db->sql_return_on_error(false);