From: Reini U. <ru...@us...> - 2005-02-11 14:45:55
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4930/WikiDB/backend Modified Files: PDO.php Log Message: support ENABLE_LIVESEARCH, enable PDO sessions Index: PDO.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PDO.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -2 -b -p -d -r1.1 -r1.2 --- PDO.php 10 Feb 2005 19:01:22 -0000 1.1 +++ PDO.php 11 Feb 2005 14:45:45 -0000 1.2 @@ -81,8 +81,19 @@ extends WikiDB_backend } if (empty($this->_parsedDSN['password'])) $this->_parsedDSN['password'] = ''; + try { + // try to load it dynamically (unix only) + if (!loadPhpExtension("pdo_$driver")) { + echo $GLOBALS['php_errormsg'], "<br>\n"; + trigger_error(sprintf("dl() problem: Required extension '%s' could not be loaded!", + "pdo_$driver"), + E_USER_WARNING); + } + // persistent is defined as DSN option, or with a config value. // phptype://username:password@hostspec/database?persistent=false - $this->_dbh = new PDO($dbparams['dsn'], $this->_parsedDSN['username'], $this->_parsedDSN['password'], + $this->_dbh = new PDO($dbparams['dsn'], + $this->_parsedDSN['username'], + $this->_parsedDSN['password'], array(PDO_ATTR_AUTOCOMMIT => true, PDO_ATTR_TIMEOUT => DATABASE_TIMEOUT, @@ -93,10 +104,12 @@ extends WikiDB_backend catch (PDOException $e) { echo "<br>\nDB Connection failed: " . $e->getMessage(); + if (DEBUG & _DEBUG_VERBOSE or DEBUG & _DEBUG_SQL) { echo "<br>\nDSN: '", $dbparams['dsn'], "'"; echo "<br>\n_parsedDSN: '", print_r($this->_parsedDSN), "'"; echo "<br>\nparsed: '", print_r($parsed), "'"; + } exit(); } - if (DEBUG & _DEBUG_SQL) { + if (DEBUG & _DEBUG_SQL) { // not yet implemented $this->_dbh->debug = true; } @@ -1438,4 +1451,7 @@ extends WikiDB_backend_search // $Log$ +// Revision 1.2 2005/02/11 14:45:45 rurban +// support ENABLE_LIVESEARCH, enable PDO sessions +// // Revision 1.1 2005/02/10 19:01:22 rurban // add PDO support |