Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2012-03-22 21:26:32 -05:00
commit 879e56df75
2 changed files with 25 additions and 2 deletions

View File

@ -120,9 +120,16 @@ protected static function implications($table)
{ {
foreach (array('primary', 'unique', 'fulltext', 'index') as $key) 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);
}
} }
} }
} }

View File

@ -77,4 +77,20 @@ public function __set($key, $value)
$this->attributes[$key] = $value; $this->attributes[$key] = $value;
} }
/**
* Dynamically check if an attribute is set.
*/
public function __isset($key)
{
return isset($this->attributes[$key]);
}
/**
* Dynamically unset an attribute.
*/
public function __unset($key)
{
return unset($this->attributes[$key]);
}
} }