Merge remote-tracking branch 'upstream/develop' into develop

2012-07-12 11:15:43 -04:00
parent 3b6191ec16 1503aed7ce
commit b325e954e3
25 changed files with 538 additions and 44 deletions
--- a/laravel/database/schema/grammars/mysql.php
+++ b/laravel/database/schema/grammars/mysql.php
@@ -99,7 +99,7 @@ class MySQL extends Grammar {
 	 */
 	protected function unsigned(Table $table, Fluent $column)
 	{
-		if ($column->type == 'integer' && $column->unsigned)
+		if ($column->type == 'integer' && ($column->unsigned || $column->increment))
 		{
 			return ' UNSIGNED';
 		}