diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-17 15:57:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-17 15:57:50 +0000 |
| commit | 4740e7dece880f5cda26976ba758fc31c769f231 (patch) | |
| tree | 0c612bb72e483d67567eeb1f4b097b452487d6b3 /phpBB/includes/db/mysqli.php | |
| parent | 1694af43aadb22686ee0ab2d045269fc2a9c3f82 (diff) | |
| download | forums-4740e7dece880f5cda26976ba758fc31c769f231.tar forums-4740e7dece880f5cda26976ba758fc31c769f231.tar.gz forums-4740e7dece880f5cda26976ba758fc31c769f231.tar.bz2 forums-4740e7dece880f5cda26976ba758fc31c769f231.tar.xz forums-4740e7dece880f5cda26976ba758fc31c769f231.zip | |
- changed dbal class layout
git-svn-id: file:///svn/phpbb/trunk@5193 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 165 |
1 files changed, 10 insertions, 155 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index c4222ae4e5..9dcb5ec7c0 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -1,7 +1,7 @@ <?php /** * -* @package dbal_mysqli +* @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -14,23 +14,16 @@ if (!defined('SQL_LAYER')) { -define('SQL_LAYER', 'mysqli'); + define('SQL_LAYER', 'mysqli'); + include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** -* @package dbal_mysqli +* @package dbal * MySQLi Database Abstraction Layer * Minimum Requirement is MySQL 4.1+ and the mysqli-extension */ -class sql_db +class dbal_mysqli extends dbal { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); - var $indexed = 0; function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) @@ -71,16 +64,6 @@ class sql_db return @mysqli_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) @@ -189,62 +172,6 @@ class sql_db } } - // 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) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // // NOTE :: Want to remove _ALL_ reliance on sql_numrows from core code ... @@ -392,70 +319,23 @@ class sql_db return @mysqli_real_escape_string($this->db_connect_id, $msg); } - function sql_error($sql = '') + function db_sql_error() { - if (!$this->return_on_error) - { - $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 />' . @mysqli_error($this->db_connect_id) . '<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; - - if ($this->transaction) - { - $this->sql_transaction('rollback'); - } - - trigger_error($message, E_USER_ERROR); - } - - $result = array( + return array( 'message' => @mysqli_error($this->db_connect_id), 'code' => @mysqli_errno($this->db_connect_id) ); - - return $result; } - function sql_report($mode, $query = '') + function _sql_report($mode, $query = '') { - if (empty($_GET['explain'])) - { - return; - } - - global $db, $cache, $starttime, $phpbb_root_path; + 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(); - } - $db->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> </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 = ''; @@ -537,34 +417,9 @@ class sql_db @mysqli_free_result($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> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } -} // class sql_db +} } // if ... define |