mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-11 17:14:07 +02:00
Code Issues Releases Wiki Activity

MariaDB: Fix comparing CURRENT_TIMESTAMP definition while altering a table

Browse Source
This commit is contained in:
Peter Knut
2024-09-21 22:20:08 +02:00
committed by Jakub Vrana
parent 8ea4892523
commit 99cd514a29
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adminer/include/editing.inc.php
View File

@@ -221,6 +221,11 @@ function process_type($field, $collate = "COLLATE") {
* @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT") * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
*/ */
function process_field($field, $type_field) { 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( return array(
idf_escape(trim($field["field"])), idf_escape(trim($field["field"])),
process_type($type_field), process_type($type_field),
@@ -240,7 +245,7 @@ function default_value($field) {
$default = $field["default"]; $default = $field["default"];
return ($default === null ? "" : " 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)) (!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))
); );
} }

5
changes.txt
View File

@@ -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 search fields configuration (regression from 4.9.0)
PostgreSQL: Fix exporting CREATE TABLE query with GENERATED default values PostgreSQL: Fix exporting CREATE TABLE query with GENERATED default values
PostgreSQL: Fix exporting CREATE TABLE with sequence default value PostgreSQL: Fix exporting CREATE TABLE with sequence default value