rrcfesc / codeignitercoredatabase

Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
         // Make everything relative to the root
         chdir(dirname(__DIR__));
         // Setup autoloading
-        require_once( __DIR__ . '/vendor/autoload.php' );
+        require_once(__DIR__.'/vendor/autoload.php');
     }
     /**
      * Carga Archivo de Configuración
@@ -21,7 +21,7 @@ 
      */
     static public function getConfig()
     {
-        if(file_exists(__DIR__.'/config/local.php')){
+        if (file_exists(__DIR__.'/config/local.php')) {
             return include __DIR__.'/config/local.php';
         }
         return include __DIR__.'/config/production.php';

Indentation +21 added lines, -21 removed lines

@@ -12,26 +12,26 @@
  */
 class Bootstrap
 {
-    /**
-     * <p>Comando para levantar el autoloader</p>
-     */
-    static public function go()
-    {
-        // Make everything relative to the root
-        chdir(dirname(__DIR__));
-        // Setup autoloading
-        require_once( __DIR__ . '/vendor/autoload.php' );
-    }
-    /**
-     * Carga Archivo de Configuración
-     * en la seccion de Pruebas.
-     */
-    static public function getConfig()
-    {
-        if(file_exists(__DIR__.'/config/local.php')){
-            return include __DIR__.'/config/local.php';
-        }
-        return include __DIR__.'/config/production.php';
-    }
+	/**
+	 * <p>Comando para levantar el autoloader</p>
+	 */
+	static public function go()
+	{
+		// Make everything relative to the root
+		chdir(dirname(__DIR__));
+		// Setup autoloading
+		require_once( __DIR__ . '/vendor/autoload.php' );
+	}
+	/**
+	 * Carga Archivo de Configuración
+	 * en la seccion de Pruebas.
+	 */
+	static public function getConfig()
+	{
+		if(file_exists(__DIR__.'/config/local.php')){
+			return include __DIR__.'/config/local.php';
+		}
+		return include __DIR__.'/config/production.php';
+	}
 }
 Bootstrap::go();
\ No newline at end of file

src/CI_DB_result.php

Spacing +4 added lines, -4 removed lines

@@ -69,28 +69,28 @@
 	 *
 	 * @var	array[]
 	 */
-	public $result_array			= array();
+	public $result_array = array();
 
 	/**
 	 * Result Object
 	 *
 	 * @var	object[]
 	 */
-	public $result_object			= array();
+	public $result_object = array();
 
 	/**
 	 * Custom Result Object
 	 *
 	 * @var	object[]
 	 */
-	public $custom_result_object		= array();
+	public $custom_result_object = array();
 
 	/**
 	 * Current Row index
 	 *
 	 * @var	int
 	 */
-	public $current_row			= 0;
+	public $current_row = 0;
 
 	/**
 	 * Number of rows

Braces +14 added lines, -17 removed lines

@@ -132,12 +132,10 @@ 
 		if (is_int($this->num_rows))
 		{
 			return $this->num_rows;
-		}
-		elseif (count($this->result_array) > 0)
+		} elseif (count($this->result_array) > 0)
 		{
 			return $this->num_rows = count($this->result_array);
-		}
-		elseif (count($this->result_object) > 0)
+		} elseif (count($this->result_object) > 0)
 		{
 			return $this->num_rows = count($this->result_object);
 		}
@@ -158,12 +156,10 @@ 
 		if ($type === 'array')
 		{
 			return $this->result_array();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->result_object();
-		}
-		else
+		} else
 		{
 			return $this->custom_result_object($type);
 		}
@@ -182,8 +178,7 @@ 
 		if (isset($this->custom_result_object[$class_name]))
 		{
 			return $this->custom_result_object[$class_name];
-		}
-		elseif ( ! $this->result_id OR $this->num_rows === 0)
+		} elseif ( ! $this->result_id OR $this->num_rows === 0)
 		{
 			return array();
 		}
@@ -193,8 +188,7 @@ 
 		if (($c = count($this->result_array)) > 0)
 		{
 			$_data = 'result_array';
-		}
-		elseif (($c = count($this->result_object)) > 0)
+		} elseif (($c = count($this->result_object)) > 0)
 		{
 			$_data = 'result_object';
 		}
@@ -334,9 +328,13 @@ 
 			return $this->row_data[$n];
 		}
 
-		if ($type === 'object') return $this->row_object($n);
-		elseif ($type === 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+		if ($type === 'object') {
+			return $this->row_object($n);
+		} elseif ($type === 'array') {
+			return $this->row_array($n);
+		} else {
+			return $this->custom_row_object($n, $type);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -530,8 +528,7 @@ 
 		if ($type === 'array')
 		{
 			return $this->_fetch_assoc();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->_fetch_object();
 		}

src/CI_DB_forge.php

Spacing +15 added lines, -15 removed lines

@@ -58,28 +58,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $fields		= array();
+	public $fields = array();
 
 	/**
 	 * Keys data
 	 *
 	 * @var	array
 	 */
-	public $keys		= array();
+	public $keys = array();
 
 	/**
 	 * Primary Keys data
 	 *
 	 * @var	array
 	 */
-	public $primary_keys	= array();
+	public $primary_keys = array();
 
 	/**
 	 * Database character set
 	 *
 	 * @var	string
 	 */
-	public $db_char_set	= '';
+	public $db_char_set = '';
 
 	// --------------------------------------------------------------------
 
@@ -88,28 +88,28 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s';
+	protected $_create_database = 'CREATE DATABASE %s';
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= 'DROP DATABASE %s';
+	protected $_drop_database = 'DROP DATABASE %s';
 
 	/**
 	 * CREATE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table	= "%s %s (%s\n)";
+	protected $_create_table = "%s %s (%s\n)";
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= 'CREATE TABLE IF NOT EXISTS';
+	protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -119,42 +119,42 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= FALSE;
+	protected $_create_table_keys = FALSE;
 
 	/**
 	 * DROP TABLE IF EXISTS statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * RENAME TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= 'ALTER TABLE %s RENAME TO %s;';
+	protected $_rename_table = 'ALTER TABLE %s RENAME TO %s;';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= TRUE;
+	protected $_unsigned = TRUE;
 
 	/**
 	 * NULL value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_null		= '';
+	protected $_null = '';
 
 	/**
 	 * DEFAULT value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_default		= ' DEFAULT ';
+	protected $_default = ' DEFAULT ';
 
 	// --------------------------------------------------------------------
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function __construct(&$db)
 	{
-		$this->db =& $db;
+		$this->db = & $db;
 		log_message('info', 'Database Forge Class Initialized');
 	}
 

Braces +14 added lines, -28 removed lines

@@ -183,8 +183,7 @@ 
 		if ($this->_create_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_create_database, $this->db->escape_identifiers($db_name), $this->db->char_set, $this->db->dbcollat)))
+		} elseif ( ! $this->db->query(sprintf($this->_create_database, $this->db->escape_identifiers($db_name), $this->db->char_set, $this->db->dbcollat)))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -210,8 +209,7 @@ 
 		if ($this->_drop_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_drop_database, $this->db->escape_identifiers($db_name))))
+		} elseif ( ! $this->db->query(sprintf($this->_drop_database, $this->db->escape_identifiers($db_name))))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -258,8 +256,7 @@ 
 		if ($primary === TRUE)
 		{
 			$this->primary_keys[] = $key;
-		}
-		else
+		} else
 		{
 			$this->keys[] = $key;
 		}
@@ -289,8 +286,7 @@ 
 					)
 				));
 				$this->add_key('id', TRUE);
-			}
-			else
+			} else
 			{
 				if (strpos($field, ' ') === FALSE)
 				{
@@ -324,8 +320,7 @@ 
 		if ($table === '')
 		{
 			show_error('A table name is required for that operation.');
-		}
-		else
+		} else
 		{
 			$table = $this->db->dbprefix.$table;
 		}
@@ -381,8 +376,7 @@ 
 			if ($this->db->table_exists($table))
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				$if_not_exists = FALSE;
 			}
@@ -502,8 +496,7 @@ 
 				{
 					return TRUE;
 				}
-			}
-			else
+			} else
 			{
 				$sql = sprintf($this->_drop_table_if, $this->db->escape_identifiers($table));
 			}
@@ -527,8 +520,7 @@ 
 		{
 			show_error('A table name is required for that operation.');
 			return FALSE;
-		}
-		elseif ($this->_rename_table === FALSE)
+		} elseif ($this->_rename_table === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
 		}
@@ -740,8 +732,7 @@ 
 				if (isset($attributes['AFTER']))
 				{
 					$field['after'] = $attributes['AFTER'];
-				}
-				elseif (isset($attributes['FIRST']))
+				} elseif (isset($attributes['FIRST']))
 				{
 					$field['first'] = (bool) $attributes['FIRST'];
 				}
@@ -754,13 +745,11 @@ 
 				if ($attributes['NULL'] === TRUE)
 				{
 					$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-				}
-				else
+				} else
 				{
 					$field['null'] = ' NOT NULL';
 				}
-			}
-			elseif ($create_table === TRUE)
+			} elseif ($create_table === TRUE)
 			{
 				$field['null'] = ' NOT NULL';
 			}
@@ -864,8 +853,7 @@ 
 				{
 					$field['unsigned'] = ' UNSIGNED';
 					return;
-				}
-				elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
+				} elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
 				{
 					$field['type'] = $key;
 					return;
@@ -903,8 +891,7 @@ 
 				// Override the NULL attribute if that's our default
 				$attributes['NULL'] = TRUE;
 				$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-			}
-			else
+			} else
 			{
 				$field['default'] = $this->_default.$this->db->escape($attributes['DEFAULT']);
 			}
@@ -998,8 +985,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

src/Mysql/CI_DB_mysqli_result.php

Spacing +2 added lines, -2 removed lines

@@ -112,12 +112,12 @@
 		$field_data = $this->result_id->fetch_fields();
 		for ($i = 0, $c = count($field_data); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $field_data[$i]->name;
 			$retval[$i]->type		= static::_get_field_type($field_data[$i]->type);
 			$retval[$i]->max_length		= $field_data[$i]->max_length;
 			$retval[$i]->primary_key	= (int) ($field_data[$i]->flags & MYSQLI_PRI_KEY_FLAG);
-			$retval[$i]->default		= $field_data[$i]->def;
+			$retval[$i]->default = $field_data[$i]->def;
 		}
 
 		return $retval;

src/Mysql/CI_DB_mysqli_forge.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+	protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -65,14 +65,14 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'TINYINT',
 		'SMALLINT',
 		'MEDIUMINT',

Braces +3 added lines, -6 removed lines

@@ -152,14 +152,12 @@ 
 				$field[$i] = ($alter_type === 'ADD')
 						? "\n\tADD ".$field[$i]['_literal']
 						: "\n\tMODIFY ".$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				if ($alter_type === 'ADD')
 				{
 					$field[$i]['_literal'] = "\n\tADD ";
-				}
-				else
+				} else
 				{
 					$field[$i]['_literal'] = empty($field[$i]['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
 				}
@@ -225,8 +223,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

src/Mysql/CI_DB_mysqli_utility.php

Spacing +6 added lines, -6 removed lines

@@ -55,21 +55,21 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'SHOW DATABASES';
+	protected $_list_databases = 'SHOW DATABASES';
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= 'OPTIMIZE TABLE %s';
+	protected $_optimize_table = 'OPTIMIZE TABLE %s';
 
 	/**
 	 * REPAIR TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_repair_table	= 'REPAIR TABLE %s';
+	protected $_repair_table = 'REPAIR TABLE %s';
 
 	// --------------------------------------------------------------------
 
@@ -98,7 +98,7 @@ 
 			$output .= 'SET foreign_key_checks = 0;'.$newline;
 		}
 
-		foreach ( (array) $tables as $table)
+		foreach ((array) $tables as $table)
 		{
 			// Is the table in the "ignore" list?
 			if (in_array($table, (array) $ignore, TRUE))
@@ -169,7 +169,7 @@ 
 			}
 
 			// Trim off the end comma
-			$field_str = preg_replace('/, $/' , '', $field_str);
+			$field_str = preg_replace('/, $/', '', $field_str);
 
 			// Build the insert string
 			foreach ($query->result_array() as $row)
@@ -196,7 +196,7 @@ 
 				}
 
 				// Remove the comma at the end of the string
-				$val_str = preg_replace('/, $/' , '', $val_str);
+				$val_str = preg_replace('/, $/', '', $val_str);
 
 				// Build the INSERT string
 				$output .= 'INSERT INTO '.$this->db->protect_identifiers($table).' ('.$field_str.') VALUES ('.$val_str.');'.$newline;

Braces +1 added lines, -2 removed lines

@@ -183,8 +183,7 @@
 					if ($v === NULL)
 					{
 						$val_str .= 'NULL';
-					}
-					else
+					} else
 					{
 						// Escape the data if it's not an integer
 						$val_str .= ($is_int[$i] === FALSE) ? $this->db->escape($v) : $v;

src/Mysql/CI_DB_mysqli_driver.php

Spacing +10 added lines, -10 removed lines

@@ -166,9 +166,9 @@ 
 		if (is_array($this->encrypt))
 		{
 			$ssl = array();
-			empty($this->encrypt['ssl_key'])    OR $ssl['key']    = $this->encrypt['ssl_key'];
-			empty($this->encrypt['ssl_cert'])   OR $ssl['cert']   = $this->encrypt['ssl_cert'];
-			empty($this->encrypt['ssl_ca'])     OR $ssl['ca']     = $this->encrypt['ssl_ca'];
+			empty($this->encrypt['ssl_key']) OR $ssl['key']    = $this->encrypt['ssl_key'];
+			empty($this->encrypt['ssl_cert']) OR $ssl['cert']   = $this->encrypt['ssl_cert'];
+			empty($this->encrypt['ssl_ca']) OR $ssl['ca']     = $this->encrypt['ssl_ca'];
 			empty($this->encrypt['ssl_capath']) OR $ssl['capath'] = $this->encrypt['ssl_capath'];
 			empty($this->encrypt['ssl_cipher']) OR $ssl['cipher'] = $this->encrypt['ssl_cipher'];
 
@@ -194,9 +194,9 @@ 
 
 				$client_flags |= MYSQLI_CLIENT_SSL;
 				$this->_mysqli->ssl_set(
-					isset($ssl['key'])    ? $ssl['key']    : NULL,
-					isset($ssl['cert'])   ? $ssl['cert']   : NULL,
-					isset($ssl['ca'])     ? $ssl['ca']     : NULL,
+					isset($ssl['key']) ? $ssl['key'] : NULL,
+					isset($ssl['cert']) ? $ssl['cert'] : NULL,
+					isset($ssl['ca']) ? $ssl['ca'] : NULL,
 					isset($ssl['capath']) ? $ssl['capath'] : NULL,
 					isset($ssl['cipher']) ? $ssl['cipher'] : NULL
 				);
@@ -475,16 +475,16 @@ 
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
-			$retval[$i]->name		= $query[$i]->Field;
+			$retval[$i] = new stdClass();
+			$retval[$i]->name = $query[$i]->Field;
 
 			sscanf($query[$i]->Type, '%[a-z](%d)',
 				$retval[$i]->type,
 				$retval[$i]->max_length
 			);
 
-			$retval[$i]->default		= $query[$i]->Default;
-			$retval[$i]->primary_key	= (int) ($query[$i]->Key === 'PRI');
+			$retval[$i]->default = $query[$i]->Default;
+			$retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
 		}
 
 		return $retval;

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
 			$hostname = NULL;
 			$port = NULL;
 			$socket = $this->hostname;
-		}
-		else
+		} else
 		{
 			$hostname = ($persistent === TRUE)
 				? 'p:'.$this->hostname : $this->hostname;
@@ -146,8 +145,7 @@ 
 			if ($this->stricton)
 			{
 				$this->_mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
-			}
-			else
+			} else
 			{
 				$this->_mysqli->options(MYSQLI_INIT_COMMAND,
 					'SET SESSION sql_mode =

Indentation +101 added lines, -101 removed lines

@@ -54,67 +54,67 @@ 
  * @link		https://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysqli_driver extends CI_DB_driver {
-    /**
-     * Database driver
-     *
-     * @var string
-     */
-    public $dbdriver = 'mysqli';
-    /**
-     * Compression flag
-     *
-     * @var bool
-     */
-    public $compress = FALSE;
-    /**
-     * DELETE hack flag
-     *
-     * Whether to use the MySQL "delete hack" which allows the number
-     * of affected rows to be shown. Uses a preg_replace when enabled,
-     * adding a bit more processing to all queries.
-     *
-     * @var bool
-     */
-    public $delete_hack = TRUE;
-    /**
-     * Strict ON flag
-     *
-     * Whether we're running in strict SQL mode.
-     *
-     * @var bool
-     */
-    public $stricton;
-    /**
-     * Identifier escape character
-     *
-     * @var string
-     */
-    protected $_escape_char = '`';
-    /**
-     * MySQLi object
-     *
-     * Has to be preserved without being assigned to $conn_id.
-     *
-     * @var MySQLi
-     */
-    protected $_mysqli;
-    /**
-     * 
-     * @param array $params
-     */
-    public function __construct(array $params)
-    {
-        parent::__construct($params);
-    }
-
-    /**
-     * Database connection
-     *
-     * @param	bool	$persistent
-     * @return	object
-     **/
-    public function db_connect($persistent = FALSE)
-    {
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $dbdriver = 'mysqli';
+	/**
+	 * Compression flag
+	 *
+	 * @var bool
+	 */
+	public $compress = FALSE;
+	/**
+	 * DELETE hack flag
+	 *
+	 * Whether to use the MySQL "delete hack" which allows the number
+	 * of affected rows to be shown. Uses a preg_replace when enabled,
+	 * adding a bit more processing to all queries.
+	 *
+	 * @var bool
+	 */
+	public $delete_hack = TRUE;
+	/**
+	 * Strict ON flag
+	 *
+	 * Whether we're running in strict SQL mode.
+	 *
+	 * @var bool
+	 */
+	public $stricton;
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	protected $_escape_char = '`';
+	/**
+	 * MySQLi object
+	 *
+	 * Has to be preserved without being assigned to $conn_id.
+	 *
+	 * @var MySQLi
+	 */
+	protected $_mysqli;
+	/**
+	 * 
+	 * @param array $params
+	 */
+	public function __construct(array $params)
+	{
+		parent::__construct($params);
+	}
+
+	/**
+	 * Database connection
+	 *
+	 * @param	bool	$persistent
+	 * @return	object
+	 **/
+	public function db_connect($persistent = FALSE)
+	{
 		// Do we have a socket path?
 		if ($this->hostname[0] === '/')
 		{
@@ -215,22 +215,22 @@ 
 		}
 
 		return FALSE;
-    }
+	}
 
 	// --------------------------------------------------------------------
 
-    /**
-     * Reconnect
-     * Keep / reestablish the db connection if no queries have been
-     * sent for a length of time exceeding the server's idle timeout
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->conn_id !== FALSE && $this->conn_id->ping() === FALSE) {
-            $this->conn_id = FALSE;
-        }
-    }
+	/**
+	 * Reconnect
+	 * Keep / reestablish the db connection if no queries have been
+	 * sent for a length of time exceeding the server's idle timeout
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		if ($this->conn_id !== FALSE && $this->conn_id->ping() === FALSE) {
+			$this->conn_id = FALSE;
+		}
+	}
 	/**
 	 * Select the database
 	 *
@@ -299,33 +299,33 @@ 
 
 	// --------------------------------------------------------------------
 
-    /**
-     * Prep the query
-     *
-     * If needed, each database adapter can prep the query string
-     *
-     * @param   string $sql an SQL query
-     * @return  string
-     */
-    protected function _prep_query($sql)
-    {
-        // mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
-        // modifies the query so that it a proper number of affected rows is returned.
-        if ($this->delete_hack === TRUE && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) {
-                return trim($sql).' WHERE 1=1';
-        }
-        return $sql;
-    }
-    /**
-     * Begin Transaction
-     *
-     * @return bool
-     */
-    protected function _trans_begin()
-    {
-        $this->conn_id->autocommit(FALSE);
-        return  $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK
-    }
+	/**
+	 * Prep the query
+	 *
+	 * If needed, each database adapter can prep the query string
+	 *
+	 * @param   string $sql an SQL query
+	 * @return  string
+	 */
+	protected function _prep_query($sql)
+	{
+		// mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
+		// modifies the query so that it a proper number of affected rows is returned.
+		if ($this->delete_hack === TRUE && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) {
+				return trim($sql).' WHERE 1=1';
+		}
+		return $sql;
+	}
+	/**
+	 * Begin Transaction
+	 *
+	 * @return bool
+	 */
+	protected function _trans_begin()
+	{
+		$this->conn_id->autocommit(FALSE);
+		return  $this->simple_query('START TRANSACTION'); // can also be BEGIN or BEGIN WORK
+	}
 
 	// --------------------------------------------------------------------
 

src/CI_DB_driver.php

Spacing +48 added lines, -48 removed lines

@@ -96,7 +96,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbdriver		= 'mysqli';
+	public $dbdriver = 'mysqli';
 
 	/**
 	 * Sub-driver
@@ -111,63 +111,63 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbprefix		= '';
+	public $dbprefix = '';
 
 	/**
 	 * Character set
 	 *
 	 * @var	string
 	 */
-	public $char_set		= 'utf8';
+	public $char_set = 'utf8';
 
 	/**
 	 * Collation
 	 *
 	 * @var	string
 	 */
-	public $dbcollat		= 'utf8_general_ci';
+	public $dbcollat = 'utf8_general_ci';
 
 	/**
 	 * Encryption flag/data
 	 *
 	 * @var	mixed
 	 */
-	public $encrypt			= FALSE;
+	public $encrypt = FALSE;
 
 	/**
 	 * Swap Prefix
 	 *
 	 * @var	string
 	 */
-	public $swap_pre		= '';
+	public $swap_pre = '';
 
 	/**
 	 * Database port
 	 *
 	 * @var	int
 	 */
-	public $port			= '';
+	public $port = '';
 
 	/**
 	 * Persistent connection flag
 	 *
 	 * @var	bool
 	 */
-	public $pconnect		= FALSE;
+	public $pconnect = FALSE;
 
 	/**
 	 * Connection ID
 	 *
 	 * @var	object|resource
 	 */
-	public $conn_id			= FALSE;
+	public $conn_id = FALSE;
 
 	/**
 	 * Result ID
 	 *
 	 * @var	object|resource
 	 */
-	public $result_id		= FALSE;
+	public $result_id = FALSE;
 
 	/**
 	 * Debug flag
@@ -176,21 +176,21 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $db_debug		= FALSE;
+	public $db_debug = FALSE;
 
 	/**
 	 * Benchmark time
 	 *
 	 * @var	int
 	 */
-	public $benchmark		= 0;
+	public $benchmark = 0;
 
 	/**
 	 * Executed queries count
 	 *
 	 * @var	int
 	 */
-	public $query_count		= 0;
+	public $query_count = 0;
 
 	/**
 	 * Bind marker
@@ -199,7 +199,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $bind_marker		= '?';
+	public $bind_marker = '?';
 
 	/**
 	 * Save queries flag
@@ -208,7 +208,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $save_queries		= TRUE;
+	public $save_queries = TRUE;
 
 	/**
 	 * Queries list
@@ -216,7 +216,7 @@ 
 	 * @see	CI_DB_driver::$save_queries
 	 * @var	string[]
 	 */
-	public $queries			= array();
+	public $queries = array();
 
 	/**
 	 * Query times
@@ -225,7 +225,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $query_times		= array();
+	public $query_times = array();
 
 	/**
 	 * Data cache
@@ -234,28 +234,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $data_cache		= array();
+	public $data_cache = array();
 
 	/**
 	 * Transaction enabled flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_enabled		= TRUE;
+	public $trans_enabled = TRUE;
 
 	/**
 	 * Strict transaction mode flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_strict		= TRUE;
+	public $trans_strict = TRUE;
 
 	/**
 	 * Transaction depth level
 	 *
 	 * @var	int
 	 */
-	protected $_trans_depth		= 0;
+	protected $_trans_depth = 0;
 
 	/**
 	 * Transaction status flag
@@ -264,7 +264,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_status	= TRUE;
+	protected $_trans_status = TRUE;
 
 	/**
 	 * Transaction failure flag
@@ -273,28 +273,28 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_failure	= FALSE;
+	protected $_trans_failure = FALSE;
 
 	/**
 	 * Cache On flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_on		= FALSE;
+	public $cache_on = FALSE;
 
 	/**
 	 * Cache directory path
 	 *
 	 * @var	bool
 	 */
-	public $cachedir		= '';
+	public $cachedir = '';
 
 	/**
 	 * Cache auto-delete flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_autodel		= FALSE;
+	public $cache_autodel = FALSE;
 
 	/**
 	 * DB Cache object
@@ -309,7 +309,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_protect_identifiers		= TRUE;
+	protected $_protect_identifiers = TRUE;
 
 	/**
 	 * List of reserved identifiers
@@ -318,7 +318,7 @@ 
 	 *
 	 * @var	string[]
 	 */
-	protected $_reserved_identifiers	= array('*');
+	protected $_reserved_identifiers = array('*');
 
 	/**
 	 * Identifier escape character
@@ -721,8 +721,8 @@ 
 		}
 
 		// Load and instantiate the result driver
-		$driver		= $this->load_rdriver();
-		$RES		= new $driver($this);
+		$driver = $this->load_rdriver();
+		$RES = new $driver($this);
 
 		// Is query caching enabled? If so, we'll serialize the
 		// result object and save it to a cache file.
@@ -735,13 +735,13 @@ 
 			// result object, so we'll have to compile the data
 			// and save it)
 			$CR = new CI_DB_result($this);
-			$CR->result_object	= $RES->result_object();
-			$CR->result_array	= $RES->result_array();
-			$CR->num_rows		= $RES->num_rows();
+			$CR->result_object = $RES->result_object();
+			$CR->result_array = $RES->result_array();
+			$CR->num_rows = $RES->num_rows();
 
 			// Reset these since cached objects can not utilize resource IDs.
-			$CR->conn_id		= NULL;
-			$CR->result_id		= NULL;
+			$CR->conn_id = NULL;
+			$CR->result_id = NULL;
 
 			$this->CACHE->write($sql, $CR);
 		}
@@ -1557,17 +1557,17 @@ 
 				? '\s+'.preg_quote(trim(sprintf($this->_like_escape_str, $this->_like_escape_chr)), '/')
 				: '';
 			$_operators = array(
-				'\s*(?:<|>|!)?=\s*',             // =, <=, >=, !=
-				'\s*<>?\s*',                     // <, <>
-				'\s*>\s*',                       // >
-				'\s+IS NULL',                    // IS NULL
-				'\s+IS NOT NULL',                // IS NOT NULL
-				'\s+EXISTS\s*\(.*\)',        // EXISTS(sql)
-				'\s+NOT EXISTS\s*\(.*\)',    // NOT EXISTS(sql)
-				'\s+BETWEEN\s+',                 // BETWEEN value AND value
-				'\s+IN\s*\(.*\)',            // IN(list)
-				'\s+NOT IN\s*\(.*\)',        // NOT IN (list)
-				'\s+LIKE\s+\S.*('.$_les.')?',    // LIKE 'expr'[ ESCAPE '%s']
+				'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
+				'\s*<>?\s*', // <, <>
+				'\s*>\s*', // >
+				'\s+IS NULL', // IS NULL
+				'\s+IS NOT NULL', // IS NOT NULL
+				'\s+EXISTS\s*\(.*\)', // EXISTS(sql)
+				'\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql)
+				'\s+BETWEEN\s+', // BETWEEN value AND value
+				'\s+IN\s*\(.*\)', // IN(list)
+				'\s+NOT IN\s*\(.*\)', // NOT IN (list)
+				'\s+LIKE\s+\S.*('.$_les.')?', // LIKE 'expr'[ ESCAPE '%s']
 				'\s+NOT LIKE\s+\S.*('.$_les.')?' // NOT LIKE 'expr'[ ESCAPE '%s']
 			);
 
@@ -1735,7 +1735,7 @@ 
 	 */
 	public function display_error($error = '', $swap = '', $native = FALSE)
 	{
-		$LANG =& load_class('Lang', 'core');
+		$LANG = & load_class('Lang', 'core');
 		$LANG->load('db');
 
 		$heading = $LANG->line('db_error_heading');
@@ -1773,7 +1773,7 @@ 
 			}
 		}
 
-		$error =& load_class('Exceptions', 'core');
+		$error = & load_class('Exceptions', 'core');
 		echo $error->show_error($heading, $message, 'error_db');
 		exit(8); // EXIT_DATABASE
 	}

Indentation +4 added lines, -4 removed lines

@@ -431,7 +431,7 @@ 
 			// We still don't have a connection?
 			if ( ! $this->conn_id)
 			{
-                            error_log('error', 'Unable to connect to the database');
+							error_log('error', 'Unable to connect to the database');
 
 				if ($this->db_debug)
 				{
@@ -528,7 +528,7 @@ 
 	{
 		if (method_exists($this, '_db_set_charset') && ! $this->_db_set_charset($charset))
 		{
-                    error_log('error', 'Unable to set database connection charset: '.$charset);
+					error_log('error', 'Unable to set database connection charset: '.$charset);
 
 			if ($this->db_debug)
 			{
@@ -611,7 +611,7 @@ 
 	{
 		if ($sql === '')
 		{
-                    error_log('error', 'Invalid query: '.$sql);
+					error_log('error', 'Invalid query: '.$sql);
 			return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
 		}
 		elseif ( ! is_bool($return_object))
@@ -684,7 +684,7 @@ 
 					$this->trans_complete();
 					if ($trans_depth === $this->_trans_depth)
 					{
-                                            error_log('error', 'Database: Failure during an automated transaction commit/rollback!');
+											error_log('error', 'Database: Failure during an automated transaction commit/rollback!');
 						break;
 					}
 				}

Braces +17 added lines, -34 removed lines

@@ -613,8 +613,7 @@ 
 		{
                     error_log('error', 'Invalid query: '.$sql);
 			return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
-		}
-		elseif ( ! is_bool($return_object))
+		} elseif ( ! is_bool($return_object))
 		{
 			$return_object = ! $this->is_write_type($sql);
 		}
@@ -979,13 +978,11 @@ 
 		if (empty($this->bind_marker) OR strpos($sql, $this->bind_marker) === FALSE)
 		{
 			return $sql;
-		}
-		elseif ( ! is_array($binds))
+		} elseif ( ! is_array($binds))
 		{
 			$binds = array($binds);
 			$bind_count = 1;
-		}
-		else
+		} else
 		{
 			// Make sure we're using numeric keys
 			$binds = array_values($binds);
@@ -1009,8 +1006,7 @@ 
 			{
 				return $sql;
 			}
-		}
-		elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
+		} elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
 		{
 			return $sql;
 		}
@@ -1097,16 +1093,13 @@ 
 		{
 			$str = array_map(array(&$this, 'escape'), $str);
 			return $str;
-		}
-		elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
+		} elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
 		{
 			return "'".$this->escape_str($str)."'";
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			return ($str === FALSE) ? 0 : 1;
-		}
-		elseif ($str === NULL)
+		} elseif ($str === NULL)
 		{
 			return 'NULL';
 		}
@@ -1257,12 +1250,10 @@ 
 				if (isset($row['table_name']))
 				{
 					$key = 'table_name';
-				}
-				elseif (isset($row['TABLE_NAME']))
+				} elseif (isset($row['TABLE_NAME']))
 				{
 					$key = 'TABLE_NAME';
-				}
-				else
+				} else
 				{
 					/* We have no other choice but to just get the first element's key.
 					 * Due to array_shift() accepting its argument by reference, if
@@ -1325,12 +1316,10 @@ 
 				if (isset($row['column_name']))
 				{
 					$key = 'column_name';
-				}
-				elseif (isset($row['COLUMN_NAME']))
+				} elseif (isset($row['COLUMN_NAME']))
 				{
 					$key = 'COLUMN_NAME';
-				}
-				else
+				} else
 				{
 					// We have no other choice but to just get the first element's key.
 					$key = key($row);
@@ -1386,8 +1375,7 @@ 
 		if ($this->_escape_char === '' OR empty($item) OR in_array($item, $this->_reserved_identifiers))
 		{
 			return $item;
-		}
-		elseif (is_array($item))
+		} elseif (is_array($item))
 		{
 			foreach ($item as $key => $value)
 			{
@@ -1414,8 +1402,7 @@ 
 					$this->_escape_char[0],
 					$this->_escape_char[1]
 				);
-			}
-			else
+			} else
 			{
 				$preg_ec[0] = $preg_ec[1] = preg_quote($this->_escape_char, '/');
 				$preg_ec[2] = $preg_ec[3] = $this->_escape_char;
@@ -1683,8 +1670,7 @@ 
 		if ( ! class_exists('CI_DB_Cache', FALSE))
 		{
 			require_once(BASEPATH.'database/DB_cache.php');
-		}
-		elseif (is_object($this->CACHE))
+		} elseif (is_object($this->CACHE))
 		{
 			return TRUE;
 		}
@@ -1743,8 +1729,7 @@ 
 		if ($native === TRUE)
 		{
 			$message = (array) $error;
-		}
-		else
+		} else
 		{
 			$message = is_array($error) ? $error : array(str_replace('%s', $swap, $LANG->line($error)));
 		}
@@ -1847,15 +1832,13 @@ 
 				? substr($item, $offset, 4).$this->escape_identifiers(substr($item, $offset + 4))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		elseif ($offset = strrpos($item, ' '))
+		} elseif ($offset = strrpos($item, ' '))
 		{
 			$alias = ($protect_identifiers)
 				? ' '.$this->escape_identifiers(substr($item, $offset + 1))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		else
+		} else
 		{
 			$alias = '';
 		}

src/CI_DB_query_builder.php

Spacing +34 added lines, -34 removed lines

@@ -56,126 +56,126 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $return_delete_sql		= FALSE;
+	protected $return_delete_sql = FALSE;
 
 	/**
 	 * Reset DELETE data flag
 	 *
 	 * @var	bool
 	 */
-	protected $reset_delete_data		= FALSE;
+	protected $reset_delete_data = FALSE;
 
 	/**
 	 * QB SELECT data
 	 *
 	 * @var	array
 	 */
-	protected $qb_select			= array();
+	protected $qb_select = array();
 
 	/**
 	 * QB DISTINCT flag
 	 *
 	 * @var	bool
 	 */
-	protected $qb_distinct			= FALSE;
+	protected $qb_distinct = FALSE;
 
 	/**
 	 * QB FROM data
 	 *
 	 * @var	array
 	 */
-	protected $qb_from			= array();
+	protected $qb_from = array();
 
 	/**
 	 * QB JOIN data
 	 *
 	 * @var	array
 	 */
-	protected $qb_join			= array();
+	protected $qb_join = array();
 
 	/**
 	 * QB WHERE data
 	 *
 	 * @var	array
 	 */
-	protected $qb_where			= array();
+	protected $qb_where = array();
 
 	/**
 	 * QB GROUP BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_groupby			= array();
+	protected $qb_groupby = array();
 
 	/**
 	 * QB HAVING data
 	 *
 	 * @var	array
 	 */
-	protected $qb_having			= array();
+	protected $qb_having = array();
 
 	/**
 	 * QB keys
 	 *
 	 * @var	array
 	 */
-	protected $qb_keys			= array();
+	protected $qb_keys = array();
 
 	/**
 	 * QB LIMIT data
 	 *
 	 * @var	int
 	 */
-	protected $qb_limit			= FALSE;
+	protected $qb_limit = FALSE;
 
 	/**
 	 * QB OFFSET data
 	 *
 	 * @var	int
 	 */
-	protected $qb_offset			= FALSE;
+	protected $qb_offset = FALSE;
 
 	/**
 	 * QB ORDER BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_orderby			= array();
+	protected $qb_orderby = array();
 
 	/**
 	 * QB data sets
 	 *
 	 * @var	array
 	 */
-	protected $qb_set			= array();
+	protected $qb_set = array();
 
 	/**
 	 * QB data set for update_batch()
 	 *
 	 * @var	array
 	 */
-	protected $qb_set_ub			= array();
+	protected $qb_set_ub = array();
 
 	/**
 	 * QB aliased tables list
 	 *
 	 * @var	array
 	 */
-	protected $qb_aliased_tables		= array();
+	protected $qb_aliased_tables = array();
 
 	/**
 	 * QB WHERE group started flag
 	 *
 	 * @var	bool
 	 */
-	protected $qb_where_group_started	= FALSE;
+	protected $qb_where_group_started = FALSE;
 
 	/**
 	 * QB WHERE group count
 	 *
 	 * @var	int
 	 */
-	protected $qb_where_group_count		= 0;
+	protected $qb_where_group_count = 0;
 
 	// Query Builder Caching variables
 
@@ -184,91 +184,91 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $qb_caching				= FALSE;
+	protected $qb_caching = FALSE;
 
 	/**
 	 * QB Cache exists list
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_exists			= array();
+	protected $qb_cache_exists = array();
 
 	/**
 	 * QB Cache SELECT data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_select			= array();
+	protected $qb_cache_select = array();
 
 	/**
 	 * QB Cache FROM data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_from			= array();
+	protected $qb_cache_from = array();
 
 	/**
 	 * QB Cache JOIN data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_join			= array();
+	protected $qb_cache_join = array();
 
 	/**
 	 * QB Cache aliased tables list
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_aliased_tables			= array();
+	protected $qb_cache_aliased_tables = array();
 
 	/**
 	 * QB Cache WHERE data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_where			= array();
+	protected $qb_cache_where = array();
 
 	/**
 	 * QB Cache GROUP BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_groupby			= array();
+	protected $qb_cache_groupby = array();
 
 	/**
 	 * QB Cache HAVING data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_having			= array();
+	protected $qb_cache_having = array();
 
 	/**
 	 * QB Cache ORDER BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_orderby			= array();
+	protected $qb_cache_orderby = array();
 
 	/**
 	 * QB Cache data sets
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_set				= array();
+	protected $qb_cache_set = array();
 
 	/**
 	 * QB No Escape data
 	 *
 	 * @var	array
 	 */
-	protected $qb_no_escape 			= array();
+	protected $qb_no_escape = array();
 
 	/**
 	 * QB Cache No Escape data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_no_escape			= array();
+	protected $qb_cache_no_escape = array();
 
 	// --------------------------------------------------------------------
 
@@ -2666,9 +2666,9 @@ 
 
 		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
 		{
-			$qb_variable	= 'qb_'.$val;
-			$qb_cache_var	= 'qb_cache_'.$val;
-			$qb_new 	= $this->$qb_cache_var;
+			$qb_variable = 'qb_'.$val;
+			$qb_cache_var = 'qb_cache_'.$val;
+			$qb_new = $this->$qb_cache_var;
 
 			for ($i = 0, $c = count($this->$qb_variable); $i < $c; $i++)
 			{

Braces +30 added lines, -55 removed lines

@@ -488,8 +488,7 @@ 
 						$this->qb_cache_exists[] = 'from';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$val = trim($val);
 
@@ -532,8 +531,7 @@ 
 			if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER'), TRUE))
 			{
 				$type = '';
-			}
-			else
+			} else
 			{
 				$type .= ' ';
 			}
@@ -548,12 +546,10 @@ 
 		if ( ! $this->_has_operator($cond))
 		{
 			$cond = ' USING ('.($escape ? $this->escape_identifiers($cond) : $cond).')';
-		}
-		elseif ($escape === FALSE)
+		} elseif ($escape === FALSE)
 		{
 			$cond = ' ON '.$cond;
-		}
-		else
+		} else
 		{
 			// Split multiple conditions
 			if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE))
@@ -569,8 +565,7 @@ 
 					$pos = $joints[$i][1] - strlen($joints[$i][0]);
 					$joints[$i] = $joints[$i][0];
 				}
-			}
-			else
+			} else
 			{
 				$conditions = array($cond);
 				$joints = array('');
@@ -687,13 +682,11 @@ 
 				{
 					$k .= ' = ';
 				}
-			}
-			elseif ( ! $this->_has_operator($k))
+			} elseif ( ! $this->_has_operator($k))
 			{
 				// value appears not to have been set, assign the test to IS NULL
 				$k .= ' IS NULL';
-			}
-			elseif (preg_match('/\s*(!?=|<>|\sIS(?:\s+NOT)?\s)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
+			} elseif (preg_match('/\s*(!?=|<>|\sIS(?:\s+NOT)?\s)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
 			{
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
@@ -822,8 +815,7 @@ 
 			{
 				$where_in[] = $this->escape($value);
 			}
-		}
-		else
+		} else
 		{
 			$where_in = array_values($values);
 		}
@@ -965,16 +957,13 @@ 
 			if ($side === 'none')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}'";
-			}
-			elseif ($side === 'before')
+			} elseif ($side === 'before')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}'";
-			}
-			elseif ($side === 'after')
+			} elseif ($side === 'after')
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '{$v}%'";
-			}
-			else
+			} else
 			{
 				$like_statement = "{$prefix} {$k} {$not} LIKE '%{$v}%'";
 			}
@@ -1205,12 +1194,10 @@ 
 			$orderby = ctype_digit((string) $orderby)
 				? sprintf($this->_random_keyword[1], $orderby)
 				: $this->_random_keyword[0];
-		}
-		elseif (empty($orderby))
+		} elseif (empty($orderby))
 		{
 			return $this;
-		}
-		elseif ($direction !== '')
+		} elseif ($direction !== '')
 		{
 			$direction = in_array($direction, array('ASC', 'DESC'), TRUE) ? ' '.$direction : '';
 		}
@@ -1220,8 +1207,7 @@ 
 		if ($escape === FALSE)
 		{
 			$qb_orderby[] = array('field' => $orderby, 'direction' => $direction, 'escape' => FALSE);
-		}
-		else
+		} else
 		{
 			$qb_orderby = array();
 			foreach (explode(',', $orderby) as $field)
@@ -1414,8 +1400,7 @@ 
 		if ($reset === TRUE)
 		{
 			$this->_reset_select();
-		}
-		else
+		} else
 		{
 			$this->qb_orderby       = $qb_orderby;
 			$this->qb_cache_orderby = $qb_cache_orderby;
@@ -1485,8 +1470,7 @@ 
 			{
 				return ($this->db_debug) ? $this->display_error('db_must_use_set') : FALSE;
 			}
-		}
-		else
+		} else
 		{
 			if (empty($set))
 			{
@@ -1687,8 +1671,7 @@ 
 		if ($table !== '')
 		{
 			$this->qb_from[0] = $table;
-		}
-		elseif ( ! isset($this->qb_from[0]))
+		} elseif ( ! isset($this->qb_from[0]))
 		{
 			return ($this->db_debug) ? $this->display_error('db_must_set_table') : FALSE;
 		}
@@ -1865,8 +1848,7 @@ 
 		if ($table !== '')
 		{
 			$this->qb_from = array($this->protect_identifiers($table, TRUE, NULL, FALSE));
-		}
-		elseif ( ! isset($this->qb_from[0]))
+		} elseif ( ! isset($this->qb_from[0]))
 		{
 			return ($this->db_debug) ? $this->display_error('db_must_set_table') : FALSE;
 		}
@@ -1902,8 +1884,7 @@ 
 			{
 				return ($this->db_debug) ? $this->display_error('db_must_use_set') : FALSE;
 			}
-		}
-		else
+		} else
 		{
 			if (empty($set))
 			{
@@ -2049,8 +2030,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2082,8 +2062,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2156,8 +2135,7 @@ 
 			}
 
 			$table = $this->qb_from[0];
-		}
-		elseif (is_array($table))
+		} elseif (is_array($table))
 		{
 			empty($where) && $reset_data = FALSE;
 
@@ -2167,8 +2145,7 @@ 
 			}
 
 			return;
-		}
-		else
+		} else
 		{
 			$table = $this->protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -2318,16 +2295,14 @@ 
 		if ($select_override !== FALSE)
 		{
 			$sql = $select_override;
-		}
-		else
+		} else
 		{
 			$sql = ( ! $this->qb_distinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (count($this->qb_select) === 0)
 			{
 				$sql .= '*';
-			}
-			else
+			} else
 			{
 				// Cycle through the "select" portion of the query and prep each column name.
 				// The reason we protect identifiers here rather than in the select() function
@@ -2392,8 +2367,7 @@ 
 				if (is_string($this->{$qb_key}[$i]))
 				{
 					continue;
-				}
-				elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
+				} elseif ($this->{$qb_key}[$i]['escape'] === FALSE)
 				{
 					$this->{$qb_key}[$i] = $this->{$qb_key}[$i]['condition'];
 					continue;
@@ -2658,15 +2632,16 @@ 
 		if (count($this->qb_cache_exists) === 0)
 		{
 			return;
-		}
-		elseif (in_array('select', $this->qb_cache_exists, TRUE))
+		} elseif (in_array('select', $this->qb_cache_exists, TRUE))
 		{
 			$qb_no_escape = $this->qb_cache_no_escape;
 		}
 
-		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
+		foreach (array_unique($this->qb_cache_exists) as $val) {
+			// select, from, etc.
 		{
 			$qb_variable	= 'qb_'.$val;
+		}
 			$qb_cache_var	= 'qb_cache_'.$val;
 			$qb_new 	= $this->$qb_cache_var;