ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add default value for index names.

Browse Source
This commit is contained in:
Taylor Otwell
2012-02-15 16:17:47 -06:00
parent b73a60de2a
commit b29f8a88fe
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
laravel/database/schema/table.php
View File

@@ -79,7 +79,7 @@ class Table {
* @param string $name * @param string $name
* @return Fluent * @return Fluent
*/ */
public function unique($columns, $name) public function unique($columns, $name = null)
{ {
return $this->key(__FUNCTION__, $columns, $name); return $this->key(__FUNCTION__, $columns, $name);
} }
@@ -91,7 +91,7 @@ class Table {
* @param string $name * @param string $name
* @return Fluent * @return Fluent
*/ */
public function fulltext($columns, $name) public function fulltext($columns, $name = null)
{ {
return $this->key(__FUNCTION__, $columns, $name); return $this->key(__FUNCTION__, $columns, $name);
} }
@@ -103,7 +103,7 @@ class Table {
* @param string $name * @param string $name
* @return Fluent * @return Fluent
*/ */
public function index($columns, $name) public function index($columns, $name = null)
{ {
return $this->key(__FUNCTION__, $columns, $name); return $this->key(__FUNCTION__, $columns, $name);
} }
@@ -118,9 +118,17 @@ class Table {
*/ */
public function key($type, $columns, $name) public function key($type, $columns, $name)
{ {
$parameters = array('name' => $name, 'columns' => (array) $columns); $columns = (array) $columns;
return $this->command($type, $parameters); // If no index name was specified, we will concatenate the columns and
// append the index type to the name to generate a unique name for
// the index that can be used when dropping indexes.
if (is_null($name))
{
$name = implode('_', $columns).'_'.$type;
}
return $this->command($type, compact('name', 'columns'));
} }
/** /**