From 068e3dea797351448f743b1e3faac506bc0f6e2a Mon Sep 17 00:00:00 2001
From: narfbg <narf@bofh.bg>
Date: Sat, 17 Sep 2011 21:38:46 +0300
Subject: Fix ./system/database/drivers/oci8_driver.php to pass the configured
 database character set on connect.

---
 system/database/drivers/oci8/oci8_driver.php | 6 +++---
 1 file 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;
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From badaf2f3389502f02e086f7e34818ad52065213b Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 17 Sep 2011 21:58:21 +0300
Subject: Update the ChangeLog

---
 user_guide/changelog.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 8dd64a3a2..b86204438 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -91,6 +91,7 @@ Change Log
 			<li>
 				Added additional option 'none' for the optional third argument for  <kbd>$this->db->like()</kbd> in the <a href="database/active_record.html">Database Driver</a>.
 			</li>
+			<li>Added support for the configured database character set in OCI8 driver.</li>
 		</ul>
 	</li>
 	<li>Libraries
-- 
cgit v1.2.3-24-g4f1b


From 4f04b81bb03587cf8c81513b18fa08c27dba8352 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 17 Sep 2011 22:01:14 +0300
Subject: Updated ChangeLog.

---
 user_guide/changelog.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index b86204438..8a4a70642 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -91,7 +91,6 @@ Change Log
 			<li>
 				Added additional option 'none' for the optional third argument for  <kbd>$this->db->like()</kbd> in the <a href="database/active_record.html">Database Driver</a>.
 			</li>
-			<li>Added support for the configured database character set in OCI8 driver.</li>
 		</ul>
 	</li>
 	<li>Libraries
@@ -129,6 +128,7 @@ Change Log
 	<li>Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().</li>
 	<li>Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.</li>
 	<li>Fixed a bug (#344) - Using schema found in <a href="libraries/sessions.html">Saving Session Data to a Database</a>, system would throw error "user_data does not have a default value" when deleting then creating a session.</li>
+	<li>Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.</li>
 </ul>
 
 <h2>Version 2.0.3</h2>
-- 
cgit v1.2.3-24-g4f1b