diff options
Diffstat (limited to 'phpBB/includes/db/dbal.php')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index e132cec706..ecfe71f1ef 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -31,7 +31,13 @@ class dbal var $user = ''; var $server = ''; var $dbname = ''; - + + // Set to true if error triggered + var $sql_error_triggered = false; + + // Holding the last sql query on sql error + var $sql_error_sql = ''; + /** * Constructor */ @@ -49,6 +55,9 @@ class dbal */ function sql_return_on_error($fail = false) { + $this->sql_error_triggered = false; + $this->sql_error_sql = ''; + $this->return_on_error = $fail; } @@ -167,6 +176,9 @@ class dbal * * Idea for this from Ikonboard * Possible query values: INSERT, INSERT_SELECT, MULTI_INSERT, UPDATE, SELECT + * + * If a key is 'module_name' and firebird used it gets adjusted to '"module_name"' + * on INSERT, INSERT_SELECT, UPDATE and SELECT */ function sql_build_array($query, $assoc_ary = false) { @@ -175,13 +187,13 @@ class dbal return false; } - $fields = array(); - $values = array(); + $fields = $values = array(); + if ($query == 'INSERT' || $query == 'INSERT_SELECT') { foreach ($assoc_ary as $key => $var) { - $fields[] = $key; + $fields[] = ($key == 'module_name' && SQL_LAYER == 'firebird') ? '"' . $key . '"' : $key; if (is_null($var)) { @@ -235,6 +247,8 @@ class dbal $values = array(); foreach ($assoc_ary as $key => $var) { + $key = ($key == 'module_name' && SQL_LAYER == 'firebird') ? '"' . $key . '"' : $key; + if (is_null($var)) { $values[] = "$key = NULL"; @@ -313,6 +327,10 @@ class dbal { global $auth, $user; + // Set var to retrieve errored status + $this->sql_error_triggered = true; + $this->sql_error_sql = $sql; + $error = $this->_sql_error(); if (!$this->return_on_error) |