Skip to content

Commit

Permalink
Fix issue #1406 : diff issue with CURRENT_TIMESTAMP on maria 10.2 (#1407
Browse files Browse the repository at this point in the history
)

In mariadb 10.2 `CURRENT_TIMESTAMP` is replaced by`current_timestamp()` in `SHOW COLUMNS FROM my_table`
  • Loading branch information
wollanup authored and marcj committed Aug 25, 2017
1 parent 9c3458a commit d24a474
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Propel/Generator/Reverse/MysqlSchemaParser.php
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

0 comments on commit d24a474

Please sign in to comment.