Merge branch 'refs/heads/master' into develop

6f7780a0 · Taylor Otwell · 6535fca3 · 20f62b5a · 6f7780a0
Commit 6f7780a0 authored Mar 07, 2012 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sqlite.php laravel/database/schema/grammars/sqlite.php +1 -1

No files found.
--- a/laravel/database/schema/grammars/sqlite.php
+++ b/laravel/database/schema/grammars/sqlite.php
@@ -113,7 +113,7 @@ class SQLite extends Grammar {
 	 */
 	protected function nullable(Table $table, Fluent $column)
 	{
-		return ($column->nullable) ? ' NULL' : ' NOT NULL';
+		return ' NULL';
 	}

 	/**