rrcfesc / codeignitercoredatabase

src/CI_DB_driver.php

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 = '';
 		}