diff options
| author | Mark Newnham <mark@newnhams.com> | 2024-05-24 20:25:32 -0600 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2024-08-28 09:24:07 +0200 |
| commit | cb18a9dab2eb113feb878af7c3b3639c39354bbf (patch) | |
| tree | 6f926d5b4671282f172be4ec067716509ebe3198 | |
| parent | 6eccac80d807b9cf2810061a3e468e199b790d41 (diff) | |
| download | adodb-cb18a9dab2eb113feb878af7c3b3639c39354bbf.tar.gz adodb-cb18a9dab2eb113feb878af7c3b3639c39354bbf.tar.bz2 adodb-cb18a9dab2eb113feb878af7c3b3639c39354bbf.zip | |
Handle connection re-use using *LOCAL
| -rw-r--r-- | drivers/adodb-db2.inc.php | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php index 7c773849..eaef8f73 100644 --- a/drivers/adodb-db2.inc.php +++ b/drivers/adodb-db2.inc.php @@ -109,10 +109,12 @@ class ADODB_db2 extends ADOConnection { return null; } - $connectionParameters = $this->unpackParameters($argDSN, - $argUsername, - $argPassword, - $argDatabasename); + $connectionParameters = $this->unpackParameters( + $argDSN, + $argUsername, + $argPassword, + $argDatabasename + ); if ($connectionParameters == null) { @@ -129,7 +131,12 @@ class ADODB_db2 extends ADOConnection { $useCataloguedConnection = $connectionParameters['catalogue']; if ($this->debug){ - if ($useCataloguedConnection){ + if (strcmp($argDSN,'*LOCAL') == 0) + { + $connectMessage = '*LOCAL connection'; + } + else if ($useCataloguedConnection) + { $connectMessage = "Catalogued connection using parameters: "; $connectMessage .= "DB=$argDatabasename / "; $connectMessage .= "UID=$argUsername / "; @@ -170,8 +177,8 @@ class ADODB_db2 extends ADOConnection { $db2Options); else $this->_connectionID = $db2Function($argDSN, - null, - null, + '', + '', $db2Options); @@ -198,12 +205,28 @@ class ADODB_db2 extends ADOConnection { { - $connectionParameters = array('dsn'=>'', - 'uid'=>'', - 'pwd'=>'', - 'database'=>'', - 'catalogue'=>true - ); + $connectionParameters = array( + 'dsn'=>'', + 'uid'=>'', + 'pwd'=>'', + 'database'=>'', + 'catalogue'=>true + ); + + /* + * Shortcut for *LOCAL + */ + if (strcmp($argDSN,'*LOCAL') == 0) + { + $connectionParameters = array( + 'dsn'=>'*LOCAL', + 'uid'=>'', + 'pwd'=>'', + 'database'=>'', + 'catalogue'=>true + ); + return $connectionParameters; + } /* * Uou can either connect to a catalogued connection |