diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-18 01:10:56 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-18 01:10:56 +0200 |
| commit | 0ea96950241ddea55318091b3dc91914fa582987 (patch) | |
| tree | 95bbc5cf8b68f8b992f2054b679ca0fa3ae5a103 /system/database | |
| parent | 349070a24afb82576fdb05ceee85fc3cd28a099e (diff) | |
| parent | 4f04b81bb03587cf8c81513b18fa08c27dba8352 (diff) | |
Merge pull request #457 from narfbg/develop
Add support for the configured oracle database charset (Issue #112)
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index d4adfd528..d4c27fa43 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -79,7 +79,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_connect() { - return @ocilogon($this->username, $this->password, $this->hostname); + return @ocilogon($this->username, $this->password, $this->hostname, $this->char_set); } // -------------------------------------------------------------------- @@ -92,7 +92,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_pconnect() { - return @ociplogon($this->username, $this->password, $this->hostname); + return @ociplogon($this->username, $this->password, $this->hostname, $this->char_set); } // -------------------------------------------------------------------- @@ -136,7 +136,7 @@ class CI_DB_oci8_driver extends CI_DB { */ function db_set_charset($charset, $collation) { - // @todo - add support if needed + // this is done upon connect return TRUE; } |