1 files changed, 71 insertions, 46 deletions
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 36ed43d4a7..54238a15ef 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -11,7 +15,6 @@ namespace phpbb\db\driver;
 
 /**
 * Oracle Database Abstraction Layer
-* @package dbal
 */
 class oracle extends \phpbb\db\driver\driver
 {
@@ -19,7 +22,7 @@ class oracle extends \phpbb\db\driver\driver
 	var $connect_error = '';
 
 	/**
-	* Connect to server
+	* {@inheritDoc}
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
 	{
@@ -72,10 +75,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache forced to false for Oracle
-	* @return string sql server version
+	* {@inheritDoc}
 	*/
 	function sql_server_info($raw = false, $use_cache = true)
 	{
@@ -84,8 +84,6 @@ class oracle extends \phpbb\db\driver\driver
 		* but I assume its because the Oracle extension provides a direct method to access it
 		* without a query.
 		*/
-
-		$use_cache = false;
 /*
 		global $cache;
 
@@ -240,13 +238,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
+	* {@inheritDoc}
 	*/
 	function sql_query($query = '', $cache_ttl = 0)
 	{
@@ -259,6 +251,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;
@@ -436,13 +432,22 @@ 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)
+				{
+					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->query_result)
+				else if (strpos($query, 'SELECT') === 0)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
@@ -473,7 +478,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Return number of affected rows
+	* {@inheritDoc}
 	*/
 	function sql_affectedrows()
 	{
@@ -481,7 +486,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Fetch current row
+	* {@inheritDoc}
 	*/
 	function sql_fetchrow($query_id = false)
 	{
@@ -497,10 +502,10 @@ class oracle extends \phpbb\db\driver\driver
 			return $cache->sql_fetchrow($query_id);
 		}
 
-		if ($query_id !== false)
+		if ($query_id)
 		{
 			$row = array();
-			$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
+			$result = ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
 
 			if (!$result || !$row)
 			{
@@ -532,8 +537,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Seek to given row number
-	* rownum is zero-based
+	* {@inheritDoc}
 	*/
 	function sql_rowseek($rownum, &$query_id)
 	{
@@ -549,7 +553,7 @@ class oracle extends \phpbb\db\driver\driver
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
 
-		if ($query_id === false)
+		if (!$query_id)
 		{
 			return false;
 		}
@@ -570,7 +574,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Get last inserted id after insert statement
+	* {@inheritDoc}
 	*/
 	function sql_nextid()
 	{
@@ -582,18 +586,24 @@ class oracle extends \phpbb\db\driver\driver
 			{
 				$query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL';
 				$stmt = @ociparse($this->db_connect_id, $query);
-				@ociexecute($stmt, OCI_DEFAULT);
+				if ($stmt)
+				{
+					$success = @ociexecute($stmt, OCI_DEFAULT);
 
-				$temp_result = @ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
-				@ocifreestatement($stmt);
+					if ($success)
+					{
+						$temp_result = ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
+						ocifreestatement($stmt);
 
-				if ($temp_result)
-				{
-					return $temp_array['CURRVAL'];
-				}
-				else
-				{
-					return false;
+						if ($temp_result)
+						{
+							return $temp_array['CURRVAL'];
+						}
+						else
+						{
+							return false;
+						}
+					}
 				}
 			}
 		}
@@ -602,7 +612,7 @@ class oracle extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Free sql result
+	* {@inheritDoc}
 	*/
 	function sql_freeresult($query_id = false)
 	{
@@ -621,14 +631,14 @@ class oracle extends \phpbb\db\driver\driver
 		if (isset($this->open_queries[(int) $query_id]))
 		{
 			unset($this->open_queries[(int) $query_id]);
-			return @ocifreestatement($query_id);
+			return ocifreestatement($query_id);
 		}
 
 		return false;
 	}
 
 	/**
-	* Escape string used in sql query
+	* {@inheritDoc}
 	*/
 	function sql_escape($msg)
 	{
@@ -644,6 +654,15 @@ class oracle extends \phpbb\db\driver\driver
 		return $expression . " ESCAPE '\\'";
 	}
 
+	/**
+	* Build NOT LIKE expression
+	* @access private
+	*/
+	function _sql_not_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
 	function _sql_custom_build($stage, $data)
 	{
 		return $data;
@@ -777,14 +796,20 @@ class oracle extends \phpbb\db\driver\driver
 				$endtime = $endtime[0] + $endtime[1];
 
 				$result = @ociparse($this->db_connect_id, $query);
-				$success = @ociexecute($result, OCI_DEFAULT);
-				$row = array();
-
-				while (@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS))
+				if ($result)
 				{
-					// Take the time spent on parsing rows into account
+					$success = @ociexecute($result, OCI_DEFAULT);
+					if ($success)
+					{
+						$row = array();
+
+						while (ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS))
+						{
+							// Take the time spent on parsing rows into account
+						}
+						@ocifreestatement($result);
+					}
 				}
-				@ocifreestatement($result);
 
 				$splittime = explode(' ', microtime());
 				$splittime = $splittime[0] + $splittime[1];