aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/dbal.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-10-02 18:18:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-10-02 18:18:52 +0000
commit1d688c6b8de0073e637be7601e0efbd5947bce00 (patch)
treec9a3e8e11c224cf3ce0fdfde05e02e12ecdfb19c /phpBB/includes/db/dbal.php
parent1a18e36684d74d5a0c2538805a3ff8436036189e (diff)
downloadforums-1d688c6b8de0073e637be7601e0efbd5947bce00.tar
forums-1d688c6b8de0073e637be7601e0efbd5947bce00.tar.gz
forums-1d688c6b8de0073e637be7601e0efbd5947bce00.tar.bz2
forums-1d688c6b8de0073e637be7601e0efbd5947bce00.tar.xz
forums-1d688c6b8de0073e637be7601e0efbd5947bce00.zip
- add building multi insert to dbal
- fix sql explain in mysql4 layer git-svn-id: file:///svn/phpbb/trunk@5242 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/dbal.php')
-rw-r--r--phpBB/includes/db/dbal.php117
1 files changed, 96 insertions, 21 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 70089aa11f..f91f7ef469 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -22,17 +22,34 @@ class dbal
var $num_queries = 0;
var $open_queries = array();
+ var $curtime = 0;
+ var $query_hold = '';
+ var $html_hold = '';
+ var $sql_report = '';
+ var $cache_num_queries = 0;
+
+
+ /**
+ * return on error or display error message
+ */
function sql_return_on_error($fail = false)
{
$this->return_on_error = $fail;
}
+ /**
+ * Return number of sql queries used (cached and real queries are counted the same)
+ */
function sql_num_queries()
{
return $this->num_queries;
}
- // Idea for this from Ikonboard
+ /**
+ * Build sql statement from array for insert/update/select statements
+ *
+ * Idea for this from Ikonboard
+ */
function sql_build_array($query, $assoc_ary = false)
{
if (!is_array($assoc_ary))
@@ -64,6 +81,32 @@ class dbal
$query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
}
+ else if ($query == 'MULTI_INSERT')
+ {
+ $ary = array();
+ foreach ($assoc_ary as $id => $sql_ary)
+ {
+ $values = array();
+ foreach ($sql_ary as $key => $var)
+ {
+ if (is_null($var))
+ {
+ $values[] = 'NULL';
+ }
+ elseif (is_string($var))
+ {
+ $values[] = "'" . $this->sql_escape($var) . "'";
+ }
+ else
+ {
+ $values[] = (is_bool($var)) ? intval($var) : $var;
+ }
+ }
+ $ary[] = '(' . implode(', ', $values) . ')';
+ }
+
+ $query = ' (' . implode(', ', array_keys($assoc_ary[0])) . ') VALUES ' . implode(', ', $ary);
+ }
else if ($query == 'UPDATE' || $query == 'SELECT')
{
$values = array();
@@ -88,6 +131,9 @@ class dbal
return $query;
}
+ /**
+ * display sql error page
+ */
function sql_error($sql = '')
{
$error = $this->db_sql_error();
@@ -110,21 +156,22 @@ class dbal
return $error;
}
+ /**
+ * Explain queries
+ * @child _sql_report
+ */
function sql_report($mode, $query = '')
{
+ global $cache, $starttime, $phpbb_root_path;
+
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))
+ if (!$query && $this->query_hold != '')
{
- $query = $query_hold;
+ $query = $this->query_hold;
}
switch ($mode)
@@ -139,13 +186,27 @@ class dbal
$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>';
+ 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"> th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') } td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') } </style>
+ <title>Explain</title></head><body>
+ <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" . (($this->cache_num_queries) ? " + {$this->cache_num_queries} " . (($this->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>
+ ' . $this->sql_report . '</td>
+ </tr></table>
+ <br />
+ </body></html>
+ ';
exit;
break;
@@ -153,25 +214,37 @@ class dbal
$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">';
+ $this->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> ' . $this->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> | ';
+ $this->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>';
+ $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
}
else
{
$error = $this->sql_error();
- $sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+ $this->sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
}
- $sql_report .= '</p>';
+ $this->sql_report .= '</p>';
- $this->sql_time += $endtime - $curtime;
+ $this->sql_time += $endtime - $this->curtime;
break;
default:
@@ -183,6 +256,8 @@ class dbal
}
}
+/**
+*/
if (!defined('IN_PHPBB'))
{
exit;
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-04 03:20:18 +0000