Changeset 1194 in subversion

Timestamp:

Mar 19, 2008 10:36:47 AM (5 years ago)

Author:

thomasb

Message:

Enable SQL logging (set 'sql_debug' config param to true); Switch to emulated prepare mode for better performance

Location:

trunk/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• rcube_db.inc (modified) (1 diff)
• rcube_mdb2.inc (modified) (4 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -75 +75 @@
   $DB = new $dbclass($CONFIG['db_dsnw'], $CONFIG['db_dsnr'], $CONFIG['db_persistent']);
   $DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
+  $DB->set_debug((bool)$CONFIG['sql_debug']);
   $DB->db_connect('w');
 

trunk/roundcubemail/program/include/rcube_db.inc

@@ -154 +154 @@
     $this->db_connected = $this->db_handle ? TRUE : FALSE;
     }
+
+
+  /**
+   * Activate/deactivate debug mode
+   * (not implemented)
+   */
+  function set_debug($dbg = true)
+  {
     
-    
+  }
+
+
   /**
    * Getter for error state

trunk/roundcubemail/program/include/rcube_mdb2.inc

@@ -49 +49 @@
   var $db_error = false;
   var $db_error_msg = '';
+  var $debug_mode = false;
 
   var $a_query_results = array('dummy');
@@ -95 +96 @@
     {
     // Use persistent connections if available
-    $dbh = MDB2::connect($dsn,
-      array('persistent' => $this->db_pconn,
+    $dbh = MDB2::connect($dsn, array(
+        'emulate_prepared' => true,
+        'persistent' => $this->db_pconn,
+        'debug' => $this->debug_mode,
+        'debug_handler' => 'mdb2_debug_handler',
         'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
 
@@ -156 +160 @@
     }
 
+
+  /**
+   * Activate/deactivate debug mode
+   *
+   * @param boolean True if SQL queries should be logged
+   */
+  function set_debug($dbg = true)
+  {
+    $this->debug_mode = $dbg;
+    if ($this->db_connected)
+      $this->db_handle->setOption('debug', $dbg);
+  }
 
     
@@ -570 +586 @@
   }  // end class rcube_db
 
+
+/* this is our own debug handler for the MDB2 connection */
+function mdb2_debug_handler(&$db, $scope, $message, $context = array())
+{
+  if ($scope != 'prepare')
+  {
+    $debug_output = $scope . '('.$db->db_index.'): ';
+    $debug_output .= $message . $db->getOption('log_line_break');
+    write_log('sqllog', $debug_output);
+  }
+}
+
+
 ?>