- another try to break things. :)

- adjusted the dbal a little bit - removed db2 support git-svn-id: file:///svn/phpbb/trunk@5263 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2005-10-07 23:00:41 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2005-10-07 23:00:41 +0000
commit: 913c38768a21901187d2ded9427b3e2e533206f4 (patch)
tree: 7480cbd098b54782134f2f166573f56a585b8074 /phpBB/includes/db/firebird.php
parent: 8d72671cc1c983dcafac6948f07ac3cf7447c93c (diff)
download: forums-913c38768a21901187d2ded9427b3e2e533206f4.tar
forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.gz
forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.bz2
forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.xz
forums-913c38768a21901187d2ded9427b3e2e533206f4.zip
1 files changed, 118 insertions, 129 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 797772e5e3..7f57f33ff2 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -26,6 +26,9 @@ class dbal_firebird extends dbal
 {
 	var $last_query_text = '';
 
+	/**
+	* Connect to server
+	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
 		$this->persistency = $persistency;
@@ -38,32 +41,9 @@ class dbal_firebird extends dbal
 		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)
-		{
-			@ibase_commit($this->db_connect_id);
-		}
-
-		if (sizeof($this->open_queries))
-		{
-			foreach ($this->open_queries as $i_query_id => $query_id)
-			{
-				@ibase_free_query($query_id);
-			}
-		}
-
-		return @ibase_close($this->db_connect_id);
-	}
-
+	/**
+	* sql transaction
+	*/
 	function sql_transaction($status = 'begin')
 	{
 		switch ($status)
@@ -94,7 +74,9 @@ class dbal_firebird extends dbal
 		return $result;
 	}
 
-	// Base query method
+	/**
+	* Base query method
+	*/
 	function sql_query($query = '', $cache_ttl = 0)
 	{
 		if ($query != '')
@@ -121,8 +103,13 @@ class dbal_firebird extends dbal
 
 				if ($cache_ttl && method_exists($cache, 'sql_save'))
 				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
+				else if (strpos($query, 'SELECT') !== false && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
 			}
 		}
 		else
@@ -133,6 +120,9 @@ class dbal_firebird extends dbal
 		return ($this->query_result) ? $this->query_result : false;
 	}
 
+	/**
+	* Build LIMIT query
+	*/
 	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) 
 	{ 
 		if ($query != '') 
@@ -149,21 +139,34 @@ class dbal_firebird extends dbal
 		} 
 	}
 
-	// Other query methods
-	//
-	// NOTE :: Want to remove _ALL_ reliance on sql_numrows from core code ...
-	//         don't want this here by a middle Milestone
+	/**
+	* Return number of rows
+	* Not used within core code
+	*/
 	function sql_numrows($query_id = false)
 	{
 		return false;
 	}
 
+	/**
+	* Return number of affected rows
+	*/
 	function sql_affectedrows()
 	{
-		// TODO: hmm, maybe doing something similar as in mssql_odbc.php?
-		return ($this->query_result) ? true : false;
+		// PHP 5+ function
+		if (function_exists('ibase_affected_rows'))
+		{
+			return ($this->query_result) ? @ibase_affected_rows($this->query_result) : false;
+		}
+		else
+		{
+			return ($this->query_result) ? true : false;
+		}
 	}
 
+	/**
+	* Fetch current row
+	*/
 	function sql_fetchrow($query_id = false)
 	{
 		global $cache;
@@ -190,10 +193,15 @@ class dbal_firebird extends dbal
 		{
 			$row[strtolower($key)] = trim(str_replace("\\0", "\0", str_replace("\\n", "\n", $value)));
 		}
-		return ($query_id) ? $row : false;
+
+		return (sizeof($row)) ? $row : false;
 	}
 
-	function sql_fetchrowset($query_id = false)
+	/**
+	* Fetch field
+	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
+	*/
+	function sql_fetchfield($field, $rownum = false, $query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -202,80 +210,41 @@ class dbal_firebird extends dbal
 
 		if ($query_id)
 		{
-			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)))
+			if ($rownum !== false)
 			{
-				$result[] = $this->rowset[$query_id];
+				$this->sql_rowseek($rownum, $query_id);
 			}
-
-			return $result;
-		}
-		else
-		{
-			return false;
+			
+			$row = $this->sql_fetchrow($query_id);
+			return isset($row[$field]) ? $row[$field] : false;
 		}
+
+		return false;
 	}
 
-	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, $query_id = false)
 	{
 		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
 
-		if ($query_id)
-		{
-			if ($rownum > -1)
-			{
-				// erm... ok, my bad, we always use zero. :/
-				for ($i = 0; $i <= $rownum; $i++)
-				{
-					$row = $this->sql_fetchrow($query_id);
-				}
+/*
+		$this->sql_freeresult($query_id);
+		$query_id = $this->sql_query($this->last_query_text);
 
-				return $row[$field];
-			}
-			else
-			{
-				if (empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
-				{
-					if ($this->row[$query_id] = $this->sql_fetchrow($query_id))
-					{
-						$result = $this->row[$query_id][$field];
-					}
-				}
-				else
-				{
-					if ($this->rowset[$query_id])
-					{
-						$result = $this->rowset[$query_id][$field];
-					}
-					else if ($this->row[$query_id])
-					{
-						$result = $this->row[$query_id][$field];
-					}
-				}
-			}
-
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	function sql_rowseek($rownum, $query_id = 0)
-	{
 		if (!$query_id)
 		{
-			$query_id = $this->query_result;
+			return false;
 		}
+*/
 
-		for($i = 1; $i < $rownum; $i++)
+		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+		for ($i = 0; $i < $rownum; $i++)
 		{
 			if (!$this->sql_fetchrow($query_id))
 			{
@@ -286,24 +255,37 @@ class dbal_firebird extends dbal
 		return true;
 	}
 
+	/**
+	* Get last inserted id after insert statement
+	*/
 	function sql_nextid()
 	{
-		if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
+		$query_id = $this->query_result;
+
+		if ($query_id && $this->last_query_text != '')
 		{
-			$query = "SELECT GEN_ID('" . $tablename[1] . "_gen', 0) AS new_id  
-				FROM RDB\$DATABASE";
-			if (!($temp_q_id =  @ibase_query($this->db_connect_id, $query)))
+			if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
 			{
-				return false;
-			}
+				$query = "SELECT GEN_ID('" . $tablename[1] . "_gen', 0) AS new_id  
+					FROM RDB\$DATABASE";
+				if (!($temp_q_id =  @ibase_query($this->db_connect_id, $query)))
+				{
+					return false;
+				}
 
-			$temp_result = @ibase_fetch_object($temp_q_id);
-			$this->sql_freeresult($temp_q_id);
+				$temp_result = @ibase_fetch_object($temp_q_id);
+				@ibase_free_result($temp_q_id);
 
-			return ($temp_result) ? $temp_result->last_value : false;
+				return ($temp_result) ? $temp_result->last_value : false;
+			}
 		}
+	
+		return false;
 	}
 
+	/**
+	* Free sql result
+	*/
 	function sql_freeresult($query_id = false)
 	{
 		if (!$query_id)
@@ -313,18 +295,31 @@ class dbal_firebird extends dbal
 
 		if (!$this->transaction && $query_id)
 		{
-			@ibase_commit();
+			$this->sql_transaction('commit');
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @ibase_free_result($query_id);
 		}
 
-		return ($query_id) ? @ibase_free_result($query_id) : false;
+		return false;
 	}
 
+	/**
+	* Escape string used in sql query
+	*/
 	function sql_escape($msg)
 	{
 		return (@ini_get('magic_quotes_sybase') || strtolower(@ini_get('magic_quotes_sybase')) == 'on') ? str_replace('\\\'', '\'', addslashes($msg)) : str_replace('\'', '\'\'', stripslashes($msg));
 	}
 
-	function db_sql_error()
+	/**
+	* return sql error array
+	* @private
+	*/
+	function _sql_error()
 	{
 		return array(
 			'message'	=> @ibase_errmsg(),
@@ -332,22 +327,25 @@ class dbal_firebird extends dbal
 		);
 	}
 
-	function _sql_report($mode, $query = '')
+	/**
+	* Close sql connection
+	* @private
+	*/
+	function _sql_close()
 	{
-		global $cache, $starttime, $phpbb_root_path;
-		static $curtime, $query_hold, $html_hold;
-		static $sql_report = '';
-		static $cache_num_queries = 0;
+		return @ibase_close($this->db_connect_id);
+	}
 
+	/**
+	* Build db-specific report
+	* @private
+	*/
+	function _sql_report($mode, $query = '')
+	{
 		switch ($mode)
 		{
 			case 'start':
-				$query_hold = $query;
-				$html_hold = '';
-
-				$curtime = explode(' ', microtime());
-				$curtime = $curtime[0] + $curtime[1];
-				break;
+			break;
 
 			case 'fromcache':
 				$endtime = explode(' ', microtime());
@@ -358,23 +356,14 @@ class dbal_firebird extends dbal
 				{
 					// Take the time spent on parsing rows into account
 				}
+				@ibase_freeresult($result);
+
 				$splittime = explode(' ', microtime());
 				$splittime = $splittime[0] + $splittime[1];
 
-				$time_cache = $endtime - $curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
 
-				$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;
-
-				@ibase_freeresult($result);
-				$cache_num_queries++;
-				break;
+			break;
 		}
 	}
author	Meik Sievertsen <acydburn@phpbb.com>	2005-10-07 23:00:41 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2005-10-07 23:00:41 +0000
commit	913c38768a21901187d2ded9427b3e2e533206f4 (patch)
tree	7480cbd098b54782134f2f166573f56a585b8074 /phpBB/includes/db/firebird.php
parent	8d72671cc1c983dcafac6948f07ac3cf7447c93c (diff)
download	forums-913c38768a21901187d2ded9427b3e2e533206f4.tar forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.gz forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.bz2 forums-913c38768a21901187d2ded9427b3e2e533206f4.tar.xz forums-913c38768a21901187d2ded9427b3e2e533206f4.zip