mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

- finally removed sql_numrows

Browse Source 
- sql_fetchfield now in dbal.php
- check query id correctly as well as other tiny fixes


git-svn-id: file:///svn/phpbb/trunk@6439 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-10-04 15:15:40 +00:00
parent f7f6e9bcde
commit 26aba1a1f1
12 changed files with 122 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
phpBB/includes/db/firebird.php
View File

@@ -165,39 +165,6 @@ class dbal_firebird extends dbal
}
}
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)//(&$query_id)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
/*
$num_rows = 0;
while ($this->sql_fetchrow($query_id))
{
$num_rows++;
}
// leave the query_id alone, it never hurt anybody
$query_id = $this->sql_query($this->last_query_text);
return $num_rows;
*/
return false;
}
/**
* Return number of affected rows
*/
@@ -221,7 +188,7 @@ class dbal_firebird extends dbal
{
global $cache;
if (!$query_id)
if ($query_id === false)
{
$query_id = $this->query_result;
}
@@ -231,6 +198,11 @@ class dbal_firebird extends dbal
return $cache->sql_fetchrow($query_id);
}
if ($query_id === false)
{
return false;
}
$row = array();
$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
@@ -247,38 +219,6 @@ class dbal_firebird extends dbal
return (sizeof($row)) ? $row : 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)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
}
/**
* Seek to given row number
* rownum is zero-based
@@ -287,7 +227,7 @@ class dbal_firebird extends dbal
{
global $cache;
if (!$query_id)
if ($query_id === false)
{
$query_id = $this->query_result;
}
@@ -297,6 +237,19 @@ class dbal_firebird extends dbal
return $cache->sql_rowseek($rownum, $query_id);
}
if ($query_id === false)
{
return;
}
$this->sql_freeresult($query_id);
$query_id = $this->sql_query($this->last_query_text);
if ($query_id === false)
{
return false;
}
// 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++)
{
@@ -316,7 +269,7 @@ class dbal_firebird extends dbal
{
$query_id = $this->query_result;
if ($query_id && $this->last_query_text != '')
if ($query_id !== false && $this->last_query_text != '')
{
if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
{
@@ -344,7 +297,7 @@ class dbal_firebird extends dbal
{
global $cache;
if (!$query_id)
if ($query_id === false)
{
$query_id = $this->query_result;
}