makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix bugs in mysql4 layer

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5065 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-01-16 11:39:49 +00:00
parent 5c680ea93f
commit e41a6ecceb
1 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
phpBB/includes/db/mysql4.php
View file

@ -26,6 +26,8 @@ class sql_db
var $num_queries = 0; var $num_queries = 0;
var $open_queries = array(); var $open_queries = array();
var $indexed = 0;
function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
{ {
$this->persistency = $persistency; $this->persistency = $persistency;
@ -117,7 +119,7 @@ class sql_db
} }
$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
if (!$this->query_result) if (!$this->query_result)
{ {
$this->num_queries++; $this->num_queries++;
@ -127,6 +129,11 @@ class sql_db
$this->sql_error($query); $this->sql_error($query);
} }
if (is_object($this->query_result))
{
$this->query_result->cur_index = $this->indexed++;
}
if (defined('DEBUG_EXTRA')) if (defined('DEBUG_EXTRA'))
{ {
$this->sql_report('stop', $query); $this->sql_report('stop', $query);
@ -135,11 +142,7 @@ class sql_db
if ($cache_ttl && method_exists($cache, 'sql_save')) if ($cache_ttl && method_exists($cache, 'sql_save'))
{ {
$cache->sql_save($query, $this->query_result, $cache_ttl); $cache->sql_save($query, $this->query_result, $cache_ttl);
// mysql_free_result called within sql_save()
} }
/* else if (strpos($query, 'SELECT') !== false && $this->query_result)
{
}*/
} }
else if (defined('DEBUG_EXTRA')) else if (defined('DEBUG_EXTRA'))
{ {
@ -274,13 +277,17 @@ class sql_db
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if ($query_id) if ($query_id)
{ {
unset($this->rowset[$query_id]); $cur_index = (is_object($query_id)) ? $query_id->cur_index : $query_id;
unset($this->row[$query_id]);
while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id)) unset($this->rowset[$cur_index]);
unset($this->row[$cur_index]);
while ($this->rowset[$cur_index] = $this->sql_fetchrow($query_id))
{ {
$result[] = $this->rowset[$query_id]; $result[] = $this->rowset[$cur_index];
} }
return $result; return $result;
} }
@ -293,32 +300,35 @@ class sql_db
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if ($query_id) if ($query_id)
{ {
if ($rownum > -1) if ($rownum > -1)
{ {
@mysqli_data_seek($query_id, $rownum); @mysqli_data_seek($query_id, $rownum);
$row = @mysqli_fetch_row($query_id); $row = @mysqli_fetch_assoc($query_id);
$result = isset($row[$field]) ? $row[$field] : false; $result = isset($row[$field]) ? $row[$field] : false;
} }
else else
{ {
if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) $cur_index = (is_object($query_id)) ? $query_id->cur_index : $query_id;
if (empty($this->row[$cur_index]) && empty($this->rowset[$cur_index]))
{ {
if ($this->sql_fetchrow()) if ($this->row[$cur_index] = $this->sql_fetchrow($query_id))
{ {
$result = $this->row[$query_id][$field]; $result = $this->row[$cur_index][$field];
} }
} }
else else
{ {
if ($this->rowset[$query_id]) if ($this->rowset[$cur_index])
{ {
$result = $this->rowset[$query_id][$field]; $result = $this->rowset[$cur_index][$field];
} }
elseif ($this->row[$query_id]) elseif ($this->row[$cur_index])
{ {
$result = $this->row[$query_id][$field]; $result = $this->row[$cur_index][$field];
} }
} }
} }
@ -349,7 +359,20 @@ class sql_db
$query_id = $this->query_result; $query_id = $this->query_result;
} }
return (is_object($query_id)) ? @mysqli_free_result($query_id) : false; $cur_index = (is_object($query_id)) ? $query_id->cur_index : $query_id;
unset($this->rowset[$cur_index]);
unset($this->row[$cur_index]);
if (is_object($query_id))
{
$this->indexed--;
return @mysqli_free_result($query_id);
}
else
{
return false;
}
} }
function sql_escape($msg) function sql_escape($msg)