Merge branch 'master' into develop

2012-03-22 21:26:32 -05:00
parent 0e4a63606f ca77cd5a17
commit 879e56df75
2 changed files with 25 additions and 2 deletions
--- a/laravel/database/schema.php
+++ b/laravel/database/schema.php
@@ -120,9 +120,16 @@ class Schema {
 		{
 			foreach (array('primary', 'unique', 'fulltext', 'index') as $key)
 			{
-				if (isset($column->attributes[$key]))
+				if (isset($column->$key))
 				{
-					$table->$key($column->name);
+					if ($column->$key === true)
+					{
+						$table->$key($column->name);
+					}
+					else
+					{
+						$table->$key($column->name, $column->$key);
+					}
 				}
 			}
 		}