Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.x] Default uuid column name #36005

Merged
merged 1 commit into from
Jan 25, 2021
Merged

[9.x] Default uuid column name #36005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Schema/Blueprint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ public function binary($column)
* @param string $column
* @return \Illuminate\Database\Schema\ColumnDefinition
*/
public function uuid($column)
public function uuid($column = 'uuid')
{
return $this->addColumn('uuid', $column);
}
Expand Down
10 changes: 10 additions & 0 deletions tests/Database/DatabaseMySqlSchemaGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,16 @@ public function testAddingUuid()
$this->assertSame('alter table `users` add `foo` char(36) not null', $statements[0]);
}

public function testAddingUuidDefaultsColumnName()
{
$blueprint = new Blueprint('users');
$blueprint->uuid();
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());

$this->assertCount(1, $statements);
$this->assertSame('alter table `users` add `uuid` char(36) not null', $statements[0]);
}

public function testAddingForeignUuid()
{
$blueprint = new Blueprint('users');
Expand Down
10 changes: 10 additions & 0 deletions tests/Database/DatabasePostgresSchemaGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,16 @@ public function testAddingUuid()
$this->assertSame('alter table "users" add column "foo" uuid not null', $statements[0]);
}

public function testAddingUuidDefaultsColumnName()
{
$blueprint = new Blueprint('users');
$blueprint->uuid();
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());

$this->assertCount(1, $statements);
$this->assertSame('alter table "users" add column "uuid" uuid not null', $statements[0]);
}

public function testAddingForeignUuid()
{
$blueprint = new Blueprint('users');
Expand Down
10 changes: 10 additions & 0 deletions tests/Database/DatabaseSQLiteSchemaGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,16 @@ public function testAddingUuid()
$this->assertSame('alter table "users" add column "foo" varchar not null', $statements[0]);
}

public function testAddingUuidDefaultsColumnName()
{
$blueprint = new Blueprint('users');
$blueprint->uuid();
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());

$this->assertCount(1, $statements);
$this->assertSame('alter table "users" add column "uuid" varchar not null', $statements[0]);
}

public function testAddingForeignUuid()
{
$blueprint = new Blueprint('users');
Expand Down
10 changes: 10 additions & 0 deletions tests/Database/DatabaseSqlServerSchemaGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,16 @@ public function testAddingUuid()
$this->assertSame('alter table "users" add "foo" uniqueidentifier not null', $statements[0]);
}

public function testAddingUuidDefaultsColumnName()
{
$blueprint = new Blueprint('users');
$blueprint->uuid();
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());

$this->assertCount(1, $statements);
$this->assertSame('alter table "users" add "uuid" uniqueidentifier not null', $statements[0]);
}

public function testAddingForeignUuid()
{
$blueprint = new Blueprint('users');
Expand Down