Changed default CI_DB_result::_data_seek() return value to FALSE and …

…removed the method from drivers that don't support it
mikeytag · Apr 12, 2012 · 8f3566f · 8f3566f
1 parent 918be79
commit 8f3566f
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 83 deletions.
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
@@ -384,7 +384,7 @@ public function num_fields() { return 0; }
 	public function list_fields() { return array(); }
 	public function field_data() { return array(); }
 	public function free_result() { $this->result_id = FALSE; }
-	protected function _data_seek() { return TRUE; }
+	protected function _data_seek() { return FALSE; }
 	protected function _fetch_assoc() { return array(); }
 	protected function _fetch_object() { return array(); }
 

diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php
@@ -163,7 +163,7 @@ public function free_result()
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/interbase/interbase_result.php b/system/database/drivers/interbase/interbase_result.php
@@ -130,23 +130,6 @@ public function free_result()
 
 	// --------------------------------------------------------------------
 
-	/**
-	 * 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
-	 *
-	 * @return	array
-	 */
-	protected function _data_seek($n = 0)
-	{
-		// Interbase driver doesn't implement a suitable function
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
 	/**
 	 * Result - associative array
 	 *

diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
@@ -126,11 +126,11 @@ public function free_result()
 	/**
 	 * Data Seek
 	 *
-	 * Moves the internal pointer to the desired offset.  We call
+	 * Moves the internal pointer to the desired offset. We call
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
@@ -128,7 +128,7 @@ public function free_result()
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
@@ -125,11 +125,11 @@ public function free_result()
 	/**
 	 * Data Seek
 	 *
-	 * Moves the internal pointer to the desired offset.  We call
+	 * Moves the internal pointer to the desired offset. We call
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
@@ -244,8 +244,6 @@ public function result_array()
 			$this->row_data[$row_index++] = $row;
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_array = $this->row_data;
 	}
 
@@ -299,8 +297,6 @@ public function result_object()
 			$this->result_object[$row_index++] = $row;
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_object;
 	}
 

diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
@@ -139,22 +139,6 @@ public function free_result()
 
 	// --------------------------------------------------------------------
 
-	/**
-	 * 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
-	 *
-	 * @return	bool
-	 */
-	protected function _data_seek($n = 0)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
 	/**
 	 * Result - associative array
 	 *

diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
@@ -92,7 +92,6 @@ public function result_assoc()
 			$res_handler = 'result_'.$type;
 
 			$this->$res_handler = array();
-			$this->_data_seek(0);
 
 			while ($row = $this->$res_method())
 			{
@@ -227,22 +226,6 @@ public function free_result()
 
 	// --------------------------------------------------------------------
 
-	/**
-	 * 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
-	 *
-	 * @return	bool
-	 */
-	protected function _data_seek($n = 0)
-	{
-		return FALSE;
-	}
-
-	// --------------------------------------------------------------------
-
 	/**
 	 * Result - associative array
 	 *

diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php
@@ -128,7 +128,7 @@ public function free_result()
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
@@ -112,7 +112,7 @@ public function field_data()
 	 * this internally before fetching results to make sure the
 	 * result set starts at zero
 	 *
-	 * @return	array
+	 * @return	bool
 	 */
 	protected function _data_seek($n = 0)
 	{

diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php
@@ -198,8 +198,6 @@ public function result_array()
 			$this->row_data[$row_index++] = $row;
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_array = $this->row_data;
 	}
 
@@ -266,8 +264,6 @@ public function result_object()
 			$this->num_rows = count($this->result_object);
 		}
 
-		// Un-comment the following line, in case it becomes needed
-		// $this->_data_seek();
 		return $this->result_object;
 	}
 

diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php
@@ -123,22 +123,6 @@ public function free_result()
 
 	// --------------------------------------------------------------------
 
-	/**
-	 * 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
-	 *
-	 * @return	void
-	 */
-	protected function _data_seek($n = 0)
-	{
-		// Not implemented
-	}
-
-	// --------------------------------------------------------------------
-
 	/**
 	 * Result - associative array
 	 *