Skip to content

Commit

Permalink
Clean up some whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
cbandy committed Dec 14, 2010
1 parent c0d0f50 commit 1655218
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 3 additions & 3 deletions classes/kohana/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ public function count_last_query()
$result = $this->query
(
Database::SELECT,
'SELECT COUNT(*) AS '.$this->quote_identifier('total_rows').' '.
'FROM ('.$sql.') AS '.$this->quote_table('counted_results'),
'SELECT COUNT(*) AS '.$this->quote_identifier('total_rows').' '
.'FROM ('.$sql.') AS '.$this->quote_table('counted_results'),
TRUE
);

Expand Down Expand Up @@ -487,7 +487,7 @@ public function quote($value)
else
{
// Convert the object to a string
return $this->quote((string) $value);
return $this->quote( (string) $value);
}
}
elseif (is_array($value))
Expand Down
4 changes: 1 addition & 3 deletions classes/kohana/database/mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ public function list_columns($table, $like = NULL, $add_prefix = TRUE)
case 'varbinary':
$column['character_maximum_length'] = $length;
break;

case 'char':
case 'varchar':
$column['character_maximum_length'] = $length;
Expand All @@ -390,7 +389,6 @@ public function list_columns($table, $like = NULL, $add_prefix = TRUE)
case 'longtext':
$column['collation_name'] = $row['Collation'];
break;

case 'enum':
case 'set':
$column['collation_name'] = $row['Collation'];
Expand All @@ -417,7 +415,7 @@ public function escape($value)
// Make sure the database is connected
$this->_connection or $this->connect();

if (($value = mysql_real_escape_string((string) $value, $this->_connection)) === FALSE)
if (($value = mysql_real_escape_string( (string) $value, $this->_connection)) === FALSE)
{
throw new Database_Exception(':error',
array(':error' => mysql_errno($this->_connection)),
Expand Down

0 comments on commit 1655218

Please sign in to comment.