ci-bonfire / Sprint

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

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
 			if (stripos($field['type'], 'int') !== FALSE)
 			{
 				$field['auto_increment'] = ' AUTO_INCREMENT';
-			}
-			elseif (strcasecmp($field['type'], 'UUID') === 0)
+			} elseif (strcasecmp($field['type'], 'UUID') === 0)
 			{
 				$field['auto_increment'] = ' AUTO_GENERATE';
 			}

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

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 			if ($field[$i]['_literal'] !== FALSE)
 			{
 				$sqls[] = $sql.' CHANGE '.$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				$alter_type = empty($field[$i]['new_name']) ? ' MODIFY ' : ' CHANGE ';
 				$sqls[] = $sql.$alter_type.$this->_process_column($field[$i]);
@@ -206,8 +205,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_dblib_driver.php

Braces +2 added lines, -4 removed lines

@@ -104,8 +104,7 @@ 
 			empty($this->database) OR $this->dsn .= ';dbname='.$this->database;
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
 			empty($this->appname) OR $this->dsn .= ';appname='.$this->appname;
-		}
-		else
+		} else
 		{
 			if ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 6) === FALSE)
 			{
@@ -282,8 +281,7 @@ 
 			if (count($this->qb_select) === 0)
 			{
 				$select = '*'; // Inevitable
-			}
-			else
+			} else
 			{
 				// Use only field names and their aliases, everything else is out of our scope.
 				$select = array();

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

Braces +3 added lines, -6 removed lines

@@ -89,16 +89,14 @@ 
 			if ( ! empty($this->database))
 			{
 				$this->dsn .= 'dbname='.$this->database;
-			}
-			elseif ( ! empty($this->hostname))
+			} elseif ( ! empty($this->hostname))
 			{
 				$this->dsn .= 'dbname='.$this->hostname;
 			}
 
 			empty($this->char_set) OR $this->dsn .= ';charset='.$this->char_set;
 			empty($this->role) OR $this->dsn .= ';role='.$this->role;
-		}
-		elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 9) === FALSE)
+		} elseif ( ! empty($this->char_set) && strpos($this->dsn, 'charset=', 9) === FALSE)
 		{
 			$this->dsn .= ';charset='.$this->char_set;
 		}
@@ -250,8 +248,7 @@ 
 		{
 			$select = 'FIRST '.$this->qb_limit
 				.($this->qb_offset > 0 ? ' SKIP '.$this->qb_offset : '');
-		}
-		else
+		} else
 		{
 			$select = 'ROWS '
 				.($this->qb_offset > 0 ? $this->qb_offset.' TO '.($this->qb_limit + $this->qb_offset) : $this->qb_limit);

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

Braces +4 added lines, -8 removed lines

@@ -92,8 +92,7 @@ 
 				if (isset($this->DSN))
 				{
 					$this->dsn .= 'DSN='.$this->DSN;
-				}
-				elseif ( ! empty($this->database))
+				} elseif ( ! empty($this->database))
 				{
 					$this->dsn .= 'DSN='.$this->database;
 				}
@@ -104,8 +103,7 @@ 
 			if (isset($this->host))
 			{
 				$this->dsn .= 'host='.$this->host;
-			}
-			else
+			} else
 			{
 				$this->dsn .= 'host='.(empty($this->hostname) ? '127.0.0.1' : $this->hostname);
 			}
@@ -113,8 +111,7 @@ 
 			if (isset($this->service))
 			{
 				$this->dsn .= '; service='.$this->service;
-			}
-			elseif ( ! empty($this->port))
+			} elseif ( ! empty($this->port))
 			{
 				$this->dsn .= '; service='.$this->port;
 			}
@@ -166,8 +163,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}

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

Braces +2 added lines, -4 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 (empty($this->options[PDO::MYSQL_ATTR_INIT_COMMAND]))
 			{
 				$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET SESSION sql_mode="STRICT_ALL_TABLES"';
-			}
-			else
+			} else
 			{
 				$this->options[PDO::MYSQL_ATTR_INIT_COMMAND] .= ', @@session.sql_mode = "STRICT_ALL_TABLES"';
 			}

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

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

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

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]);