summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-07-09 19:29:18 +0200
committerAleksander Machniak <alec@alec.pl>2012-07-09 19:29:18 +0200
commit329eae0abd8fd3297e90577d7922864ce8078571 (patch)
tree7d1df44b9e6660985d3ffb64171f76a4ac6a9682 /program
parent8e926e6201dbd8876ed26c9a4b3af5d7079d6247 (diff)
Fix debugging in sqlite driver
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_db.php16
-rw-r--r--program/include/rcube_db_sqlite.php4
2 files changed, 14 insertions, 6 deletions
diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index 31385d860..d0d213cd0 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -252,6 +252,18 @@ class rcube_db
}
/**
+ * Writes debug information/query to 'sql' log file
+ *
+ * @param string $query SQL query
+ */
+ protected function debug($query)
+ {
+ if ($this->options['debug_mode']) {
+ rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';');
+ }
+ }
+
+ /**
* Getter for error state
*
* @return boolean True on error
@@ -378,9 +390,7 @@ class rcube_db
$query = rtrim($query, ';');
- if ($this->options['debug_mode']) {
- rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';');
- }
+ $this->debug($query);
$query = $this->dbh->query($query);
diff --git a/program/include/rcube_db_sqlite.php b/program/include/rcube_db_sqlite.php
index 0b41ef551..57f8ddc2a 100644
--- a/program/include/rcube_db_sqlite.php
+++ b/program/include/rcube_db_sqlite.php
@@ -63,9 +63,7 @@ class rcube_db_sqlite extends rcube_db
$data = file_get_contents(INSTALL_PATH . 'SQL/sqlite.initial.sql');
if (strlen($data)) {
- if ($this->options['debug_mode']) {
- $this::debug('INITIALIZE DATABASE');
- }
+ $this->debug('INITIALIZE DATABASE');
$q = $dbh->exec($data);