6 files changed, 376 insertions, 136 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 526dc70f5b..b0fb130735 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -92,6 +92,11 @@ class sql_db
 			case 'commit':
 				$result = @ibase_commit();
 				$this->transaction = false;
+
+				if (!$result)
+				{
+					@ibase_rollback();
+				}
 				break;
 
 			case 'rollback':
@@ -273,6 +278,7 @@ class sql_db
 			unset($this->rowset[$query_id]);
 			unset($this->row[$query_id]);
 
+			$result = array();
 			while ($this->rowset[$query_id] = get_object_vars(@ibase_fetch_object($query_id, IBASE_TEXT)))
 			{
 				$result[] = $this->rowset[$query_id];
@@ -309,7 +315,7 @@ class sql_db
 			{
 				if (empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
 				{
-					if ($this->sql_fetchrow())
+					if ($this->sql_fetchrow($query_id))
 					{
 						$result = $this->row[$query_id][$field];
 					}
diff --git a/phpBB/includes/db/mssql-odbc.php b/phpBB/includes/db/mssql-odbc.php
index bd33bc63cb..5645827472 100644
--- a/phpBB/includes/db/mssql-odbc.php
+++ b/phpBB/includes/db/mssql-odbc.php
@@ -107,6 +107,12 @@ class sql_db
 				$result = @odbc_commit($this->db_connect_id);
 				@odbc_autocommit($this->db_connect_id, true);
 				$this->transaction = false;
+
+				if (!$result)
+				{
+					@odbc_rollback($this->db_connect_id);
+					@odbc_autocommit($this->db_connect_id, true);
+				}
 				break;
 
 			case 'rollback':
@@ -467,7 +473,7 @@ class sql_db
 
 	function sql_escape($msg)
 	{
-		return $msg;
+		return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
 	}
 
 	function sql_error($sql = '')
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index b1aefc66ca..bbc4b5d289 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -87,18 +87,23 @@ class sql_db
 		switch ($status)
 		{
 			case 'begin':
-				$this->transaction = true;
 				$result = @mysql_query('BEGIN', $this->db_connect_id);
+				$this->transaction = true;
 				break;
 
 			case 'commit':
-				$this->transaction = false;
 				$result = @mysql_query('COMMIT', $this->db_connect_id);
+				$this->transaction = false;
+				
+				if (!$result)
+				{
+					@mysql_query('ROLLBACK', $this->db_connect_id);
+				}
 				break;
 
 			case 'rollback':
-				$this->transaction = false;
 				$result = @mysql_query('ROLLBACK', $this->db_connect_id);
+				$this->transaction = false;
 				break;
 
 			default:
@@ -281,16 +286,20 @@ class sql_db
 		{
 			$query_id = $this->query_result;
 		}
+
 		if ($query_id)
 		{
 			unset($this->rowset[$query_id]);
 			unset($this->row[$query_id]);
+
+			$result = array();
 			while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id))
 			{
 				$result[] = $this->rowset[$query_id];
 			}
 			return $result;
 		}
+		
 		return false;
 	}
 
@@ -300,6 +309,7 @@ class sql_db
 		{
 			$query_id = $this->query_result;
 		}
+
 		if ($query_id)
 		{
 			if ($rownum > -1)
@@ -310,7 +320,7 @@ class sql_db
 			{
 				if (empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
 				{
-					if ($this->sql_fetchrow())
+					if ($this->sql_fetchrow($query_id))
 					{
 						$result = $this->row[$query_id][$field];
 					}
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index ac5b9552fc..041e148c11 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -96,6 +96,12 @@ class sql_db
 				$result = @mysqli_commit($this->db_connect_id);
 				@mysqli_autocommit($this->db_connect_id, true);
 				$this->transaction = false;
+
+				if (!$result)
+				{
+					@mysqli_rollback($this->db_connect_id);
+					@mysqli_autocommit($this->db_connect_id, true);
+				}
 				break;
 
 			case 'rollback':
@@ -290,13 +296,15 @@ class sql_db
 
 			unset($this->rowset[$cur_index]);
 			unset($this->row[$cur_index]);
-
+			
+			$result = array();
 			while ($this->rowset[$cur_index] = $this->sql_fetchrow($query_id))
 			{
 				$result[] = $this->rowset[$cur_index];
 			}
 			return $result;
 		}
+
 		return false;
 	}
 
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index bd0c52ec54..5db37d4da0 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -11,10 +11,10 @@
 /**
 * @ignore
 */
-if (!defined("SQL_LAYER"))
+if (!defined('SQL_LAYER'))
 {
 
-define("SQL_LAYER","postgresql");
+define('SQL_LAYER', 'postgresql');
 
 /**
 * @package dbal_postgres
@@ -23,16 +23,15 @@ define("SQL_LAYER","postgresql");
 */
 class sql_db
 {
-
 	var $db_connect_id;
 	var $query_result;
-	var $in_transaction = 0;
-	var $row = array();
-	var $rowset = array();
-	var $rownum = array();
+	var $return_on_error = false;
+	var $transaction = false;
+	var $sql_time = 0;
 	var $num_queries = 0;
+	var $open_queries = array();
 
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
 		$this->connect_string = '';
 
@@ -59,6 +58,11 @@ class sql_db
 				{
 					$this->connect_string .= "host=$sqlserver ";
 				}
+			
+				if ($port)
+				{
+					$this->connect_string .= "port=$port ";
+				}
 			}
 		}
 
@@ -75,6 +79,24 @@ class sql_db
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
 
+	//
+	// Other base methods
+	//
+	function sql_close()
+	{
+		if (!$this->db_connect_id)
+		{
+			return false;
+		}
+
+		if ($this->transaction)
+		{
+			@pg_exec($this->db_connect_id, 'COMMIT');
+		}
+
+		return @pg_close($this->db_connect_id);
+	}
+
 	function sql_return_on_error($fail = false)
 	{
 		$this->return_on_error = $fail;
@@ -85,113 +107,168 @@ class sql_db
 		return $this->num_queries;
 	}
 
-	//
-	// Other base methods
-	//
-	function sql_close()
+	function sql_transaction($status = 'begin')
 	{
-		if ($this->db_connect_id)
+		switch ($status)
 		{
-			//
-			// Commit any remaining transactions
-			//
-			if ($this->in_transaction)
-			{
-				@pg_exec($this->db_connect_id, "COMMIT");
-			}
+			case 'begin':
+				$result = @pg_exec($this->db_connect_id, 'BEGIN');
+				$this->transaction = true;
+				break;
 
-			if ($this->query_result)
-			{
-				@pg_freeresult($this->query_result);
-			}
+			case 'commit':
+				$result = @pg_exec($this->db_connect_id, 'COMMIT');
+				$this->transaction = false;
 
-			return @pg_close($this->db_connect_id);
-		}
-		else
-		{
-			return false;
+				if (!$result)
+				{
+					@pg_exec($this->db_connect_id, 'ROLLBACK');
+				}
+				break;
+
+			case 'rollback':
+				$result = @pg_exec($this->db_connect_id, 'ROLLBACK');
+				$this->transaction = false;
+				break;
+
+			default:
+				$result = true;
 		}
+
+		return $result;
 	}
 
-	//
-	// Query method
-	//
-	function sql_query($query = "", $transaction = false)
+	// Base query method
+	function sql_query($query = '', $cache_ttl = 0)
 	{
-		//
-		// Remove any pre-existing queries
-		//
-		unset($this->query_result);
-		if ($query != "")
+		if ($query != '')
 		{
-			$this->num_queries++;
+			global $cache;
 
-			$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
 
-			if ($transaction == BEGIN_TRANSACTION && !$this->in_transaction)
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			
+			if (!$this->query_result)
 			{
-				$this->in_transaction = TRUE;
+				$this->num_queries++;
+				$this->last_query_text = $query;
 
-				if (!@pg_exec($this->db_connect_id, "BEGIN"))
+				if (($this->query_result = @pg_exec($this->db_connect_id, $query)) === false)
 				{
-					return false;
+					$this->sql_error($query);
 				}
-			}
 
-			$this->query_result = @pg_exec($this->db_connect_id, $query);
-			if ($this->query_result)
-			{
-				if ($transaction == END_TRANSACTION)
+				if (defined('DEBUG_EXTRA'))
 				{
-					$this->in_transaction = FALSE;
+					$this->sql_report('stop', $query);
+				}
 
-					if (!@pg_exec($this->db_connect_id, "COMMIT"))
-					{
-						@pg_exec($this->db_connect_id, "ROLLBACK");
-						return false;
-					}
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
 
-				$this->last_query_text[$this->query_result] = $query;
-				$this->rownum[$this->query_result] = 0;
+		return ($this->query_result) ? $this->query_result : false;
+	}
 
-				unset($this->row[$this->query_result]);
-				unset($this->rowset[$this->query_result]);
+	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) 
+	{ 
+		if ($query != '') 
+		{
+			$this->query_result = false; 
 
-				return $this->query_result;
+			// if $total is set to 0 we do not want to limit the number of rows
+			if ($total == 0)
+			{
+				$total = -1;
 			}
-			else
+
+			$query .= "\n LIMIT $total OFFSET $offset";
+
+			return $this->sql_query($query, $cache_ttl); 
+		} 
+		else 
+		{ 
+			return false; 
+		} 
+	}
+
+	// Idea for this from Ikonboard
+	function sql_build_array($query, $assoc_ary = false)
+	{
+		if (!is_array($assoc_ary))
+		{
+			return false;
+		}
+
+		$fields = array();
+		$values = array();
+		if ($query == 'INSERT')
+		{
+			foreach ($assoc_ary as $key => $var)
 			{
-				if ($this->in_transaction)
+				$fields[] = $key;
+
+				if (is_null($var))
 				{
-					@pg_exec($this->db_connect_id, "ROLLBACK");
+					$values[] = 'NULL';
+				}
+				elseif (is_string($var))
+				{
+					$values[] = "'" . $this->sql_escape($var) . "'";
+				}
+				else
+				{
+					$values[] = (is_bool($var)) ? intval($var) : $var;
 				}
-				$this->in_transaction = FALSE;
-
-				return false;
 			}
+
+			$query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
 		}
-		else
+		else if ($query == 'UPDATE' || $query == 'SELECT')
 		{
-			if ($transaction == END_TRANSACTION && $this->in_transaction)
+			$values = array();
+			foreach ($assoc_ary as $key => $var)
 			{
-				$this->in_transaction = FALSE;
-
-				if (!@pg_exec($this->db_connect_id, "COMMIT"))
+				if (is_null($var))
 				{
-					@pg_exec($this->db_connect_id, "ROLLBACK");
-					return false;
+					$values[] = "$key = NULL";
+				}
+				elseif (is_string($var))
+				{
+					$values[] = "$key = '" . $this->sql_escape($var) . "'";
+				}
+				else
+				{
+					$values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
 				}
 			}
-
-			return true;
+			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
 		}
+
+		return $query;
 	}
 
-	//
 	// Other query methods
 	//
-	function sql_numrows($query_id = 0)
+	// NOTE :: Want to remove _ALL_ reliance on sql_numrows from core code ...
+	//         don't want this here by a middle Milestone
+	function sql_numrows($query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -201,95 +278,122 @@ class sql_db
 		return ($query_id) ? @pg_numrows($query_id) : false;
 	}
 
-	function sql_numfields($query_id = 0)
+	function sql_affectedrows($query_id = false)
 	{
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
-		return ($query_id) ? @pg_numfields($query_id) : false;
+		return ($query_id) ? @pg_cmdtuples($query_id) : false;
 	}
 
-	function sql_fieldname($offset, $query_id = 0)
+	function sql_fetchrow($query_id = false)
 	{
+		global $cache;
+
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
-		return ($query_id) ? @pg_fieldname($query_id, $offset) : false;
-	}
-
-	function sql_fieldtype($offset, $query_id = 0)
-	{
-		if (!$query_id)
+		if (!isset($this->rownum[$query_id]))
 		{
-			$query_id = $this->query_result;
+			$this->rownum[$query_id] = 0;
 		}
 
-		return ($query_id) ? @pg_fieldtype($query_id, $offset) : false;
-	}
-
-	function sql_fetchrow($query_id = 0)
-	{
-		if (!$query_id)
+		if (isset($cache->sql_rowset[$query_id]))
 		{
-			$query_id = $this->query_result;
+			return $cache->sql_fetchrow($query_id);
 		}
 
-		if ($query_id)
+		$result = @pg_fetch_array($query_id, NULL, PGSQL_ASSOC);
+		
+		if ($result)
 		{
-			$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);
-
-			if ($this->row)
-			{
-				$this->rownum[$query_id]++;
-				return $this->row;
-			}
+			$this->rownum[$query_id]++;
 		}
 
-		return false;
+		return $result;
 	}
 
-	function sql_fetchrowset($query_id = 0)
+	function sql_fetchrowset($query_id = false)
 	{
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
+		$result = array();
+
 		if ($query_id)
 		{
 			unset($this->rowset[$query_id]);
 			unset($this->row[$query_id]);
-			$this->rownum[$query_id] = 0;
 
-			while ($this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC))
+			$result = array();
+			while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id))
 			{
-				$result[] = $this->rowset;
-				$this->rownum[$query_id]++;
+				$result[] = $this->rowset[$query_id];
 			}
-
 			return $result;
 		}
 
 		return false;
 	}
 
-	function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
+	function sql_fetchfield($field, $rownum = -1, $query_id = false)
 	{
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
+		if ($query_id)
+		{
+			if ($rownum > -1)
+			{
+				if (@function_exists('pg_result_seek'))
+				{
+					@pg_result_seek($query_id, $rownum);
+					$row = @pg_fetch_assoc($query_id);
+					$result = isset($row[$field]) ? $row[$field] : false;
+				}
+				else
+				{
+					$this->sql_rowseek($offset, $query_id);
+					$row = $this->sql_fetchrow($query_id);
+					$result = isset($row[$field]) ? $row[$field] : false;
+				}
+			}
+			else
+			{
+				if (empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
+				{
+					if ($this->sql_fetchrow($query_id))
+					{
+						$result = $this->row[$query_id][$field];
+					}
+				}
+				else
+				{
+					if ($this->rowset[$query_id])
+					{
+						$result = $this->rowset[$query_id][$field];
+					}
+					elseif ($this->row[$query_id])
+					{
+						$result = $this->row[$query_id][$field];
+					}
+				}
+			}
+			return $result;
+		}
 		return false;
 	}
 
-	function sql_rowseek($offset, $query_id = 0)
+	function sql_rowseek($offset, $query_id = false)
 	{
-
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
@@ -299,7 +403,17 @@ class sql_db
 		{
 			if ($offset > -1)
 			{
-				$this->rownum[$query_id] = $offset;
+				if (@function_exists('pg_result_seek'))
+				{
+					@pg_result_seek($query_id, $rownum);
+				}
+				else
+				{
+					for ($i = $this->rownum[$query_id]; $i < $offset; $i++)
+					{
+						$this->sql_fetchrow($query_id);
+					}
+				}
 				return true;
 			}
 			else
@@ -315,9 +429,9 @@ class sql_db
 	{
 		$query_id = $this->query_result;
 
-		if ($query_id && $this->last_query_text[$query_id] != "")
+		if ($query_id && $this->last_query_text != '')
 		{
-			if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename))
+			if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename))
 			{
 				$query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value";
 				$temp_q_id =  @pg_exec($this->db_connect_id, $query);
@@ -326,7 +440,7 @@ class sql_db
 					return false;
 				}
 
-				$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
+				$temp_result = @pg_fetch_array($temp_q_id, NULL, PGSQL_ASSOC);
 
 				return ($temp_result) ? $temp_result['last_value'] : false;
 			}
@@ -335,32 +449,27 @@ class sql_db
 		return false;
 	}
 
-	function sql_affectedrows($query_id = 0)
+	function sql_freeresult($query_id = false)
 	{
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
-		return ($query_id) ? @pg_cmdtuples($query_id) : false;
+		return (is_resource($query_id)) ? @pg_freeresult($query_id) : false;
 	}
 
-	function sql_freeresult($query_id = 0)
+	function sql_escape($msg)
 	{
-		if (!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-
-		return ($query_id) ? @pg_freeresult($query_id) : false;
+		return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
 	}
 
 	function sql_error($sql = '')
 	{
 		if (!$this->return_on_error)
 		{
-			$this_page = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
-			$this_page .= '&' . ((!empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING']);
+			$this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
+			$this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : ''));
 
 			$message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @pg_errormessage() . '<br /><br /><u>CALLING PAGE</u><br /><br />'  . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />';
 
@@ -380,6 +489,107 @@ class sql_db
 		return $result;
 	}
 
+	function sql_report($mode, $query = '')
+	{
+		if (empty($_GET['explain']))
+		{
+			return;
+		}
+
+		global $cache, $starttime, $phpbb_root_path;
+		static $curtime, $query_hold, $html_hold;
+		static $sql_report = '';
+		static $cache_num_queries = 0;
+
+		if (!$query && !empty($query_hold))
+		{
+			$query = $query_hold;
+		}
+
+		switch ($mode)
+		{
+			case 'display':
+				if (!empty($cache))
+				{
+					$cache->unload();
+				}
+				$this->sql_close();
+
+				$mtime = explode(' ', microtime());
+				$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+				echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n";
+				echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n";
+				echo 'td.cat	{ background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n";
+				echo '</style><title>' . $msg_title . '</title></head><body>';
+				echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> &nbsp; &nbsp; &nbsp;</td></tr></table><br clear="all"/><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($cache_num_queries) ? " + $cache_num_queries " . (($cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td></tr><tr><td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td></tr></table><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td>';
+				echo $sql_report;
+				echo '</td></tr></table><br /></body></html>';
+				exit;
+				break;
+
+			case 'start':
+				$query_hold = $query;
+				$html_hold = '';
+
+				$curtime = explode(' ', microtime());
+				$curtime = $curtime[0] + $curtime[1];
+				break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @pg_exec($this->db_connect_id, $query);
+				while ($void = @pg_fetch_array($result, NULL, PGSQL_ASSOC))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$time_cache = $endtime - $curtime;
+				$time_db = $splittime - $endtime;
+				$color = ($time_db > $time_cache) ? 'green' : 'red';
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">';
+
+				$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>';
+
+				// Pad the start time to not interfere with page timing
+				$starttime += $time_db;
+
+				@pg_freeresult($result);
+				$cache_num_queries++;
+				break;
+
+			case 'stop':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table> ' . $html_hold . '<p align="center">';
+
+				if ($this->query_result)
+				{
+					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
+					{
+						$sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | ';
+					}
+					$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>';
+				}
+				else
+				{
+					$error = $this->sql_error();
+					$sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+				}
+
+				$sql_report .= '</p>';
+
+				$this->sql_time += $endtime - $curtime;
+				break;
+		}
+	}
+
 } // class ... db_sql
 
 } // if ... defined
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index f64e22eab1..00d80ac4db 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -11,10 +11,10 @@
 /**
 * @ignore
 */
-if (!defined('SQL_LAYER'))
+if (!defined("SQL_LAYER"))
 {
 
-define('SQL_LAYER', 'sqlite');
+define("SQL_LAYER","sqlite");
 
 /**
 * @package dbal_sqlite