ci-bonfire / Sprint

system/database/drivers/pdo/subdrivers/pdo_informix_forge.php

Spacing +3 added lines, -3 removed lines

@@ -51,14 +51,14 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= 'RENAME TABLE %s TO %s';
+	protected $_rename_table = 'RENAME TABLE %s TO %s';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'SMALLINT'	=> 'INTEGER',
 		'INT'		=> 'BIGINT',
 		'INTEGER'	=> 'BIGINT',
@@ -71,7 +71,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_default		= ', ';
+	protected $_default = ', ';
 
 	// --------------------------------------------------------------------
 

system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php

Spacing +7 added lines, -7 removed lines

@@ -154,9 +154,9 @@ 
 		if (is_array($this->encrypt) && is_php('5.3.7'))
 		{
 			$ssl = array();
-			empty($this->encrypt['ssl_key'])    OR $ssl[PDO::MYSQL_ATTR_SSL_KEY]    = $this->encrypt['ssl_key'];
-			empty($this->encrypt['ssl_cert'])   OR $ssl[PDO::MYSQL_ATTR_SSL_CERT]   = $this->encrypt['ssl_cert'];
-			empty($this->encrypt['ssl_ca'])     OR $ssl[PDO::MYSQL_ATTR_SSL_CA]     = $this->encrypt['ssl_ca'];
+			empty($this->encrypt['ssl_key']) OR $ssl[PDO::MYSQL_ATTR_SSL_KEY]    = $this->encrypt['ssl_key'];
+			empty($this->encrypt['ssl_cert']) OR $ssl[PDO::MYSQL_ATTR_SSL_CERT]   = $this->encrypt['ssl_cert'];
+			empty($this->encrypt['ssl_ca']) OR $ssl[PDO::MYSQL_ATTR_SSL_CA]     = $this->encrypt['ssl_ca'];
 			empty($this->encrypt['ssl_capath']) OR $ssl[PDO::MYSQL_ATTR_SSL_CAPATH] = $this->encrypt['ssl_capath'];
 			empty($this->encrypt['ssl_cipher']) OR $ssl[PDO::MYSQL_ATTR_SSL_CIPHER] = $this->encrypt['ssl_cipher'];
 
@@ -261,16 +261,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 +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
 			empty($this->port) OR $this->dsn .= ';port='.$this->port;
 			empty($this->database) OR $this->dsn .= ';dbname='.$this->database;
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
-		}
-		elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 6) === FALSE && is_php('5.3.6'))
+		} elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 6) === FALSE && is_php('5.3.6'))
 		{
 			$this->dsn .= ';charset='.$this->char_set;
 		}
@@ -138,8 +137,7 @@ 
 			if ($this->stricton)
 			{
 				$sql = 'CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")';
-			}
-			else
+			} else
 			{
 				$sql = 'REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
                                         @@sql_mode,
@@ -156,8 +154,7 @@ 
 				if (empty($this->options[PDO::MYSQL_ATTR_INIT_COMMAND]))
 				{
 					$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET SESSION sql_mode = '.$sql;
-				}
-				else
+				} else
 				{
 					$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] .= ', @@session.sql_mode = '.$sql;
 				}

system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php

Spacing +5 added lines, -5 removed lines

@@ -51,14 +51,14 @@ 
 	 *
 	 * @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 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
@@ -68,21 +68,21 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'TINYINT',
 		'SMALLINT',
 		'MEDIUMINT',

Braces +3 added lines, -6 removed lines

@@ -162,14 +162,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 ";
 				}
@@ -235,8 +233,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

system/database/drivers/pdo/subdrivers/pdo_oci_driver.php

Spacing +5 added lines, -5 removed lines

@@ -209,7 +209,7 @@ 
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $query[$i]->COLUMN_NAME;
 			$retval[$i]->type		= $query[$i]->DATA_TYPE;
 
@@ -219,14 +219,14 @@ 
 			{
 				$length = $query[$i]->DATA_LENGTH;
 			}
-			$retval[$i]->max_length		= $length;
+			$retval[$i]->max_length = $length;
 
 			$default = $query[$i]->DATA_DEFAULT;
 			if ($default === NULL && $query[$i]->NULLABLE === 'N')
 			{
 				$default = '';
 			}
-			$retval[$i]->default		= $query[$i]->COLUMN_DEFAULT;
+			$retval[$i]->default = $query[$i]->COLUMN_DEFAULT;
 		}
 
 		return $retval;
@@ -269,7 +269,7 @@ 
 	{
 		if ($this->qb_limit)
 		{
-			$this->where('rownum <= ',$this->qb_limit, FALSE);
+			$this->where('rownum <= ', $this->qb_limit, FALSE);
 			$this->qb_limit = FALSE;
 		}
 
@@ -289,7 +289,7 @@ 
 	protected function _limit($sql)
 	{
 		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM ('.$sql.') inner_query WHERE rownum < '.($this->qb_offset + $this->qb_limit + 1).')'
-			.($this->qb_offset ? ' WHERE rnum >= '.($this->qb_offset + 1): '');
+			.($this->qb_offset ? ' WHERE rnum >= '.($this->qb_offset + 1) : '');
 	}
 
 }

Braces +4 added lines, -8 removed lines

@@ -110,8 +110,7 @@ 
 			if (empty($this->hostname) && empty($this->port))
 			{
 				$this->dsn .= $this->database;
-			}
-			else
+			} else
 			{
 				$this->dsn .= '//'.(empty($this->hostname) ? '127.0.0.1' : $this->hostname)
 					.(empty($this->port) ? '' : ':'.$this->port).'/';
@@ -120,8 +119,7 @@ 
 			}
 
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
-		}
-		elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 4) === FALSE)
+		} elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 4) === FALSE)
 		{
 			$this->dsn .= ';charset='.$this->char_set;
 		}
@@ -165,8 +163,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -189,8 +186,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}

system/database/drivers/pdo/subdrivers/pdo_oci_forge.php

Spacing +4 added lines, -4 removed lines

@@ -51,28 +51,28 @@
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= FALSE;
+	protected $_create_database = FALSE;
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= FALSE;
+	protected $_drop_database = FALSE;
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= 'CREATE TABLE IF NOT EXISTS';
+	protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= FALSE;
+	protected $_unsigned = FALSE;
 
 	// --------------------------------------------------------------------
 

Braces +2 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
 		if ($alter_type === 'DROP')
 		{
 			return parent::_alter_table($alter_type, $table, $field);
-		}
-		elseif ($alter_type === 'CHANGE')
+		} elseif ($alter_type === 'CHANGE')
 		{
 			$alter_type = 'MODIFY';
 		}
@@ -102,8 +101,7 @@ 
 			if ($field[$i]['_literal'] !== FALSE)
 			{
 				$field[$i] = "\n\t".$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				$field[$i]['_literal'] = "\n\t".$this->_process_column($field[$i]);
 

system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php

Spacing +1 added lines, -1 removed lines

@@ -260,7 +260,7 @@
 	 */
 	protected function _limit($sql)
 	{
-		return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$this->qb_limit.' ', $sql);
+		return preg_replace('/(^\SELECT (DISTINCT)?)/i', '\\1 TOP '.$this->qb_limit.' ', $sql);
 	}
 
 }

Braces +4 added lines, -8 removed lines

@@ -115,8 +115,7 @@ 
 				if (isset($this->DSN))
 				{
 					$this->dsn .= 'DSN='.$this->DSN;
-				}
-				elseif ( ! empty($this->database))
+				} elseif ( ! empty($this->database))
 				{
 					$this->dsn .= 'DSN='.$this->database;
 				}
@@ -130,8 +129,7 @@ 
 			if (isset($this->DATABASE))
 			{
 				$this->dsn .= 'DATABASE='.$this->DATABASE.';';
-			}
-			elseif ( ! empty($this->database))
+			} elseif ( ! empty($this->database))
 			{
 				$this->dsn .= 'DATABASE='.$this->database.';';
 			}
@@ -139,8 +137,7 @@ 
 			if (isset($this->HOSTNAME))
 			{
 				$this->dsn .= 'HOSTNAME='.$this->HOSTNAME.';';
-			}
-			else
+			} else
 			{
 				$this->dsn .= 'HOSTNAME='.(empty($this->hostname) ? '127.0.0.1;' : $this->hostname.';');
 			}
@@ -148,8 +145,7 @@ 
 			if (isset($this->PORT))
 			{
 				$this->dsn .= 'PORT='.$this->port.';';
-			}
-			elseif ( ! empty($this->port))
+			} elseif ( ! empty($this->port))
 			{
 				$this->dsn .= ';PORT='.$this->port.';';
 			}

system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= FALSE;
+	protected $_unsigned = FALSE;
 
 	// --------------------------------------------------------------------
 

system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php

Spacing +3 added lines, -3 removed lines

@@ -276,11 +276,11 @@
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $query[$i]->column_name;
 			$retval[$i]->type		= $query[$i]->data_type;
-			$retval[$i]->max_length		= ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
-			$retval[$i]->default		= $query[$i]->column_default;
+			$retval[$i]->max_length = ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
+			$retval[$i]->default = $query[$i]->column_default;
 		}
 
 		return $retval;

Doc Comments +1 added lines, -1 removed lines

@@ -483,7 +483,7 @@
 	 * @param	string	$orderby
 	 * @param	string	$direction	ASC, DESC or RANDOM
 	 * @param	bool	$escape
-	 * @return	object
+	 * @return	CI_DB_query_builder
 	 */
 	public function order_by($orderby, $direction = '', $escape = NULL)
 	{

system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php

Spacing +2 added lines, -2 removed lines

@@ -51,14 +51,14 @@
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'INT2'		=> 'INTEGER',
 		'SMALLINT'	=> 'INTEGER',
 		'INT'		=> 'BIGINT',