1 files changed, 60 insertions, 59 deletions

diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 8d28c2c5f..959384164 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -272,10 +272,10 @@ class CI_DB_mysqli_driver extends CI_DB {
 	/**
 	 * The error message string
 	 *
-	 * @access	public
+	 * @access	private
 	 * @return	string
 	 */
-	function error_message()
+	function _error_message()
 	{
 		return mysqli_error($this->conn_id);
 	}
@@ -285,10 +285,10 @@ class CI_DB_mysqli_driver extends CI_DB {
 	/**
 	 * The error message number
 	 *
-	 * @access	public
+	 * @access	private
 	 * @return	integer
 	 */
-	function error_number()
+	function _error_number()
 	{
 		return mysqli_errno($this->conn_id);
 	}
@@ -301,11 +301,11 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 * This function adds backticks if the table name has a period
 	 * in it. Some DBs will get cranky unless periods are escaped
 	 *
-	 * @access	public
+	 * @access	private
 	 * @param	string	the table name
 	 * @return	string
 	 */
-	function escape_table($table)
+	function _escape_table($table)
 	{
 		if (stristr($table, '.'))
 		{
@@ -314,25 +314,7 @@ class CI_DB_mysqli_driver extends CI_DB {
 		
 		return $table;
 	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Field data query
-	 *
-	 * Generates a platform-specific query so that the column data can be retrieved
-	 *
-	 * @access	public
-	 * @param	string	the table name
-	 * @return	object
-	 */
-	function _field_data($table)
-	{
-		$sql = "SELECT * FROM ".$this->escape_table($table)." LIMIT 1";
-		$query = $this->query($sql);
-		return $query->field_data();
-	}
-	
+		
 	// --------------------------------------------------------------------
 
 	/**
@@ -348,7 +330,7 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 */
 	function _insert($table, $keys, $values)
 	{	
-		return "INSERT INTO ".$this->escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";
+		return "INSERT INTO ".$this->_escape_table($table)." (".implode(', ', $keys).") VALUES (".implode(', ', $values).")";
 	}
 	
 	// --------------------------------------------------------------------
@@ -371,7 +353,7 @@ class CI_DB_mysqli_driver extends CI_DB {
 			$valstr[] = $key." = ".$val;
 		}
 	
-		return "UPDATE ".$this->escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where);
+		return "UPDATE ".$this->_escape_table($table)." SET ".implode(', ', $valstr)." WHERE ".implode(" ", $where);
 	}
 	
 	// --------------------------------------------------------------------
@@ -388,9 +370,48 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 */	
 	function _delete($table, $where)
 	{
-		return "DELETE FROM ".$this->escape_table($table)." WHERE ".implode(" ", $where);
+		return "DELETE FROM ".$this->_escape_table($table)." WHERE ".implode(" ", $where);
 	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Limit string
+	 *
+	 * Generates a platform-specific LIMIT clause
+	 *
+	 * @access	public
+	 * @param	string	the sql query string
+	 * @param	integer	the number of rows to limit the query to
+	 * @param	integer	the offset value
+	 * @return	string
+	 */
+	function _limit($sql, $limit, $offset)
+	{	
+		$sql .= "LIMIT ".$limit;
 	
+		if ($offset > 0)
+		{
+			$sql .= " OFFSET ".$offset;
+		}
+		
+		return $sql;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Close DB Connection
+	 *
+	 * @access	public
+	 * @param	resource
+	 * @return	void
+	 */
+	function _close($conn_id)
+	{
+		mysqli_close($conn_id);
+	}
+
 	// --------------------------------------------------------------------
 
 	/**
@@ -432,47 +453,27 @@ class CI_DB_mysqli_driver extends CI_DB {
 	 */
 	function _show_columns($table = '')
 	{
-		return "SHOW COLUMNS FROM ".$this->escape_table($table);
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Limit string
-	 *
-	 * Generates a platform-specific LIMIT clause
-	 *
-	 * @access	public
-	 * @param	string	the sql query string
-	 * @param	integer	the number of rows to limit the query to
-	 * @param	integer	the offset value
-	 * @return	string
-	 */
-	function _limit($sql, $limit, $offset)
-	{	
-		$sql .= "LIMIT ".$limit;
-	
-		if ($offset > 0)
-		{
-			$sql .= " OFFSET ".$offset;
-		}
-		
-		return $sql;
+		return "SHOW COLUMNS FROM ".$this->_escape_table($table);
 	}
 
 	// --------------------------------------------------------------------
 
 	/**
-	 * Close DB Connection
+	 * Field data query
+	 *
+	 * Generates a platform-specific query so that the column data can be retrieved
 	 *
 	 * @access	public
-	 * @param	resource
-	 * @return	void
+	 * @param	string	the table name
+	 * @return	object
 	 */
-	function _close($conn_id)
+	function _field_data($table)
 	{
-		mysqli_close($conn_id);
+		$sql = "SELECT * FROM ".$this->_escape_table($table)." LIMIT 1";
+		$query = $this->query($sql);
+		return $query->field_data();
 	}
+	
 
 }