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

Jump to bottom

[7.x] Fix CURRENT_TIMESTAMP precision bug #32298

Merged
merged 3 commits into from
Apr 9, 2020
Merged

[7.x] Fix CURRENT_TIMESTAMP precision bug #32298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56e1fba
Match CURRENT_TIMESTAMP precision to column precision
jgusta Apr 8, 2020
264adfd
Add test for default current timestamp with precision
jgusta Apr 8, 2020
91e738f
Fix bad assert syntax
jgusta Apr 8, 2020
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
4 changes: 3 additions & 1 deletion src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,9 @@ protected function typeTimestamp(Fluent $column)
{
$columnType = $column->precision ? "timestamp($column->precision)" : 'timestamp';

return $column->useCurrent ? "$columnType default CURRENT_TIMESTAMP" : $columnType;
$defaultCurrent = $column->precision ? "CURRENT_TIMESTAMP($column->precision)" : 'CURRENT_TIMESTAMP';

return $column->useCurrent ? "$columnType default $defaultCurrent" : $columnType;
}

/**
Expand Down
9 changes: 9 additions & 0 deletions tests/Database/DatabaseMySqlSchemaGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,15 @@ public function testAddingTimestampWithDefault()
$this->assertSame("alter table `users` add `created_at` timestamp not null default '2015-07-22 11:43:17'", $statements[0]);
}

public function testAddingTimestampWithDefaultCurrentSpecifyingPrecision()
{
$blueprint = new Blueprint('users');
$blueprint->timestamp('created_at', 1)->useCurrent();
$statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
$this->assertCount(1, $statements);
$this->assertSame('alter table `users` add `created_at` timestamp(1) default CURRENT_TIMESTAMP(1) not null', $statements[0]);
}

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