Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure default values in schema columns are always non-empty (especially booleans).

This commit is contained in:
Franz Liedke 2012-07-17 23:47:05 +02:00
parent 25b8bd889b
commit 61364c553d
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
laravel/database/schema/grammars/grammar.php
View File

@ -96,4 +96,19 @@ protected function type(Fluent $column)
return $this->{'type_'.$column->type}($column);
}
/**
* Format a value so that it can be used in SQL DEFAULT clauses.
* @param mixed $value
* @return string
*/
protected function default_value($value)
{
if (is_bool($value))
{
return intval($value);
}
return strval($value);
}
}

2
laravel/database/schema/grammars/mysql.php
View File

@ -128,7 +128,7 @@ protected function defaults(Table $table, Fluent $column)
{
if ( ! is_null($column->default))
{
return " DEFAULT '".$column->default."'";
return " DEFAULT '".$this->default_value($column->default)."'";
}
}

2
laravel/database/schema/grammars/postgres.php
View File

@ -101,7 +101,7 @@ protected function defaults(Table $table, Fluent $column)
{
if ( ! is_null($column->default))
{
return " DEFAULT '".$column->default."'";
return " DEFAULT '".$this->default_value($column->default)."'";
}
}

2
laravel/database/schema/grammars/sqlite.php
View File

@ -127,7 +127,7 @@ protected function defaults(Table $table, Fluent $column)
{
if ( ! is_null($column->default))
{
return ' DEFAULT '.$this->wrap($column->default);
return ' DEFAULT '.$this->wrap($this->default_value($column->default));
}
}

2
laravel/database/schema/grammars/sqlserver.php
View File

@ -108,7 +108,7 @@ protected function defaults(Table $table, Fluent $column)
{
if ( ! is_null($column->default))
{
return " DEFAULT '".$column->default."'";
return " DEFAULT '".$this->default_value($column->default)."'";
}
}