Skip to content

Commit

Permalink
index names may be specified on fluent setup.
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jan 24, 2012
1 parent 4806bcc commit 67696d8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions laravel/bundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ public static function start($bundle)
throw new \Exception("Bundle [$bundle] has not been installed.");
}

static::$started[] = strtolower($bundle);

// Each bundle may have a "start" script which is responsible for preparing
// the bundle for use by the application. The start script may register any
// classes the bundle uses with the auto-loader, or perhaps will start any
Expand All @@ -55,6 +53,8 @@ public static function start($bundle)
// registering the bundle's routes. This is kept separate from the
// start script for reverse routing efficiency purposes.
static::routes($bundle);

static::$started[] = strtolower($bundle);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions laravel/database/schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public static function table($table, $callback)
*/
public static function execute($table)
{
die('here');
foreach ($table->commands as $command)
{
$connection = DB::connection($table->connection);
Expand Down Expand Up @@ -82,9 +83,9 @@ protected static function implications($table)
{
foreach (array('primary', 'unique', 'fulltext', 'index') as $key)
{
if ($column->$key === true)
if (isset($column->attributes[$key]))
{
$table->$key($column->name);
$table->$key($column->name, $column->$key);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion laravel/fluent.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Fluent {
*
* @var array
*/
protected $attributes = array();
public $attributes = array();

/**
* Create a new fluent container instance.
Expand Down

0 comments on commit 67696d8

Please sign in to comment.