13 files changed, 697 insertions, 535 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 3c23f8fa36..ab126168b6 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -87,6 +87,102 @@ abstract class driver implements driver_interface
 	}
 
 	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_layer()
+	{
+		return $this->sql_layer;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_db_name()
+	{
+		return $this->dbname;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_any_char()
+	{
+		return $this->any_char;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_one_char()
+	{
+		return $this->one_char;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_db_connect_id()
+	{
+		return $this->db_connect_id;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_triggered()
+	{
+		return $this->sql_error_triggered;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_sql()
+	{
+		return $this->sql_error_sql;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_transaction()
+	{
+		return $this->transaction;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_time()
+	{
+		return $this->sql_time;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_returned()
+	{
+		return $this->sql_error_returned;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_multi_insert()
+	{
+		return $this->multi_insert;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_multi_insert($multi_insert)
+	{
+		$this->multi_insert = $multi_insert;
+	}
+
+	/**
 	* {@inheritDoc}
 	*/
 	function sql_return_on_error($fail = false)
diff --git a/phpBB/phpbb/db/driver/driver_interface.php b/phpBB/phpbb/db/driver/driver_interface.php
index 7f7d341e2d..6722d059a5 100644
--- a/phpBB/phpbb/db/driver/driver_interface.php
+++ b/phpBB/phpbb/db/driver/driver_interface.php
@@ -16,6 +16,90 @@ namespace phpbb\db\driver;
 interface driver_interface
 {
 	/**
+	* Gets the name of the sql layer.
+	*
+	* @return string
+	*/
+	public function get_sql_layer();
+
+	/**
+	* Gets the name of the database.
+	*
+	* @return string
+	*/
+	public function get_db_name();
+
+	/**
+	* Wildcards for matching any (%) character within LIKE expressions
+	*
+	* @return string
+	*/
+	public function get_any_char();
+
+	/**
+	* Wildcards for matching exactly one (_) character within LIKE expressions
+	*
+	* @return string
+	*/
+	public function get_one_char();
+
+	/**
+	* Gets the time spent into the queries
+	*
+	* @return int
+	*/
+	public function get_sql_time();
+
+	/**
+	* Gets the connect ID.
+	*
+	* @return mixed
+	*/
+	public function get_db_connect_id();
+
+	/**
+	* Indicates if an error was triggered.
+	*
+	* @return bool
+	*/
+	public function get_sql_error_triggered();
+
+	/**
+	* Gets the last faulty query
+	*
+	* @return string
+	*/
+	public function get_sql_error_sql();
+
+	/**
+	* Indicates if we are in a transaction.
+	*
+	* @return bool
+	*/
+	public function get_transaction();
+
+	/**
+	* Gets the returned error.
+	*
+	* @return array
+	*/
+	public function get_sql_error_returned();
+
+	/**
+	* Indicates if multiple insertion can be used
+	*
+	* @return bool
+	*/
+	public function get_multi_insert();
+
+	/**
+	* Set if multiple insertion can be used
+	*
+	* @param bool $multi_insert
+	*/
+	public function set_multi_insert($multi_insert);
+
+	/**
 	* Gets the exact number of rows in a specified table.
 	*
 	* @param string $table_name Table name
diff --git a/phpBB/phpbb/db/driver/factory.php b/phpBB/phpbb/db/driver/factory.php
new file mode 100644
index 0000000000..f0fa18051b
--- /dev/null
+++ b/phpBB/phpbb/db/driver/factory.php
@@ -0,0 +1,435 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\driver;
+
+use \Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+* Database Abstraction Layer
+*/
+class factory implements driver_interface
+{
+	/**
+	* @var driver_interface
+	*/
+	protected $driver = null;
+
+	/**
+	* @var ContainerInterface
+	*/
+	protected $container;
+
+	/**
+	* Constructor.
+	*
+	* @param ContainerInterface $container A ContainerInterface instance
+	*/
+	public function __construct(ContainerInterface $container)
+	{
+		$this->container = $container;
+	}
+
+	/**
+	* Return the current driver (and retrieved it from the container if necessary)
+	*
+	* @return driver_interface
+	*/
+	protected function get_driver()
+	{
+		if ($this->driver === null)
+		{
+			$this->driver = $this->container->get('dbal.conn.driver');
+		}
+
+		return $this->driver;
+	}
+
+	/**
+	* Set the current driver
+	*
+	* @param driver_interface $driver
+	*/
+	public function set_driver(driver_interface $driver)
+	{
+		$this->driver = $driver;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_layer()
+	{
+		return $this->get_driver()->get_sql_layer();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_db_name()
+	{
+		return $this->get_driver()->get_db_name();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_any_char()
+	{
+		return $this->get_driver()->get_any_char();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_one_char()
+	{
+		return $this->get_driver()->get_one_char();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_db_connect_id()
+	{
+		return $this->get_driver()->get_db_connect_id();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_triggered()
+	{
+		return $this->get_driver()->get_sql_error_triggered();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_sql()
+	{
+		return $this->get_driver()->get_sql_error_sql();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_transaction()
+	{
+		return $this->get_driver()->get_transaction();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_time()
+	{
+		return $this->get_driver()->get_sql_time();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_sql_error_returned()
+	{
+		return $this->get_driver()->get_sql_error_returned();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_multi_insert()
+	{
+		return $this->get_driver()->get_multi_insert();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_multi_insert($multi_insert)
+	{
+		$this->get_driver()->set_multi_insert($multi_insert);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_row_count($table_name)
+	{
+		return $this->get_driver()->get_row_count($table_name);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_estimated_row_count($table_name)
+	{
+		return $this->get_driver()->get_estimated_row_count($table_name);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_lower_text($column_name)
+	{
+		return $this->get_driver()->sql_lower_text($column_name);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_error($sql = '')
+	{
+		return $this->get_driver()->sql_error($sql);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_buffer_nested_transactions()
+	{
+		return $this->get_driver()->sql_buffer_nested_transactions();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_bit_or($column_name, $bit, $compare = '')
+	{
+		return $this->get_driver()->sql_bit_or($column_name, $bit, $compare);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_server_info($raw = false, $use_cache = true)
+	{
+		return $this->get_driver()->sql_server_info($raw, $use_cache);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_return_on_error($fail = false)
+	{
+		return $this->get_driver()->sql_return_on_error($fail);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_build_array($query, $assoc_ary = array())
+	{
+		return $this->get_driver()->sql_build_array($query, $assoc_ary);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_fetchrowset($query_id = false)
+	{
+		return $this->get_driver()->sql_fetchrowset($query_id);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_transaction($status = 'begin')
+	{
+		return $this->get_driver()->sql_transaction($status);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $this->get_driver()->sql_concatenate($expr1, $expr2);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_case($condition, $action_true, $action_false = false)
+	{
+		return $this->get_driver()->sql_case($condition, $action_true, $action_false);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_build_query($query, $array)
+	{
+		return $this->get_driver()->sql_build_query($query, $array);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_fetchfield($field, $rownum = false, $query_id = false)
+	{
+		return $this->get_driver()->sql_fetchfield($field, $rownum, $query_id);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_fetchrow($query_id = false)
+	{
+		return $this->get_driver()->sql_fetchrow($query_id);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function cast_expr_to_bigint($expression)
+	{
+		return $this->get_driver()->cast_expr_to_bigint($expression);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_nextid()
+	{
+		return $this->get_driver()->sql_nextid();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_add_num_queries($cached = false)
+	{
+		return $this->get_driver()->sql_add_num_queries($cached);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		return $this->get_driver()->sql_query_limit($query, $total, $offset, $cache_ttl);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_query($query = '', $cache_ttl = 0)
+	{
+		return $this->get_driver()->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function cast_expr_to_string($expression)
+	{
+		return $this->get_driver()->cast_expr_to_string($expression);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		throw new \Exception('Disabled method.');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_bit_and($column_name, $bit, $compare = '')
+	{
+		return $this->get_driver()->sql_bit_and($column_name, $bit, $compare);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_freeresult($query_id = false)
+	{
+		return $this->get_driver()->sql_freeresult($query_id);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_num_queries($cached = false)
+	{
+		return $this->get_driver()->sql_num_queries($cached);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_multi_insert($table, $sql_ary)
+	{
+		return $this->get_driver()->sql_multi_insert($table, $sql_ary);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_affectedrows()
+	{
+		return $this->get_driver()->sql_affectedrows();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_close()
+	{
+		return $this->get_driver()->sql_close();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_rowseek($rownum, &$query_id)
+	{
+		return $this->get_driver()->sql_rowseek($rownum, $query_id);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_escape($msg)
+	{
+		return $this->get_driver()->sql_escape($msg);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_like_expression($expression)
+	{
+		return $this->get_driver()->sql_like_expression($expression);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_report($mode, $query = '')
+	{
+		return $this->get_driver()->sql_report($mode, $query);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
+	{
+		return $this->get_driver()->sql_in_set($field, $array, $negate, $allow_empty_set);
+	}
+}
diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php
deleted file mode 100644
index c7b185a577..0000000000
--- a/phpBB/phpbb/db/driver/firebird.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\db\driver;
-
-/**
-* Firebird/Interbase Database Abstraction Layer
-* Minimum Requirement is Firebird 2.1
-*/
-class firebird extends \phpbb\db\driver\driver
-{
-	var $last_query_text = '';
-	var $service_handle = false;
-	var $affected_rows = 0;
-	var $connect_error = '';
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = str_replace('\\', '/', $database);
-
-		// There are three possibilities to connect to an interbase db
-		if (!$this->server)
-		{
-			$use_database = $this->dbname;
-		}
-		else if (strpos($this->server, '//') === 0)
-		{
-			$use_database = $this->server . $this->dbname;
-		}
-		else
-		{
-			$use_database = $this->server . ':' . $this->dbname;
-		}
-
-		if ($this->persistency)
-		{
-			if (!function_exists('ibase_pconnect'))
-			{
-				$this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-		else
-		{
-			if (!function_exists('ibase_connect'))
-			{
-				$this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-
-		// Do not call ibase_service_attach if connection failed,
-		// otherwise error message from ibase_(p)connect call will be clobbered.
-		if ($this->db_connect_id && function_exists('ibase_service_attach') && $this->server)
-		{
-			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			$this->service_handle = false;
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		/**
-		* force $use_cache false.  I didn't research why the caching code there is no caching code
-		* but I assume its because the IB extension provides a direct method to access it
-		* without a query.
-		*/
-
-		$use_cache = false;
-
-		if ($this->service_handle !== false && function_exists('ibase_server_info'))
-		{
-			return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
-		}
-
-		return ($raw) ? '2.1' : 'Firebird/Interbase';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ibase_commit();
-			break;
-
-			case 'rollback':
-				return @ibase_rollback();
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				$array = array();
-				// We overcome Firebird's 32767 char limit by binding vars
-				if (strlen($query) > 32767)
-				{
-					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-					{
-						if (strlen($regs[3]) > 32767)
-						{
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-							$inserts = $vals[0];
-							unset($vals);
-
-							foreach ($inserts as $key => $value)
-							{
-								if (!empty($value) && $value[0] === "'" && strlen($value) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$inserts[$key] = '?';
-									$array[] = str_replace("''", "'", substr($value, 1, -1));
-								}
-							}
-
-							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-						}
-					}
-					else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data))
-					{
-						if (strlen($data[3]) > 32767)
-						{
-							$update = $data[1];
-							$where = $data[4];
-							preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER);
-							unset($data);
-
-							$cols = array();
-							foreach ($temp as $value)
-							{
-								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$array[] = str_replace("''", "'", substr($value[2], 1, -1));
-									$cols[] = $value[1] . '=?';
-								}
-								else
-								{
-									$cols[] = $value[1] . '=' . $value[2];
-								}
-							}
-
-							$query = $update . implode(', ', $cols) . ' ' . $where;
-							unset($cols);
-						}
-					}
-				}
-
-				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs)))
-				{
-					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1];
-					if (!empty($regs[2]))
-					{
-						$affected_sql .= ' ' . $regs[2];
-					}
-
-					if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql)))
-					{
-						return false;
-					}
-
-					$temp_result = @ibase_fetch_assoc($temp_q_id);
-					@ibase_free_result($temp_q_id);
-
-					$this->affected_rows = ($temp_result) ? $temp_result['NUM_ROWS_AFFECTED'] : false;
-				}
-
-				if (sizeof($array))
-				{
-					$p_query = @ibase_prepare($this->db_connect_id, $query);
-					array_unshift($array, $p_query);
-					$this->query_result = call_user_func_array('ibase_execute', $array);
-					unset($array);
-
-					if ($this->query_result === false)
-					{
-						$this->sql_error($query);
-					}
-				}
-				else if (($this->query_result = @ibase_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if (!$this->transaction)
-				{
-					if (function_exists('ibase_commit_ret'))
-					{
-						@ibase_commit_ret();
-					}
-					else
-					{
-						// way cooler than ibase_commit_ret :D
-						@ibase_query('COMMIT RETAIN;');
-					}
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		$query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_affectedrows()
-	{
-		// PHP 5+ function
-		if (function_exists('ibase_affected_rows'))
-		{
-			return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false;
-		}
-		else
-		{
-			return $this->affected_rows;
-		}
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = array();
-		$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
-
-		if (!$cur_row)
-		{
-			return false;
-		}
-
-		foreach (get_object_vars($cur_row) as $key => $value)
-		{
-			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
-		}
-
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename))
-			{
-				$sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE';
-
-				if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql)))
-				{
-					return false;
-				}
-
-				$temp_result = @ibase_fetch_assoc($temp_q_id);
-				@ibase_free_result($temp_q_id);
-
-				return ($temp_result) ? $temp_result['NEW_ID'] : false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @ibase_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	function _sql_bit_and($column_name, $bit, $compare = '')
-	{
-		return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	function _sql_bit_or($column_name, $bit, $compare = '')
-	{
-		return 'BIN_OR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		// Precision must be from 1 to 18
-		return 'CAST(' . $expression . ' as DECIMAL(18, 0))';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return 'CAST(' . $expression . ' as VARCHAR(255))';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		// Need special handling here because ibase_errmsg returns
-		// connection errors, however if the interbase extension
-		// is not installed then ibase_errmsg does not exist and
-		// we cannot call it.
-		if (function_exists('ibase_errmsg'))
-		{
-			$msg = @ibase_errmsg();
-			if (!$msg)
-			{
-				$msg = $this->connect_error;
-			}
-		}
-		else
-		{
-			$msg = $this->connect_error;
-		}
-		return array(
-			'message'	=> $msg,
-			'code'		=> (@function_exists('ibase_errcode') ? @ibase_errcode() : '')
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		if ($this->service_handle !== false)
-		{
-			@ibase_service_detach($this->service_handle);
-		}
-
-		return @ibase_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ibase_query($this->db_connect_id, $query);
-				while ($void = @ibase_fetch_object($result, IBASE_TEXT))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ibase_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 0809703b48..fd13eefad0 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -137,6 +137,10 @@ class mssql extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -152,6 +156,10 @@ class mssql extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index 0a15148e1d..9d9ad603e0 100644
--- a/phpBB/phpbb/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
@@ -156,6 +156,10 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->last_query_text = $query;
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -172,6 +176,10 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 3bc9ecda75..50dce35baa 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -127,6 +127,10 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->last_query_text = $query;
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -145,6 +149,10 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index ed8f16fa5f..a94e88b331 100644
--- a/phpBB/phpbb/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
@@ -176,6 +176,10 @@ class mysql extends \phpbb\db\driver\mysql_base
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -191,6 +195,10 @@ class mysql extends \phpbb\db\driver\mysql_base
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 4c6963673e..debc3cc523 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -61,7 +61,11 @@ class mysqli extends \phpbb\db\driver\mysql_base
 		}
 
 		$this->db_connect_id = mysqli_init();
-		@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS);
+
+		if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS))
+		{
+			$this->db_connect_id = '';
+		}
 
 		if ($this->db_connect_id && $this->dbname != '')
 		{
@@ -175,6 +179,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -190,6 +198,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index cacee3ef41..28fea59d8f 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -253,6 +253,10 @@ class oracle extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->last_query_text = $query;
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -430,6 +434,10 @@ class oracle extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 78825de73c..c8f8416caf 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -15,10 +15,11 @@ namespace phpbb\db\driver;
 
 /**
 * PostgreSQL Database Abstraction Layer
-* Minimum Requirement is Version 7.3+
+* Minimum Requirement is Version 8.3+
 */
 class postgres extends \phpbb\db\driver\driver
 {
+	var $multi_insert = true;
 	var $last_query_text = '';
 	var $connect_error = '';
 
@@ -101,11 +102,6 @@ class postgres extends \phpbb\db\driver\driver
 
 		if ($this->db_connect_id)
 		{
-			if (version_compare($this->sql_server_info(true), '8.2', '>='))
-			{
-				$this->multi_insert = true;
-			}
-
 			if ($schema !== '')
 			{
 				@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
@@ -182,6 +178,10 @@ class postgres extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->last_query_text = $query;
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -198,6 +198,10 @@ class postgres extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php
index 9130b2b292..bff456cb94 100644
--- a/phpBB/phpbb/db/driver/sqlite.php
+++ b/phpBB/phpbb/db/driver/sqlite.php
@@ -124,6 +124,10 @@ class sqlite extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -139,6 +143,10 @@ class sqlite extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
index 4ca3d8f91d..5548105006 100644
--- a/phpBB/phpbb/db/driver/sqlite3.php
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -52,7 +52,8 @@ class sqlite3 extends \phpbb\db\driver\driver
 		}
 		catch (\Exception $e)
 		{
-			return array('message' => $e->getMessage());
+			$this->connect_error = $e->getMessage();
+			return array('message' => $this->connect_error);
 		}
 
 		return true;
@@ -121,6 +122,10 @@ class sqlite3 extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->last_query_text = $query;
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
@@ -137,6 +142,10 @@ class sqlite3 extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
 
 				if (!$this->query_result)
 				{
@@ -277,7 +286,7 @@ class sqlite3 extends \phpbb\db\driver\driver
 	*/
 	protected function _sql_error()
 	{
-		if (class_exists('SQLite3', false))
+		if (class_exists('SQLite3', false) && isset($this->dbo))
 		{
 			$error = array(
 				'message'	=> $this->dbo->lastErrorMsg(),