diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-04 15:15:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-04 15:15:40 +0000 |
| commit | 26aba1a1f170ac51a56fe86bbc19588e0efee3c3 (patch) | |
| tree | a92878b658c325297e5054d5622d642934b189df /phpBB/includes/db/firebird.php | |
| parent | f7f6e9bcde7a1508109146f462d4627a484eb594 (diff) | |
| download | forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.gz forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.bz2 forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.tar.xz forums-26aba1a1f170ac51a56fe86bbc19588e0efee3c3.zip | |
- finally removed sql_numrows
- 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
Diffstat (limited to 'phpBB/includes/db/firebird.php')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 89 |
1 files changed, 21 insertions, 68 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 0a4e74e66e..922a647eeb 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -166,39 +166,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 */ function sql_affectedrows() @@ -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); @@ -248,53 +220,34 @@ class dbal_firebird extends dbal } /** - * Fetch field - * if rownum is false, the current row is used, else it is pointing to the row (zero-based) + * Seek to given row number + * rownum is zero-based */ - function sql_fetchfield($field, $rownum = false, $query_id = false) + function sql_rowseek($rownum, $query_id = false) { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } - if ($query_id) + if (isset($cache->sql_rowset[$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 $cache->sql_rowseek($rownum, $query_id); } - return false; - } - - /** - * Seek to given row number - * rownum is zero-based - */ - function sql_rowseek($rownum, $query_id = false) - { - global $cache; - - if (!$query_id) + if ($query_id === false) { - $query_id = $this->query_result; + return; } - if (isset($cache->sql_rowset[$query_id])) + $this->sql_freeresult($query_id); + $query_id = $this->sql_query($this->last_query_text); + + if ($query_id === false) { - return $cache->sql_rowseek($rownum, $query_id); + return false; } // We do not fetch the row for rownum == 0 because then the next resultset would be the second row @@ -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; } |