summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-25 17:05:02 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-25 17:05:02 +0200
commit01800a3787c1e045a1c9a3f39411d18e6f49011b (patch)
tree659c13c7301f371aed66003cb15e31445145f5b1
parent5029305c030158aebac7df231f4bef38c30b3616 (diff)
pdo_odbc DSN
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php53
1 files changed, 41 insertions, 12 deletions
diff --git a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
index a4f9dad3c..1fd8f14b4 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
@@ -65,25 +65,54 @@ class CI_DB_pdo_odbc_driver extends CI_DB_pdo_driver {
if (empty($this->dsn))
{
- $this->dsn = $params['subdriver'].':host='.(empty($this->hostname) ? '127.0.0.1' : $this->hostname);
+ $this->dsn = 'odbc:';
- if ( ! empty($this->port))
+ // Pre-defined DSN
+ if (empty($this->hostname) && empty($this->HOSTNAME) && empty($this->port) && empty($this->PORT))
{
- $this->dsn .= (DIRECTORY_SEPARATOR === '\\' ? ',' : ':').$this->port;
+ if (isset($this->DSN))
+ {
+ $this->dsn .= 'DSN='.$this->DSN;
+ }
+ elseif ( ! empty($this->database))
+ {
+ $this->dsn .= 'DSN='.$this->database;
+ }
+
+ return;
}
- empty($this->database) OR $this->dsn .= ';dbname='.$this->database;
- empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
- empty($this->appname) OR $this->dsn .= ';appname='.$this->appname;
- }
- else
- {
- if ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 6) === FALSE)
+ // If the DSN is not pre-configured - try to build an IBM DB2 connection string
+ $this->dsn .= 'DRIVER='.(isset($this->DRIVER) ? '{'.$this->DRIVER.'}' : '{IBM DB2 ODBC DRIVER}').';';
+
+ if (isset($this->DATABASE))
+ {
+ $this->dsn .= 'DATABASE='.$this->DATABASE.';';
+ }
+ elseif ( ! empty($this->database))
+ {
+ $this->dsn .= 'DATABASE='.$this->database.';';
+ }
+
+ if (isset($this->HOSTNAME))
+ {
+ $this->dsn .= 'HOSTNAME='.$this->HOSTNAME.';';
+ }
+ else
+ {
+ $this->dsn .= 'HOSTNAME='.(empty($this->hostname) ? 'localhost;' : $this->hostname.';');
+ }
+
+ if (isset($this->PORT))
+ {
+ $this->dsn .= 'PORT='.$this->port.';';
+ }
+ elseif ( ! empty($this->port))
{
- $this->dsn .= ';charset='.$this->char_set;
+ $this->dsn .= ';PORT='.$this->port.';';
}
- $this->subdriver = 'odbc';
+ $this->dsn .= 'PROTOCOL='.(isset($this->PROTOCOL) ? $this->PROTOCOL.';' : 'TCPIP;');
}
}