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

Fix issue #1406 : diff issue with CURRENT_TIMESTAMP on maria 10.2 #1407

Merged
merged 1 commit into from
Aug 25, 2017
Merged

Fix issue #1406 : diff issue with CURRENT_TIMESTAMP on maria 10.2 #1407

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
Fix issue #1406 : diff issue with CURRENT_TIMESTAMP on maria 10.2 
In mariadb 10.2 `CURRENT_TIMESTAMP` is replaced by`current_timestamp()` in `SHOW COLUMNS FROM my_table`
  • Loading branch information
@wollanup
wollanup authored Aug 25, 2017
commit 08a2b14a4667c6e3eac42e65058eae63095d0bb2
3 changes: 2 additions & 1 deletion src/Propel/Generator/Reverse/MysqlSchemaParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ public function getColumnFromRow($row, Table $table)
$default = 'false';
}
}
if (in_array($default, ['CURRENT_TIMESTAMP'])) {
if (in_array($default, ['CURRENT_TIMESTAMP', 'current_timestamp()'])) {
$default = 'CURRENT_TIMESTAMP';
$type = ColumnDefaultValue::TYPE_EXPR;
} else {
$type = ColumnDefaultValue::TYPE_VALUE;
Expand Down