From 329eae0abd8fd3297e90577d7922864ce8078571 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 Jul 2012 13:29:18 -0400
Subject: [PATCH] Fix debugging in sqlite driver
---
program/include/rcube_db_sqlite.php | 4 +---
program/include/rcube_db.php | 16 +++++++++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index 31385d8..d0d213c 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -252,6 +252,18 @@
}
/**
+ * 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 @@
$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 0b41ef5..57f8ddc 100644
--- a/program/include/rcube_db_sqlite.php
+++ b/program/include/rcube_db_sqlite.php
@@ -63,9 +63,7 @@
$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);
--
Gitblit v1.9.1