From 76e0435af10579afdc3ed4956aeafa83a17decd3 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 14 Feb 2012 11:55:17 -0500
Subject: First iteration of interbase driver

---
 .../drivers/interbase/interbase_result.php         | 190 +++++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 system/database/drivers/interbase/interbase_result.php

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
new file mode 100644
index 000000000..d811fc608
--- /dev/null
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -0,0 +1,190 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 5.1.6 or newer
+ *
+ * NOTICE OF LICENSE
+ * 
+ * Licensed under the Open Software License version 3.0
+ * 
+ * This source file is subject to the Open Software License (OSL 3.0) that is
+ * bundled with this package in the files license.txt / license.rst.  It is
+ * also available through the world wide web at this URL:
+ * http://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world wide web, please send an email to
+ * licensing@ellislab.com so we can send you a copy immediately.
+ *
+ * @package		CodeIgniter
+ * @author		EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
+ * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * @link		http://codeigniter.com
+ * @since		Version 3.0
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * Interbase/Firebird Result Class
+ *
+ * This class extends the parent result class: CI_DB_result
+ *
+ * @category	Database
+ * @author		EllisLab Dev Team
+ * @link		http://codeigniter.com/user_guide/database/
+ */
+class CI_DB_interbase_result extends CI_DB_result {
+
+	/**
+	 * Number of rows in the result set
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function num_rows()
+	{
+		//Will have to manually calculate :(
+		$count = 0;
+		
+		while($r = @ibase_fetch_row($this->result_id))
+		{
+			$count++;
+		}
+		
+		return $count;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Number of fields in the result set
+	 *
+	 * @access	public
+	 * @return	integer
+	 */
+	function num_fields()
+	{
+		return @ibase_num_fields($this->result_id);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch Field Names
+	 *
+	 * Generates an array of column names
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function list_fields()
+	{
+		$field_names = array();
+		for ($i = 0; $i < $this->num_fields(); $i++)
+		{
+			$info = ibase_field_info($this->result_id, $i);
+			$field_names[] = $info['name'];
+		}
+
+		return $field_names;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Field data
+	 *
+	 * Generates an array of objects containing field meta-data
+	 *
+	 * @access	public
+	 * @return	array
+	 */
+	function field_data()
+	{
+		
+		$retval = array();
+		for ($i = 0; $i < $this->num_fields(); $i++)
+		{
+			$info = ibase_field_info($this->result_id, $i);
+		
+			$F				= new stdClass();
+			$F->name		= $info['name'];
+			$F->type		= $info['type'];
+			$F->max_length	= $info['length'];
+			$F->primary_key = 0;
+			$F->default		= '';
+
+			$retval[] = $F;
+		}
+
+		return $retval;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Free the result
+	 *
+	 * @return	null
+	 */
+	function free_result()
+	{
+		@ibase_free_result($this->result_id);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Data Seek
+	 *
+	 * Moves the internal pointer to the desired offset.  We call
+	 * this internally before fetching results to make sure the
+	 * result set starts at zero
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _data_seek($n = 0)
+	{
+		//Interbase driver doesn't implement a sutable function
+		return array();	
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Result - associative array
+	 *
+	 * Returns the result set as an array
+	 *
+	 * @access	private
+	 * @return	array
+	 */
+	function _fetch_assoc()
+	{
+		return @ibase_fetch_assoc($this->result_id);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Result - object
+	 *
+	 * Returns the result set as an object
+	 *
+	 * @access	private
+	 * @return	object
+	 */
+	function _fetch_object()
+	{
+		return @ibase_fetch_object($this->result_id);
+	}
+
+}
+
+
+/* End of file interbase_result.php */
+/* Location: ./system/database/drivers/interbase/interbase_result.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 4be822bcca94273967abf010ef67f64ead5e6bf2 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 14 Feb 2012 12:07:34 -0500
Subject: Added public declarations

---
 system/database/drivers/interbase/interbase_result.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index d811fc608..9d827895d 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -44,7 +44,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	public
 	 * @return	integer
 	 */
-	function num_rows()
+	public function num_rows()
 	{
 		//Will have to manually calculate :(
 		$count = 0;
@@ -65,7 +65,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	public
 	 * @return	integer
 	 */
-	function num_fields()
+	public function num_fields()
 	{
 		return @ibase_num_fields($this->result_id);
 	}
@@ -80,7 +80,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	public
 	 * @return	array
 	 */
-	function list_fields()
+	public function list_fields()
 	{
 		$field_names = array();
 		for ($i = 0; $i < $this->num_fields(); $i++)
@@ -102,7 +102,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	public
 	 * @return	array
 	 */
-	function field_data()
+	public function field_data()
 	{
 		
 		$retval = array();
@@ -130,7 +130,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * @return	null
 	 */
-	function free_result()
+	public function free_result()
 	{
 		@ibase_free_result($this->result_id);
 	}
@@ -147,7 +147,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	private
 	 * @return	array
 	 */
-	function _data_seek($n = 0)
+	public function _data_seek($n = 0)
 	{
 		//Interbase driver doesn't implement a sutable function
 		return array();	
@@ -163,7 +163,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	private
 	 * @return	array
 	 */
-	function _fetch_assoc()
+	public function _fetch_assoc()
 	{
 		return @ibase_fetch_assoc($this->result_id);
 	}
@@ -178,7 +178,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * @access	private
 	 * @return	object
 	 */
-	function _fetch_object()
+	public function _fetch_object()
 	{
 		return @ibase_fetch_object($this->result_id);
 	}
-- 
cgit v1.2.3-24-g4f1b


From 8be31a92758959d7fd7b035e36b9799da13426ae Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Wed, 15 Feb 2012 11:48:57 -0500
Subject: Limit clause fixes

---
 system/database/drivers/interbase/interbase_result.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 9d827895d..f2465ab5d 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -149,7 +149,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	public function _data_seek($n = 0)
 	{
-		//Interbase driver doesn't implement a sutable function
+		//Interbase driver doesn't implement a suitable function
 		return array();	
 	}
 
@@ -185,6 +185,5 @@ class CI_DB_interbase_result extends CI_DB_result {
 
 }
 
-
 /* End of file interbase_result.php */
 /* Location: ./system/database/drivers/interbase/interbase_result.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 817af19bb12b88bae361034e00ce3a02da595f94 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 16 Feb 2012 08:28:00 -0500
Subject: narfbg suggested fixes

---
 .../drivers/interbase/interbase_result.php         | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index f2465ab5d..7d56c56c6 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
  * An open source application development framework for PHP 5.1.6 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Open Software License version 3.0
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -38,23 +38,21 @@
  */
 class CI_DB_interbase_result extends CI_DB_result {
 
+	public $num_rows;
+
 	/**
 	 * Number of rows in the result set
 	 *
-	 * @access	public
 	 * @return	integer
 	 */
 	public function num_rows()
 	{
-		//Will have to manually calculate :(
-		$count = 0;
-		
-		while($r = @ibase_fetch_row($this->result_id))
+		if( ! is_null($this->num_rows))
 		{
-			$count++;
+			return $this->num_rows;
 		}
 		
-		return $count;
+		return $this->num_rows = (isset($this->result_array()) ? count($this->result_array()) : 0;
 	}
 
 	// --------------------------------------------------------------------
@@ -62,7 +60,6 @@ class CI_DB_interbase_result extends CI_DB_result {
 	/**
 	 * Number of fields in the result set
 	 *
-	 * @access	public
 	 * @return	integer
 	 */
 	public function num_fields()
@@ -77,13 +74,12 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * Generates an array of column names
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function list_fields()
 	{
 		$field_names = array();
-		for ($i = 0; $i < $this->num_fields(); $i++)
+		for ($i = 0, $num_fields=$this->num_fields(); $i < $num_fields; $i++)
 		{
 			$info = ibase_field_info($this->result_id, $i);
 			$field_names[] = $info['name'];
@@ -99,14 +95,13 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * Generates an array of objects containing field meta-data
 	 *
-	 * @access	public
 	 * @return	array
 	 */
 	public function field_data()
 	{
 		
 		$retval = array();
-		for ($i = 0; $i < $this->num_fields(); $i++)
+		for ($i = 0, $num_fields=$this->num_fields(); $i < $num_fields; $i++)
 		{
 			$info = ibase_field_info($this->result_id, $i);
 		
@@ -144,13 +139,12 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @access	private
 	 * @return	array
 	 */
 	public function _data_seek($n = 0)
 	{
 		//Interbase driver doesn't implement a suitable function
-		return array();	
+		return FALSE;	
 	}
 
 	// --------------------------------------------------------------------
@@ -160,7 +154,6 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * Returns the result set as an array
 	 *
-	 * @access	private
 	 * @return	array
 	 */
 	public function _fetch_assoc()
@@ -175,7 +168,6 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * Returns the result set as an object
 	 *
-	 * @access	private
 	 * @return	object
 	 */
 	public function _fetch_object()
-- 
cgit v1.2.3-24-g4f1b


From e27216f88443775534e185e192996353d4958387 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 16 Feb 2012 12:15:45 -0500
Subject: Num rows fix

---
 system/database/drivers/interbase/interbase_result.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 7d56c56c6..3d5721138 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -52,7 +52,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 			return $this->num_rows;
 		}
 		
-		return $this->num_rows = (isset($this->result_array()) ? count($this->result_array()) : 0;
+		return 0;
 	}
 
 	// --------------------------------------------------------------------
@@ -143,6 +143,9 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	public function _data_seek($n = 0)
 	{
+		//Set the row count to 0
+		$this->num_rows = 0;
+	
 		//Interbase driver doesn't implement a suitable function
 		return FALSE;	
 	}
@@ -158,6 +161,9 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	public function _fetch_assoc()
 	{
+		//Increment row count
+		$this->num_rows++;
+	
 		return @ibase_fetch_assoc($this->result_id);
 	}
 
@@ -172,6 +178,9 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	public function _fetch_object()
 	{
+		//Increment row count
+		$this->num_rows++;
+		
 		return @ibase_fetch_object($this->result_id);
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From 3a4cdc62042c56da9527e6d1d4c1ab5417839e1c Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 17 Feb 2012 13:59:44 -0500
Subject: Workaround to fix  method

---
 .../drivers/interbase/interbase_result.php         | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 3d5721138..37f0a108c 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -183,6 +183,68 @@ class CI_DB_interbase_result extends CI_DB_result {
 		
 		return @ibase_fetch_object($this->result_id);
 	}
+	
+	// --------------------------------------------------------------------
+
+	/**
+	 * Query result.  "object" version.
+	 *
+	 * @return	object
+	 */
+	public function result_object()
+	{
+		if (count($this->result_object) > 0)
+		{
+			return $this->result_object;
+		}
+
+		// In the event that query caching is on the result_id variable
+		// will return FALSE since there isn't a valid SQL resource so
+		// we'll simply return an empty array.
+		if ($this->result_id === FALSE)
+		{
+			return array();
+		}
+
+		$this->num_rows = 0;
+		while ($row = $this->_fetch_object())
+		{
+			$this->result_object[] = $row;
+		}
+
+		return $this->result_object;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Query result.  "array" version.
+	 *
+	 * @return	array
+	 */
+	public function result_array()
+	{
+		if (count($this->result_array) > 0)
+		{
+			return $this->result_array;
+		}
+
+		// In the event that query caching is on the result_id variable
+		// will return FALSE since there isn't a valid SQL resource so
+		// we'll simply return an empty array.
+		if ($this->result_id === FALSE)
+		{
+			return array();
+		}
+
+		$this->num_rows = 0;
+		while ($row = $this->_fetch_assoc())
+		{
+			$this->result_array[] = $row;
+		}
+
+		return $this->result_array;
+	}
 
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 7d42eb39484a784496868f4446a2d47b0c52410d Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 17 Feb 2012 14:21:18 -0500
Subject: More general fix for num_rows

---
 system/database/drivers/interbase/interbase_result.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 37f0a108c..9093029dd 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -52,7 +52,10 @@ class CI_DB_interbase_result extends CI_DB_result {
 			return $this->num_rows;
 		}
 		
-		return 0;
+		//Get the results so that you can get an accurate rowcount
+		$this->result_array();
+		
+		return $this->num_rows;
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 0dcfd778350ce397b034f44e34397ea255b35809 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 17 Feb 2012 17:42:34 -0500
Subject: Automatic retreival of blob fields

---
 system/database/drivers/interbase/interbase_result.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 9093029dd..c5608d977 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -167,7 +167,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		//Increment row count
 		$this->num_rows++;
 	
-		return @ibase_fetch_assoc($this->result_id);
+		return @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS);
 	}
 
 	// --------------------------------------------------------------------
@@ -184,7 +184,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		//Increment row count
 		$this->num_rows++;
 		
-		return @ibase_fetch_object($this->result_id);
+		return @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS);
 	}
 	
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From fa84d6186b7f61353d04132871a5223f80fa12ee Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 12:51:45 -0500
Subject: Fixed result array fetching

---
 system/database/drivers/interbase/interbase_result.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index c5608d977..c7b40d2ea 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -53,7 +53,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		}
 		
 		//Get the results so that you can get an accurate rowcount
-		$this->result_array();
+		$this->result();
 		
 		return $this->num_rows;
 	}
@@ -231,6 +231,14 @@ class CI_DB_interbase_result extends CI_DB_result {
 		{
 			return $this->result_array;
 		}
+		
+		// Since the object and array are really similar, just case
+		// the result object to an array  if need be
+		if(count($this->result_object) > 0)
+		{
+			$this->result_array = (array)$this->result_object;
+			return $this->result_array;
+		}
 
 		// In the event that query caching is on the result_id variable
 		// will return FALSE since there isn't a valid SQL resource so
-- 
cgit v1.2.3-24-g4f1b


From 53d109dbd831506c4b9ca77f10bc1b2dba9c28d5 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 13:04:48 -0500
Subject: Fix previous commit

---
 system/database/drivers/interbase/interbase_result.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index c7b40d2ea..de4a10b62 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -236,7 +236,11 @@ class CI_DB_interbase_result extends CI_DB_result {
 		// the result object to an array  if need be
 		if(count($this->result_object) > 0)
 		{
-			$this->result_array = (array)$this->result_object;
+			foreach($this->result_object as $obj)
+			{
+				$this->result_array[] = (array)$obj;
+			}
+		
 			return $this->result_array;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 934e853d9a3a491911b72f40cb371edfaddb9c94 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 15:42:14 -0500
Subject: Revert "Fix previous commit"

This reverts commit 53d109dbd831506c4b9ca77f10bc1b2dba9c28d5.
---
 system/database/drivers/interbase/interbase_result.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index de4a10b62..c7b40d2ea 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -236,11 +236,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		// the result object to an array  if need be
 		if(count($this->result_object) > 0)
 		{
-			foreach($this->result_object as $obj)
-			{
-				$this->result_array[] = (array)$obj;
-			}
-		
+			$this->result_array = (array)$this->result_object;
 			return $this->result_array;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 51ed4ed7f6097a34ce1db7b225272bfc1b0f0bcf Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 16:01:42 -0500
Subject: Convert result_array to result_object instead of re-fetching

---
 .../drivers/interbase/interbase_result.php         | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index c7b40d2ea..e1332ba93 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -200,6 +200,27 @@ class CI_DB_interbase_result extends CI_DB_result {
 		{
 			return $this->result_object;
 		}
+		
+		// Convert result array to object so that 
+		// We don't have to get the result again
+		if(count($this->result_array) > 0)
+		{
+			$i = 0;
+		
+			foreach($this->result_array as $array)
+			{
+				$this->result_object[$i] = new StdClass();
+			
+				foreach($array as $key => $val)
+				{
+					$this->result_object[$i]->{$key} = $val;
+				}
+				
+				++$i;
+			}
+			
+			return $this->result_object;
+		}
 
 		// In the event that query caching is on the result_id variable
 		// will return FALSE since there isn't a valid SQL resource so
@@ -236,7 +257,11 @@ class CI_DB_interbase_result extends CI_DB_result {
 		// the result object to an array  if need be
 		if(count($this->result_object) > 0)
 		{
-			$this->result_array = (array)$this->result_object;
+			foreach($this->result_object as $obj)
+			{
+				$this->result_array[] = (array)$obj;
+			}
+		
 			return $this->result_array;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 95562144da88784588fb2477fa0070576bd386a0 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 17:37:21 -0500
Subject: Set protected visibility on applicable functions/properties

---
 system/database/drivers/interbase/interbase_result.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index e1332ba93..7a3a41f2c 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -144,7 +144,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * @return	array
 	 */
-	public function _data_seek($n = 0)
+	protected function _data_seek($n = 0)
 	{
 		//Set the row count to 0
 		$this->num_rows = 0;
@@ -162,7 +162,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * @return	array
 	 */
-	public function _fetch_assoc()
+	protected function _fetch_assoc()
 	{
 		//Increment row count
 		$this->num_rows++;
@@ -179,7 +179,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 *
 	 * @return	object
 	 */
-	public function _fetch_object()
+	protected function _fetch_object()
 	{
 		//Increment row count
 		$this->num_rows++;
-- 
cgit v1.2.3-24-g4f1b


From 2da66edce7c249c0305153a65c4292311f49a546 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 17:54:39 -0500
Subject: Fix counting issue, minor formatting

---
 .../drivers/interbase/interbase_result.php         | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 7a3a41f2c..9caf1ce91 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -82,7 +82,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	public function list_fields()
 	{
 		$field_names = array();
-		for ($i = 0, $num_fields=$this->num_fields(); $i < $num_fields; $i++)
+		for ($i = 0, $num_fields = $this->num_fields(); $i < $num_fields; $i++)
 		{
 			$info = ibase_field_info($this->result_id, $i);
 			$field_names[] = $info['name'];
@@ -104,7 +104,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	{
 		
 		$retval = array();
-		for ($i = 0, $num_fields=$this->num_fields(); $i < $num_fields; $i++)
+		for ($i = 0, $num_fields = $this->num_fields(); $i < $num_fields; $i++)
 		{
 			$info = ibase_field_info($this->result_id, $i);
 		
@@ -164,10 +164,13 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	protected function _fetch_assoc()
 	{
-		//Increment row count
-		$this->num_rows++;
+		if(($row = @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
+		{
+			//Increment row count
+			$this->num_rows++;
+		}
 	
-		return @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS);
+		return $row;
 	}
 
 	// --------------------------------------------------------------------
@@ -181,10 +184,13 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	protected function _fetch_object()
 	{
-		//Increment row count
-		$this->num_rows++;
+		if(($row = @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
+		{
+			//Increment row count
+			$this->num_rows++;
+		}
 		
-		return @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS);
+		return $row;
 	}
 	
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 41a439bf75bdd277e153d44788b732cf2e8c7ee3 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 18:40:00 -0500
Subject: Minor formatting fixes

---
 system/database/drivers/interbase/interbase_result.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 9caf1ce91..01f0e52b2 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -164,7 +164,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	protected function _fetch_assoc()
 	{
-		if(($row = @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
+		if (($row = @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
 		{
 			//Increment row count
 			$this->num_rows++;
@@ -184,7 +184,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 	 */
 	protected function _fetch_object()
 	{
-		if(($row = @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
+		if (($row = @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS)) !== FALSE)
 		{
 			//Increment row count
 			$this->num_rows++;
@@ -209,7 +209,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		
 		// Convert result array to object so that 
 		// We don't have to get the result again
-		if(count($this->result_array) > 0)
+		if (count($this->result_array) > 0)
 		{
 			$i = 0;
 		
@@ -261,7 +261,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		
 		// Since the object and array are really similar, just case
 		// the result object to an array  if need be
-		if(count($this->result_object) > 0)
+		if (count($this->result_object) > 0)
 		{
 			foreach($this->result_object as $obj)
 			{
-- 
cgit v1.2.3-24-g4f1b


From dd044b317fc2db52f3812792a256497a2f0e94fb Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 18:58:24 -0500
Subject: More style fixes, replaced _protect_identifiers with
 protect_identifiers in db_forge

---
 system/database/drivers/interbase/interbase_result.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index 01f0e52b2..be9cb6547 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -213,11 +213,11 @@ class CI_DB_interbase_result extends CI_DB_result {
 		{
 			$i = 0;
 		
-			foreach($this->result_array as $array)
+			foreach ($this->result_array as $array)
 			{
 				$this->result_object[$i] = new StdClass();
 			
-				foreach($array as $key => $val)
+				foreach ($array as $key => $val)
 				{
 					$this->result_object[$i]->{$key} = $val;
 				}
@@ -263,7 +263,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		// the result object to an array  if need be
 		if (count($this->result_object) > 0)
 		{
-			foreach($this->result_object as $obj)
+			foreach ($this->result_object as $obj)
 			{
 				$this->result_array[] = (array)$obj;
 			}
-- 
cgit v1.2.3-24-g4f1b


From 125fe732c09f82a0702f29c9309f726bdd5a33c3 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 21 Feb 2012 07:58:25 -0500
Subject: More formatting fixes

---
 system/database/drivers/interbase/interbase_result.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/database/drivers/interbase/interbase_result.php')

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
index be9cb6547..4b15eee20 100644
--- a/system/database/drivers/interbase/interbase_result.php
+++ b/system/database/drivers/interbase/interbase_result.php
@@ -265,7 +265,7 @@ class CI_DB_interbase_result extends CI_DB_result {
 		{
 			foreach ($this->result_object as $obj)
 			{
-				$this->result_array[] = (array)$obj;
+				$this->result_array[] = (array) $obj;
 			}
 		
 			return $this->result_array;
-- 
cgit v1.2.3-24-g4f1b