diff options
| author | Calvin Buckley <calvin@cmpct.info> | 2024-05-28 16:40:00 -0500 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2024-08-28 09:24:08 +0200 |
| commit | 804e325c26548b34abed04b8d23b9de87705b3a7 (patch) | |
| tree | 358051ce3fb03dd77caeb950ce730882f9cdba6b | |
| parent | 152bbec9961638d651f20399a08fe1b0c63d2aa6 (diff) | |
| download | adodb-804e325c26548b34abed04b8d23b9de87705b3a7.tar.gz adodb-804e325c26548b34abed04b8d23b9de87705b3a7.tar.bz2 adodb-804e325c26548b34abed04b8d23b9de87705b3a7.zip | |
Fixing DB2 *LOCAL connection
Per https://github.com/ADOdb/ADOdb/pull/1034#issuecomment-2136155259
Signed-off-by: Damien Regad <dregad@mantisbt.org>
Fixed conflict resolution when applying patch.
| -rw-r--r-- | drivers/adodb-db2.inc.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php index a5271333..60cd093a 100644 --- a/drivers/adodb-db2.inc.php +++ b/drivers/adodb-db2.inc.php @@ -148,11 +148,7 @@ class ADODB_db2 extends ADOConnection { } ADOConnection::outp($connectMessage); } - if (strcmp($argDSN,'*LOCAL') == 0) - { - $schema = $argDatabasename; - $argDatabasename = ''; - } + /* * This needs to be set before the connect(). */ @@ -175,14 +171,12 @@ class ADODB_db2 extends ADOConnection { $db2Options[$k] = $v; } - $schema = ''; if ($useCataloguedConnection) { $this->_connectionID = $db2Function($argDatabasename, $argUsername, $argPassword, $db2Options); - $schema = $argDatabasename; } else @@ -197,8 +191,8 @@ class ADODB_db2 extends ADOConnection { if ($this->_connectionID && $this->connectStmt) $this->execute($this->connectStmt); - if ($this->_connectionID && $schema) - $this->execute("SET SCHEMA=$schema"); + if ($this->_connectionID && $argDatabasename) + $this->execute("SET SCHEMA=$argDatabasename"); return $this->_connectionID != false; @@ -233,6 +227,7 @@ class ADODB_db2 extends ADOConnection { { $connectionParameters['dsn'] = $argDSN; $connectionParameters['database'] = $argDatabasename; + $connectionParameters['catalogue'] = false; return $connectionParameters; } |