aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/db/mysql4.php361
1 files changed, 215 insertions, 146 deletions
diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php
index b0e657e8ee..0407515f38 100644
--- a/phpBB/db/mysql4.php
+++ b/phpBB/db/mysql4.php
@@ -1,10 +1,10 @@
<?php
/***************************************************************************
- * mysql4.php
+ * mysql.php
* -------------------
* begin : Saturday, Feb 13, 2001
* copyright : (C) 2001 The phpBB Group
- * email : supportphpbb.com
+ * email : support@phpbb.com
*
* $Id$
*
@@ -19,54 +19,45 @@
*
***************************************************************************/
-if(!defined("SQL_LAYER"))
+if ( !defined('SQL_LAYER') )
{
-define("SQL_LAYER","mysql4");
+define('SQL_LAYER', 'mysql4');
class sql_db
{
-
var $db_connect_id;
var $query_result;
- var $row = array();
- var $rowset = array();
- var $num_queries = 0;
- var $in_transaction = 0;
+ var $return_on_error = false;
+ var $transaction = false;
+ var $sql_report = '';
+ var $sql_time = 0;
//
// Constructor
//
- function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
+ function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
{
+ $this->open_queries = array();
+ $this->num_queries = 0;
+
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
- $this->server = $sqlserver;
+ $this->server = $sqlserver . ( ( $port ) ? ':' . $port : '' );
$this->dbname = $database;
- $this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password);
+ $this->db_connect_id = ( $this->persistency ) ? @mysql_pconnect($this->server, $this->user, $this->password) : @mysql_connect($this->server, $this->user, $this->password);
- if( $this->db_connect_id )
+ if ( $this->db_connect_id && $this->dbname != '')
{
- if( $database != "" )
+ if ( @mysql_select_db($this->dbname) )
{
- $this->dbname = $database;
- $dbselect = mysql_select_db($this->dbname);
-
- if( !$dbselect )
- {
- mysql_close($this->db_connect_id);
- $this->db_connect_id = $dbselect;
- }
+ return $this->db_connect_id;
}
-
- return $this->db_connect_id;
- }
- else
- {
- return false;
}
+
+ $this->sql_error('');
}
//
@@ -74,169 +65,247 @@ class sql_db
//
function sql_close()
{
- if( $this->db_connect_id )
+ if (!$this->db_connect_id)
+ {
+ return false;
+ }
+
+ if (count($this->open_queries))
{
- //
- // Commit any remaining transactions
- //
- if( $this->in_transaction )
+ foreach ($this->open_queries as $query_id)
{
- mysql_query("COMMIT", $this->db_connect_id);
+ @mysql_free_result($query_id);
}
-
- return mysql_close($this->db_connect_id);
}
- else
+
+ return @mysql_close($this->db_connect_id);
+ }
+
+ function sql_return_on_error($fail = false)
+ {
+ $this->return_on_error = $fail;
+ }
+
+ function sql_num_queries()
+ {
+ return $this->num_queries;
+ }
+
+ function sql_transaction($status = 'begin')
+ {
+ switch ( $status )
{
- return false;
+ case 'begin':
+ $this->transaction = true;
+ $result = mysql_query('BEGIN', $this->db_connect_id);
+ break;
+ case 'commit':
+ $this->transaction = false;
+ $result = mysql_query('COMMIT', $this->db_connect_id);
+ break;
+ case 'rollback':
+ $this->transaction = false;
+ $result = mysql_query('ROLLBACK', $this->db_connect_id);
+ break;
+ default:
+ $result = true;
}
+
+ return $result;
}
//
// Base query method
//
- function sql_query($query = "", $transaction = FALSE)
+ function sql_query($query = '')
{
- //
- // Remove any pre-existing queries
- //
- unset($this->query_result);
-
- if( $query != "" )
+ if ($query != '')
{
+ $this->query_result = false;
$this->num_queries++;
- if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
+
+ if (!empty($_REQUEST['explain']))
{
- $result = mysql_query("BEGIN", $this->db_connect_id);
- if(!$result)
+ global $starttime;
+ $curtime = explode(' ', microtime());
+ $curtime = $curtime[0] + $curtime[1] - $starttime;
+ }
+ if (!$this->query_result = @mysql_query($query, $this->db_connect_id))
+ {
+ $this->sql_error($query);
+ }
+ if (!empty($_REQUEST['explain']))
+ {
+ $endtime = explode(' ', microtime());
+ $endtime = $endtime[0] + $endtime[1] - $starttime;
+
+ $this->sql_report .= "<pre>Query:\t" . preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n\t", $query) . "\n\n";
+ if ($this->query_result)
+ {
+ $this->sql_report .= "Time before: $curtime\nTime after: $endtime\nElapsed time: <b>" . ($endtime - $curtime) . "</b>\n</pre>";
+ }
+ else
{
- return false;
+ $error = $this->sql_error();
+ $this->sql_report .= '<b>FAILED</b> - MySQL Error ' . $error['code'] . ': ' . $error['message'] . '<br><br><pre>';
}
- $this->in_transaction = TRUE;
+ $this->sql_time += $endtime - $curtime;
+ if (preg_match('/^SELECT/', $query))
+ {
+ $html_table = FALSE;
+ if ($result = mysql_query("EXPLAIN $query", $this->db_connect_id))
+ {
+ while ($row = mysql_fetch_assoc($result))
+ {
+ if (!$html_table && count($row))
+ {
+ $html_table = TRUE;
+ $this->sql_report .= "<table width=100% border=1 cellpadding=2 cellspacing=1>\n";
+ $this->sql_report .= "<tr>\n<td><b>" . implode("</b></td>\n<td><b>", array_keys($row)) . "</b></td>\n</tr>\n";
+ }
+ $this->sql_report .= "<tr>\n<td>" . implode("&nbsp;</td>\n<td>", array_values($row)) . "&nbsp;</td>\n</tr>\n";
+ }
+ }
+ if ($html_table)
+ {
+ $this->sql_report .= '</table><br>';
+ }
+ }
+ $this->sql_report .= "<hr>\n";
}
- $this->query_result = mysql_query($query, $this->db_connect_id);
+ $this->open_queries[] = $this->query_result;
}
else
{
- if( $transaction == END_TRANSACTION && $this->in_transaction )
- {
- $result = mysql_query("COMMIT", $this->db_connect_id);
- }
+ return false;
}
- if( $this->query_result )
+ return ( $this->query_result) ? $this->query_result : false;
+ }
+
+ function sql_query_limit($query = '', $total, $offset = 0)
+ {
+ if ( $query != '' )
{
- unset($this->row[$this->query_result]);
- unset($this->rowset[$this->query_result]);
+ $this->query_result = false;
+ $this->num_queries++;
- if( $transaction == END_TRANSACTION && $this->in_transaction )
+ if ( !empty($total) )
{
- $this->in_transaction = FALSE;
-
- if ( !mysql_query("COMMIT", $this->db_connect_id) )
- {
- mysql_query("ROLLBACK", $this->db_connect_id);
- return false;
- }
+ $query .= ' LIMIT ' . ( ( !empty($offset) ) ? $offset . ', ' . $total : $total );
}
-
- return $this->query_result;
+
+ return $this->sql_query($query);
}
else
{
- if( $this->in_transaction )
- {
- mysql_query("ROLLBACK", $this->db_connect_id);
- $this->in_transaction = FALSE;
- }
return false;
}
}
- //
- // Other query methods
- //
- function sql_numrows($query_id = 0)
+ // Idea for this from Ikonboard
+ function sql_query_array($query = '', $assoc_ary = false)
{
- if( !$query_id )
+ if (!is_array($assoc_ary))
{
- $query_id = $this->query_result;
+ return false;
}
- return ( $query_id ) ? mysql_num_rows($query_id) : false;
- }
+ if (preg_match('/^INSERT/', $query))
+ {
+ $fields = array();
+ $values = array();
+ foreach ($assoc_ary as $key => $var)
+ {
+ $fields[] = $key;
- function sql_affectedrows()
- {
- return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
- }
+ if (is_null($var))
+ {
+ $values[] = 'NULL';
+ }
+ elseif (is_string($var))
+ {
+ $values[] = "'" . str_replace("'", "''", $var) . "'";
+ }
+ else
+ {
+ $values[] = (is_bool($var)) ? intval($var) : $var;
+ }
+ }
- function sql_numfields($query_id = 0)
- {
- if( !$query_id )
+ $query = $query . ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
+ }
+ else
{
- $query_id = $this->query_result;
+ $values = array();
+ foreach ($assoc_ary as $key => $var)
+ {
+ if (is_null($var))
+ {
+ $values[] = "$key = NULL";
+ }
+ elseif (is_string($var))
+ {
+ $values[] = "$key = '" . str_replace("'", "''", $var) . "'";
+ }
+ else
+ {
+ $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
+ }
+ }
+
+ $query = preg_replace('/^(.*? SET )(.*?)$/is', '\1' . implode(', ', $values) . ' \2', $query);
}
- return ( $query_id ) ? mysql_num_fields($query_id) : false;
+ return $this->sql_query($query);
}
- function sql_fieldname($offset, $query_id = 0)
+ //
+ // Other query methods
+ //
+ // 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 )
+ if ( !$query_id )
{
$query_id = $this->query_result;
}
- return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
+ return ( $query_id ) ? @mysql_num_rows($query_id) : false;
}
- function sql_fieldtype($offset, $query_id = 0)
+ function sql_affectedrows()
{
- if( !$query_id )
- {
- $query_id = $this->query_result;
- }
-
- return ( $query_id ) ? mysql_field_type($query_id, $offset) : false;
+ return ( $this->db_connect_id ) ? @mysql_affected_rows($this->db_connect_id) : false;
}
function sql_fetchrow($query_id = 0)
{
- if( !$query_id )
+ if ( !$query_id )
{
$query_id = $this->query_result;
}
- if( $query_id )
- {
- $this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC);
- return $this->row[$query_id];
- }
- else
- {
- return false;
- }
+ return ( $query_id ) ? @mysql_fetch_assoc($query_id) : false;
}
function sql_fetchrowset($query_id = 0)
{
- if( !$query_id )
+ if(!$query_id)
{
$query_id = $this->query_result;
}
-
- if( $query_id )
+ if($query_id)
{
unset($this->rowset[$query_id]);
unset($this->row[$query_id]);
-
- while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC))
+ while($this->rowset[$query_id] = @mysql_fetch_assoc($query_id))
{
$result[] = $this->rowset[$query_id];
}
-
return $result;
}
else
@@ -247,39 +316,37 @@ class sql_db
function sql_fetchfield($field, $rownum = -1, $query_id = 0)
{
- if( !$query_id )
+ if(!$query_id)
{
$query_id = $this->query_result;
}
-
- if( $query_id )
+ if($query_id)
{
- if( $rownum > -1 )
+ if($rownum > -1)
{
- $result = mysql_result($query_id, $rownum, $field);
+ $result = @mysql_result($query_id, $rownum, $field);
}
else
{
- if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) )
+ if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
{
- if( $this->sql_fetchrow() )
+ if($this->sql_fetchrow())
{
$result = $this->row[$query_id][$field];
}
}
else
{
- if( $this->rowset[$query_id] )
+ if($this->rowset[$query_id])
{
$result = $this->rowset[$query_id][$field];
}
- else if( $this->row[$query_id] )
+ else if($this->row[$query_id])
{
$result = $this->row[$query_id][$field];
}
}
}
-
return $result;
}
else
@@ -290,45 +357,47 @@ class sql_db
function sql_rowseek($rownum, $query_id = 0)
{
- if( !$query_id )
+ if ( !$query_id )
{
$query_id = $this->query_result;
}
- return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false;
+ return ( $query_id ) ? @mysql_data_seek($query_id, $rownum) : false;
}
function sql_nextid()
{
- return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false;
+ return ( $this->db_connect_id ) ? @mysql_insert_id($this->db_connect_id) : false;
}
- function sql_freeresult($query_id = 0)
+ function sql_freeresult($query_id = false)
{
- if( !$query_id )
+ if ( !$query_id )
{
$query_id = $this->query_result;
}
- if ( $query_id )
+ return ( $query_id ) ? @mysql_free_result($query_id) : false;
+ }
+
+ function sql_error($sql = '')
+ {
+ if ( !$this->return_on_error )
{
- unset($this->row[$query_id]);
- unset($this->rowset[$query_id]);
+ if ( $this->transaction )
+ {
+ $this->sql_transaction(ROLLBACK);
+ }
- mysql_free_result($query_id);
+ $this_page = ( !empty($_SERVER['PHP_SELF']) ) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
+ $this_page .= '&' . ( ( !empty($_SERVER['QUERY_STRING']) ) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING'] );
- return true;
+ $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysql_error() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . $this_page . ( ( $sql != '' ) ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '' ) . '<br />';
+ trigger_error($message, E_USER_ERROR);
}
- else
- {
- return false;
- }
- }
- function sql_error()
- {
- $result['message'] = mysql_error($this->db_connect_id);
- $result['code'] = mysql_errno($this->db_connect_id);
+ $result['message'] = @mysql_error();
+ $result['code'] = @mysql_errno();
return $result;
}
@@ -337,4 +406,4 @@ class sql_db
} // if ... define
-?>
+?> \ No newline at end of file