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/mssql_odbc.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/mssql_odbc.php')
| -rw-r--r-- | phpBB/includes/db/mssql_odbc.php | 68 |
1 files changed, 10 insertions, 58 deletions
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index 1c8e9f3f60..718bd113de 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -202,27 +202,6 @@ class dbal_mssql_odbc extends dbal } /** - * Return number of rows - * Not used within core code - */ - function sql_numrows($query_id = false) - { - global $cache; - - if (!$query_id) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_numrows($query_id); - } - - return ($query_id) ? @odbc_num_rows($query_id) : false; - } - - /** * Return number of affected rows */ function sql_affectedrows() @@ -237,7 +216,7 @@ class dbal_mssql_odbc extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } @@ -247,39 +226,7 @@ class dbal_mssql_odbc extends dbal return $cache->sql_fetchrow($query_id); } - return ($query_id) ? @odbc_fetch_array($query_id) : 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; + return ($query_id !== false) ? @odbc_fetch_array($query_id) : false; } /** @@ -290,7 +237,7 @@ class dbal_mssql_odbc extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } @@ -300,10 +247,15 @@ class dbal_mssql_odbc extends dbal return $cache->sql_rowseek($rownum, $query_id); } + if ($query_id === false) + { + return false; + } + $this->sql_freeresult($query_id); $query_id = $this->sql_query($this->last_query_text); - if (!$query_id) + if ($query_id === false) { return false; } @@ -348,7 +300,7 @@ class dbal_mssql_odbc extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } |