MariaDB: Fix comparing CURRENT_TIMESTAMP definition while altering a table

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 30145489c9bbc8f4fb70924938e05323a5ae7d1f..49bef234aedeb5c3caf0ce0ce358b5ebc79fa3a0 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -221,6 +221,11 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
+       // MariaDB exports CURRENT_TIMESTAMP as a function.
+       if ($field["on_update"]) {
+               $field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
+       }
+
        return array(
                idf_escape(trim($field["field"])),
                process_type($type_field),
@@ -240,7 +245,7 @@ function default_value($field) {
        $default = $field["default"];
        return ($default === null ? "" : " DEFAULT " .
                (!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-               ? q($default) : $default)
+               ? q($default) : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $default))
        );
 }
 

diff --git a/changes.txt b/changes.txt
index 8a3224a1c32f455909bfc21a4e7950da22f356f5..7772ced2df91740b0cdb4b48665c87c3ee0e42e1 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,7 @@
-Adminer 4.9.2-dev:
+Adminer 4.9.3-dev:
+MariaDB: Support current_timestamp()
+
+Adminer 4.9.2:
 PostgreSQL: Fix search fields configuration (regression from 4.9.0)
 PostgreSQL: Fix exporting CREATE TABLE query with GENERATED default values
 PostgreSQL: Fix exporting CREATE TABLE with sequence default value