nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-15 03:44:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow SetConnection to be called with a DSN + options.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-16 09:57:56 +13:00
parent ec2313c932
commit 5ca4f396f8
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
inc/AwlQuery.php
View File

@ -253,12 +253,35 @@ class AwlQuery
* Use a different database connection for this query
* @param resource $new_connection The database connection to use.
*/
function SetConnection( $new_connection ) {
function SetConnection( $new_connection, $options = null ) {
if ( is_string($new_connection) ) {
$dbuser = null;
$dbpass = null;
if ( is_array($v) ) {
$dsn = $v['dsn'];
if ( isset($v['dbuser']) ) $dbuser = $v['dbuser'];
if ( isset($v['dbpass']) ) $dbpass = $v['dbpass'];
}
elseif ( preg_match( '/^(\S+:)?(.*)( user=(\S+))?( password=(\S+))?$/', $v, $matches ) ) {
$dsn = $matches[2];
if ( isset($matches[1]) && $matches[1] != '' ) {
$dsn = $matches[1] . $dsn;
}
else {
$dsn = 'pgsql:' . $dsn;
}
if ( isset($matches[4]) && $matches[4] != '' ) $dbuser = $matches[4];
if ( isset($matches[6]) && $matches[6] != '' ) $dbpass = $matches[6];
}
if ( $new_connection = new AwlDatabase( $dsn, $dbuser, $dbpass, $options ) ) break;
}
$this->connection = $new_connection;
return $new_connection;
}
/**
* Log query, optionally with file and line location of the caller.
*