From 1d42d1b9817050974c8bc8b91bc34a6c3cfbfef8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 22 Aug 2006 21:26:06 +0000 Subject: some updates. Also adjusted the utf tools and normalizer more to our coding guidelines. git-svn-id: file:///svn/phpbb/trunk@6312 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/sqlite.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/includes/db/sqlite.php') diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index cd6d40e3c7..65be2fef64 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -63,7 +63,7 @@ class dbal_sqlite extends dbal /** * SQL Transaction - * @access: private + * @access private */ function _sql_transaction($status = 'begin') { @@ -310,7 +310,7 @@ class dbal_sqlite extends dbal /** * return sql error array - * @access: private + * @access private */ function _sql_error() { @@ -322,7 +322,7 @@ class dbal_sqlite extends dbal /** * Build db-specific query data - * @access: private + * @access private */ function _sql_custom_build($stage, $data) { @@ -331,7 +331,7 @@ class dbal_sqlite extends dbal /** * Close sql connection - * @access: private + * @access private */ function _sql_close() { @@ -340,7 +340,7 @@ class dbal_sqlite extends dbal /** * Build db-specific report - * @access: private + * @access private */ function _sql_report($mode, $query = '') { -- cgit v1.2.1 From 6d08ef7b3ab9e481cc56b94865bb07ade34a80ef Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 23 Sep 2006 11:10:37 +0000 Subject: made sql_rowseek consistent with the dbal methods as well as fixing sql_query_limit for mssql, especially if sql_query_limit($sql, 0, 0) is given... git-svn-id: file:///svn/phpbb/trunk@6389 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/sqlite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/db/sqlite.php') diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index 65be2fef64..6204131175 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -266,7 +266,7 @@ class dbal_sqlite extends dbal if (isset($cache->sql_rowset[$query_id])) { - return $cache->sql_rowseek($query_id, $rownum); + return $cache->sql_rowseek($rownum, $query_id); } return ($query_id) ? @sqlite_seek($query_id, $rownum) : false; -- cgit v1.2.1 From f7f6e9bcde7a1508109146f462d4627a484eb594 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 3 Oct 2006 20:38:03 +0000 Subject: - query id can be zero [Bug #4584] git-svn-id: file:///svn/phpbb/trunk@6438 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/sqlite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/db/sqlite.php') diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index 6204131175..b7316ab35e 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -109,7 +109,7 @@ class dbal_sqlite extends dbal $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; $this->sql_add_num_queries($this->query_result); - if (!$this->query_result) + if ($this->query_result === false) { if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false) { -- cgit v1.2.1 From 26aba1a1f170ac51a56fe86bbc19588e0efee3c3 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 4 Oct 2006 15:15:40 +0000 Subject: - 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 --- phpBB/includes/db/sqlite.php | 64 ++++---------------------------------------- 1 file changed, 5 insertions(+), 59 deletions(-) (limited to 'phpBB/includes/db/sqlite.php') diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index b7316ab35e..4155d35929 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -169,27 +169,6 @@ class dbal_sqlite 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) ? @sqlite_num_rows($query_id) : false; - } - /** * Return number of affected rows */ @@ -205,7 +184,7 @@ class dbal_sqlite extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } @@ -215,40 +194,7 @@ class dbal_sqlite extends dbal return $cache->sql_fetchrow($query_id); } - $row = @sqlite_fetch_array($query_id, SQLITE_ASSOC); - - return $row; - } - - /** - * 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); - } - - return @sqlite_column($query_id, $field); - } - - return false; + return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false; } /** @@ -259,7 +205,7 @@ class dbal_sqlite extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } @@ -269,7 +215,7 @@ class dbal_sqlite extends dbal return $cache->sql_rowseek($rownum, $query_id); } - return ($query_id) ? @sqlite_seek($query_id, $rownum) : false; + return ($query_id !== false) ? @sqlite_seek($query_id, $rownum) : false; } /** @@ -287,7 +233,7 @@ class dbal_sqlite extends dbal { global $cache; - if (!$query_id) + if ($query_id === false) { $query_id = $this->query_result; } -- cgit v1.2.1 From 4afaca12dc55b076293e9ef8ac28332d22730df0 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 14 Oct 2006 14:56:46 +0000 Subject: - store sql_layer directly within the layer itself - new method sql_multi_insert to circumvent db-specific hacks (hopefully not introduced any parsing errors) git-svn-id: file:///svn/phpbb/trunk@6497 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/sqlite.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'phpBB/includes/db/sqlite.php') diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index 4155d35929..708376881c 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -9,20 +9,14 @@ */ /** +* @ignore */ if (!defined('IN_PHPBB')) { exit; } -/** -* @ignore -*/ -if (!defined('SQL_LAYER')) -{ - - define('SQL_LAYER', 'sqlite'); - include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); +include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** * Sqlite Database Abstraction Layer @@ -313,9 +307,6 @@ class dbal_sqlite extends dbal break; } } - } -} // if ... define - ?> \ No newline at end of file -- cgit v1.2.1