10 files changed, 88 insertions, 541 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index a36ce8c0d7..93f0a749e5 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -76,6 +76,16 @@ abstract class driver implements driver_interface
 	const SUBQUERY_BUILD = 5;
 
 	/**
+	* @var bool
+	*/
+	protected $debug_load_time = false;
+
+	/**
+	* @var bool
+	*/
+	protected $debug_sql_explain = false;
+
+	/**
 	* Constructor
 	*/
 	function __construct()
@@ -98,6 +108,22 @@ abstract class driver implements driver_interface
 	/**
 	* {@inheritdoc}
 	*/
+	public function set_debug_load_time($value)
+	{
+		$this->debug_load_time = $value;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_debug_sql_explain($value)
+	{
+		$this->debug_sql_explain = $value;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
 	public function get_sql_layer()
 	{
 		return $this->sql_layer;
@@ -955,7 +981,7 @@ abstract class driver implements driver_interface
 			// Show complete SQL error and path to administrators only
 			// Additionally show complete error on installation or if extended debug mode is enabled
 			// The DEBUG constant is for development only!
-			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
+			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || $this->debug_sql_explain)
 			{
 				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
 			}
diff --git a/phpBB/phpbb/db/driver/driver_interface.php b/phpBB/phpbb/db/driver/driver_interface.php
index 8b487c5d42..05ff5ef066 100644
--- a/phpBB/phpbb/db/driver/driver_interface.php
+++ b/phpBB/phpbb/db/driver/driver_interface.php
@@ -16,6 +16,20 @@ namespace phpbb\db\driver;
 interface driver_interface
 {
 	/**
+	* Set value for load_time debug parameter
+	*
+	* @param bool $value
+	*/
+	public function set_debug_load_time($value);
+
+	/**
+	* Set value for sql_explain debug parameter
+	*
+	* @param bool $value
+	*/
+	public function set_debug_sql_explain($value);
+
+	/**
 	* Gets the name of the sql layer.
 	*
 	* @return string
diff --git a/phpBB/phpbb/db/driver/factory.php b/phpBB/phpbb/db/driver/factory.php
index fb3a826254..bb6e7a2682 100644
--- a/phpBB/phpbb/db/driver/factory.php
+++ b/phpBB/phpbb/db/driver/factory.php
@@ -68,6 +68,22 @@ class factory implements driver_interface
 	/**
 	* {@inheritdoc}
 	*/
+	public function set_debug_load_time($value)
+	{
+		$this->get_driver()->set_debug_load_time($value);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_debug_sql_explain($value)
+	{
+		$this->get_driver()->set_debug_sql_explain($value);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
 	public function get_sql_layer()
 	{
 		return $this->get_driver()->get_sql_layer();
diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index 9d9ad603e0..06cdce7a15 100644
--- a/phpBB/phpbb/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
@@ -151,12 +151,11 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -172,11 +171,11 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -196,7 +195,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index a4dcac5966..30ef9d9bc4 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -123,12 +123,11 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -146,11 +145,11 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 				// reset options for next query
 				$this->query_options = array();
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -170,7 +169,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
deleted file mode 100644
index a94e88b331..0000000000
--- a/phpBB/phpbb/db/driver/mysql.php
+++ /dev/null
@@ -1,503 +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;
-
-/**
-* MySQL4 Database Abstraction Layer
-* Compatible with:
-* MySQL 3.23+
-* MySQL 4.0+
-* MySQL 4.1+
-* MySQL 5.0+
-*/
-class mysql extends \phpbb\db\driver\mysql_base
-{
-	var $multi_insert = true;
-	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 = $database;
-
-		$this->sql_layer = 'mysql4';
-
-		if ($this->persistency)
-		{
-			if (!function_exists('mysql_pconnect'))
-			{
-				$this->connect_error = 'mysql_pconnect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			if (!function_exists('mysql_connect'))
-			{
-				$this->connect_error = 'mysql_connect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
-		}
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (@mysql_select_db($this->dbname, $this->db_connect_id))
-			{
-				// Determine what version we are using and if it natively supports UNICODE
-				if (version_compare($this->sql_server_info(true), '4.1.0', '>='))
-				{
-					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
-
-					// enforce strict mode on databases that support it
-					if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-					{
-						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
-						if ($result)
-						{
-							$row = mysql_fetch_assoc($result);
-							mysql_free_result($result);
-							$modes = array_map('trim', explode(',', $row['sql_mode']));
-						}
-						else
-						{
-							$modes = array();
-						}
-
-						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-						if (!in_array('TRADITIONAL', $modes))
-						{
-							if (!in_array('STRICT_ALL_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_ALL_TABLES';
-							}
-
-							if (!in_array('STRICT_TRANS_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_TRANS_TABLES';
-							}
-						}
-
-						$mode = implode(',', $modes);
-						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
-					}
-				}
-				else if (version_compare($this->sql_server_info(true), '4.0.0', '<'))
-				{
-					$this->sql_layer = 'mysql';
-				}
-
-				return $this->db_connect_id;
-			}
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysql_version')) === false)
-		{
-			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
-			if ($result)
-			{
-				$row = mysql_fetch_assoc($result);
-				mysql_free_result($result);
-
-				$this->sql_server_version = $row['version'];
-
-				if (!empty($cache) && $use_cache)
-				{
-					$cache->put('mysql_version', $this->sql_server_version);
-				}
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysql_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mysql_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mysql_query('ROLLBACK', $this->db_connect_id);
-			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);
-			}
-			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);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
-				{
-					$this->sql_time += microtime(true) - $this->curtime;
-				}
-
-				if (!$this->query_result)
-				{
-					return false;
-				}
-
-				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->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;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_affectedrows()
-	{
-		if ($this->db_connect_id)
-		{
-			// We always want the number of matched rows
-			// instead of changed rows, when running an update.
-			// So when mysql_info() returns the number of matched rows
-			// we return that one instead of mysql_affected_rows()
-			$mysql_info = @mysql_info($this->db_connect_id);
-			if ($mysql_info !== false)
-			{
-				$match = array();
-				preg_match('#^Rows matched: (\d)+  Changed: (\d)+  Warnings: (\d)+$#', $mysql_info, $match);
-				if (isset($match[1]))
-				{
-					return $match[1];
-				}
-			}
-
-			return @mysql_affected_rows($this->db_connect_id);
-		}
-		return false;
-	}
-
-	/**
-	* {@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);
-		}
-
-		return ($query_id) ? mysql_fetch_assoc($query_id) : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : 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 mysql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_escape($msg)
-	{
-		if (!$this->db_connect_id)
-		{
-			return @mysql_real_escape_string($msg);
-		}
-
-		return @mysql_real_escape_string($msg, $this->db_connect_id);
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if ($this->db_connect_id)
-		{
-			$error = array(
-				'message'	=> @mysql_error($this->db_connect_id),
-				'code'		=> @mysql_errno($this->db_connect_id),
-			);
-		}
-		else if (function_exists('mysql_error'))
-		{
-			$error = array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno(),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysql_query('SET profiling = 1;', $this->db_connect_id);
-					}
-
-					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
-					{
-						while ($row = mysql_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-						mysql_free_result($result);
-					}
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = mysql_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-							mysql_free_result($result);
-						}
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysql_query('SET profiling = 0;', $this->db_connect_id);
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysql_query($query, $this->db_connect_id);
-				if ($result)
-				{
-					while ($void = mysql_fetch_assoc($result))
-					{
-						// Take the time spent on parsing rows into account
-					}
-					mysql_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/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index b429ad97aa..0c1c063262 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -176,12 +176,11 @@ class mysqli extends \phpbb\db\driver\mysql_base
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -196,11 +195,11 @@ class mysqli extends \phpbb\db\driver\mysql_base
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -215,7 +214,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -376,7 +375,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
 	{
 		static $test_prof;
 
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
+		// current detection method, might just switch to see the existence of INFORMATION_SCHEMA.PROFILING
 		if ($test_prof === null)
 		{
 			$test_prof = false;
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 5fd14709f8..f2a0bb557a 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -246,12 +246,11 @@ class oracle extends \phpbb\db\driver\driver
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -428,11 +427,11 @@ class oracle extends \phpbb\db\driver\driver
 					}
 				}
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -452,7 +451,7 @@ class oracle extends \phpbb\db\driver\driver
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 44476612c3..ed330bc540 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -173,12 +173,11 @@ class postgres extends \phpbb\db\driver\driver
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -194,11 +193,11 @@ class postgres extends \phpbb\db\driver\driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -218,7 +217,7 @@ class postgres extends \phpbb\db\driver\driver
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
index 0508500c52..43906f1b58 100644
--- a/phpBB/phpbb/db/driver/sqlite3.php
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -118,12 +118,11 @@ class sqlite3 extends \phpbb\db\driver\driver
 		{
 			global $cache;
 
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
+			if ($this->debug_sql_explain)
 			{
 				$this->sql_report('start', $query);
 			}
-			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			else if ($this->debug_load_time)
 			{
 				$this->curtime = microtime(true);
 			}
@@ -156,11 +155,11 @@ class sqlite3 extends \phpbb\db\driver\driver
 					}
 				}
 
-				if (defined('DEBUG'))
+				if ($this->debug_sql_explain)
 				{
 					$this->sql_report('stop', $query);
 				}
-				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				else if ($this->debug_load_time)
 				{
 					$this->sql_time += microtime(true) - $this->curtime;
 				}
@@ -175,7 +174,7 @@ class sqlite3 extends \phpbb\db\driver\driver
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 			}
-			else if (defined('DEBUG'))
+			else if ($this->debug_sql_explain)
 			{
 				$this->sql_report('fromcache', $query);
 			}