X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Finclude%2Frcube_mdb2.php;h=f25acef4df04f6f14e2fa1c6ea7e22239e74e538;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=a763f0cd548dbd1d9438c54f20c45b744d655a32;hpb=07e1de2dcd3f3ff8910a3680493f035b3c693cf0;p=roundcube.git diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index a763f0c..f25acef 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -5,7 +5,7 @@ | program/include/rcube_mdb2.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland | + | Copyright (C) 2005-2009, The Roundcube Dev Team | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -16,7 +16,7 @@ | Author: Lukas Kahwe Smith | +-----------------------------------------------------------------------+ - $Id: rcube_mdb2.php 4643 2011-04-11 12:24:00Z alec $ + $Id: rcube_mdb2.php 5543 2011-12-05 07:24:36Z alec $ */ @@ -30,20 +30,21 @@ * @author David Saez Padros * @author Thomas Bruederli * @author Lukas Kahwe Smith - * @version 1.17 + * @version 1.18 * @link http://pear.php.net/package/MDB2 */ class rcube_mdb2 { - var $db_dsnw; // DSN for write operations - var $db_dsnr; // DSN for read operations - var $db_connected = false; // Already connected ? - var $db_mode = ''; // Connection mode - var $db_handle = 0; // Connection handle - var $db_error = false; - var $db_error_msg = ''; + public $db_dsnw; // DSN for write operations + public $db_dsnr; // DSN for read operations + public $db_connected = false; // Already connected ? + public $db_mode = ''; // Connection mode + public $db_handle = 0; // Connection handle + public $db_error = false; + public $db_error_msg = ''; private $debug_mode = false; + private $conn_failure = false; private $a_query_results = array('dummy'); private $last_res_id = 0; private $tables; @@ -57,7 +58,7 @@ class rcube_mdb2 */ function __construct($db_dsnw, $db_dsnr='', $pconn=false) { - if ($db_dsnr == '') + if (empty($db_dsnr)) $db_dsnr = $db_dsnw; $this->db_dsnw = $db_dsnw; @@ -83,13 +84,15 @@ class rcube_mdb2 'persistent' => $this->db_pconn, 'emulate_prepared' => $this->debug_mode, 'debug' => $this->debug_mode, - 'debug_handler' => 'mdb2_debug_handler', + 'debug_handler' => array($this, 'debug_handler'), 'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL); if ($this->db_provider == 'pgsql') { $db_options['disable_smart_seqname'] = true; $db_options['seqname_format'] = '%s'; } + $this->db_error = false; + $this->db_error_msg = null; $dbh = MDB2::connect($dsn, $db_options); @@ -121,28 +124,40 @@ class rcube_mdb2 */ function db_connect($mode) { + // previous connection failed, don't attempt to connect again + if ($this->conn_failure) { + return; + } + + // no replication + if ($this->db_dsnw == $this->db_dsnr) { + $mode = 'w'; + } + // Already connected if ($this->db_connected) { - // connected to read-write db, current connection is ok - if ($this->db_mode == 'w') - return; - - // no replication, current connection is ok for read and write - if (empty($this->db_dsnr) || $this->db_dsnw == $this->db_dsnr) { - $this->db_mode = 'w'; + // connected to db with the same or "higher" mode + if ($this->db_mode == 'w' || $this->db_mode == $mode) { return; } - - // Same mode, current connection is ok - if ($this->db_mode == $mode) - return; } $dsn = ($mode == 'r') ? $this->db_dsnr : $this->db_dsnw; - $this->db_handle = $this->dsn_connect($dsn); + $this->db_handle = $this->dsn_connect($dsn); $this->db_connected = !PEAR::isError($this->db_handle); - $this->db_mode = $mode; + + // use write-master when read-only fails + if (!$this->db_connected && $mode == 'r') { + $mode = 'w'; + $this->db_handle = $this->dsn_connect($this->db_dsnw); + $this->db_connected = !PEAR::isError($this->db_handle); + } + + if ($this->db_connected) + $this->db_mode = $mode; + else + $this->conn_failure = true; } @@ -186,6 +201,16 @@ class rcube_mdb2 } + /** + * Is database replication configured? + * This returns true if dsnw != dsnr + */ + function is_replicated() + { + return !empty($this->db_dsnr) && $this->db_dsnw != $this->db_dsnr; + } + + /** * Execute a SQL query * @@ -266,7 +291,9 @@ class rcube_mdb2 raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, - 'message' => $this->db_error_msg), true, true); + 'message' => $this->db_error_msg), true, false); + + $result = false; } else { $result = $q->execute($params); @@ -289,7 +316,7 @@ class rcube_mdb2 */ function num_rows($res_id=null) { - if (!$this->db_handle) + if (!$this->db_connected) return false; if ($result = $this->_get_result($res_id)) @@ -308,10 +335,10 @@ class rcube_mdb2 */ function affected_rows($res_id = null) { - if (!$this->db_handle) + if (!$this->db_connected) return false; - return (int) $this->_get_result($res_id); + return $this->_get_result($res_id); } @@ -325,7 +352,7 @@ class rcube_mdb2 */ function insert_id($table = '') { - if (!$this->db_handle || $this->db_mode == 'r') + if (!$this->db_connected || $this->db_mode == 'r') return false; if ($table) { @@ -412,6 +439,23 @@ class rcube_mdb2 } + /** + * Wrapper for SHOW COLUMNS command + * + * @param string Table name + * @return array List of table cols + */ + function list_cols($table) + { + $this->db_handle->loadModule('Manager'); + if (!PEAR::isError($result = $this->db_handle->listTableFields($table))) { + return $result; + } + + return null; + } + + /** * Formats input so it can be safely used in a query * @@ -430,7 +474,7 @@ class rcube_mdb2 if (!$this->db_handle) $this->db_connect('r'); - return $this->db_handle->quote($input, $type); + return $this->db_connected ? $this->db_handle->quote($input, $type) : addslashes($input); } @@ -461,7 +505,7 @@ class rcube_mdb2 if (!$this->db_handle) $this->db_connect('r'); - return $this->db_handle->quoteIdentifier($str); + return $this->db_connected ? $this->db_handle->quoteIdentifier($str) : $str; } @@ -490,7 +534,7 @@ class rcube_mdb2 */ function now() { - switch($this->db_provider) { + switch ($this->db_provider) { case 'mssql': case 'sqlsrv': return "getdate()"; @@ -524,9 +568,12 @@ class rcube_mdb2 /** * Return SQL statement to convert a field value into a unix timestamp * + * This method is deprecated and should not be used anymore due to limitations + * of timestamp functions in Mysql (year 2038 problem) + * * @param string $field Field name * @return string SQL statement to use in query - * @access public + * @deprecated */ function unixtimestamp($field) { @@ -576,6 +623,34 @@ class rcube_mdb2 } } + /** + * Abstract SQL statement for value concatenation + * + * @return string SQL statement to be used in query + * @access public + */ + function concat(/* col1, col2, ... */) + { + $func = ''; + $args = func_get_args(); + + switch($this->db_provider) { + case 'mysql': + case 'mysqli': + $func = 'CONCAT'; + $delim = ', '; + break; + case 'mssql': + case 'sqlsrv': + $delim = ' + '; + break; + default: + $delim = ' || '; + } + + return $func . '(' . join($delim, $args) . ')'; + } + /** * Encodes non-UTF-8 characters in string/array/object (recursive) @@ -703,7 +778,7 @@ class rcube_mdb2 */ private function _sqlite_prepare() { - include_once('include/rcube_sqlite.inc'); + include_once(INSTALL_PATH . 'program/include/rcube_sqlite.inc'); // we emulate via callback some missing MySQL function sqlite_create_function($this->db_handle->connection, @@ -716,16 +791,17 @@ class rcube_mdb2 'md5', 'rcube_sqlite_md5'); } -} // 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 = sprintf('%s(%d): %s;', - $scope, $db->db_index, rtrim($message, ';')); - write_log('sql', $debug_output); + /** + * Debug handler for the MDB2 + */ + function debug_handler(&$db, $scope, $message, $context = array()) + { + if ($scope != 'prepare') { + $debug_output = sprintf('%s(%d): %s;', + $scope, $db->db_index, rtrim($message, ';')); + write_log('sql', $debug_output); + } } -} +} // end class rcube_db