diff options
| author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-08 13:39:53 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-05-08 13:39:53 +0300 |
| commit | de250fbae3d8bb5f68ef816f63abd9d04e792ff2 (patch) | |
| tree | 220a5be1c52ddbf138ee96e6032b6ab38ab5122d /js | |
| parent | efb51ae3f376f4ff8707158c2693d1e4cfb2d4a2 (diff) | |
Fix MariaDB 10.2 current_timestamp()
Fixes #13968 and fixes #13999. Closes #14177.
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'js')
| -rw-r--r-- | js/functions.js | 2 | ||||
| -rw-r--r-- | js/tbl_change.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/functions.js b/js/functions.js index 16b85178e2..698dfb2208 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3291,7 +3291,7 @@ function autoPopulate (input_id, offset) { } var col_default = central_column_list[db + '_' + table][offset].col_default.toUpperCase(); var $input4 = $('#' + input_id + '4'); - if (col_default !== '' && col_default !== 'NULL' && col_default !== 'CURRENT_TIMESTAMP') { + if (col_default !== '' && col_default !== 'NULL' && col_default !== 'CURRENT_TIMESTAMP' && col_default !== 'CURRENT_TIMESTAMP()') { $input4.val('USER_DEFINED'); $input4.next().next().show(); $input4.next().next().val(central_column_list[db + '_' + table][offset].col_default); diff --git a/js/tbl_change.js b/js/tbl_change.js index 0c794cbdb3..501ff3ba48 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -347,7 +347,7 @@ AJAX.registerOnload('tbl_change.js', function () { } else if (theType === 'datetime' || theType === 'timestamp') { var tmstmp = false; dt_value = dt_value.trim(); - if (dt_value === 'CURRENT_TIMESTAMP') { + if (dt_value === 'CURRENT_TIMESTAMP' || dt_value === 'current_timestamp()') { return true; } if (theType === 'timestamp') { |