From 5f39f3d544ab4c7073fbc931b7139f51a1729eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 15 Feb 2024 15:37:24 +0100 Subject: [PATCH 1/5] Fix changing column with `on update CURRENT_TIMESTAMP` active MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The value was not selected by default when it is already configured on the column Signed-off-by: Maximilian Krög --- templates/columns_definitions/column_attribute.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/columns_definitions/column_attribute.twig b/templates/columns_definitions/column_attribute.twig index 12dd0d5358..1081530ff9 100644 --- a/templates/columns_definitions/column_attribute.twig +++ b/templates/columns_definitions/column_attribute.twig @@ -2,7 +2,7 @@ {% set attribute = submit_attribute %} {# MariaDB has additional parentheses #} {% elseif column_meta['Extra'] is defined - and ('on update current_timestamp' in column_meta['Extra'] or 'on update current_timestamp()' in column_meta['Extra']|lower) %} + and ('on update current_timestamp' in column_meta['Extra']|lower or 'on update current_timestamp()' in column_meta['Extra']|lower) %} {% set attribute = 'on update CURRENT_TIMESTAMP' %} {% elseif extracted_columnspec['attribute'] is defined %} {% set attribute = extracted_columnspec['attribute'] %} From a757058f5a45a6acaea6ad25358272f13847b563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Thu, 25 Apr 2024 22:52:54 +0200 Subject: [PATCH 2/5] Fix invisible codemirror tooltip in modal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- themes/bootstrap/scss/_codemirror.scss | 2 +- themes/metro/scss/_codemirror.scss | 10 ++++++++++ themes/pmahomme/scss/_codemirror.scss | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/themes/bootstrap/scss/_codemirror.scss b/themes/bootstrap/scss/_codemirror.scss index b5a25f3352..6d5151dd11 100644 --- a/themes/bootstrap/scss/_codemirror.scss +++ b/themes/bootstrap/scss/_codemirror.scss @@ -96,7 +96,7 @@ span { } .CodeMirror-lint-tooltip { - z-index: 200; + z-index: 2000; font-family: inherit; code { diff --git a/themes/metro/scss/_codemirror.scss b/themes/metro/scss/_codemirror.scss index b2f6af9c1b..5827d80c97 100644 --- a/themes/metro/scss/_codemirror.scss +++ b/themes/metro/scss/_codemirror.scss @@ -103,3 +103,13 @@ span { .CodeMirror-hints { z-index: 1999; } + +.CodeMirror-lint-tooltip { + z-index: 2000; + font-family: inherit; + + code { + font-family: monospace; + font-weight: bold; + } +} diff --git a/themes/pmahomme/scss/_codemirror.scss b/themes/pmahomme/scss/_codemirror.scss index 0caa7da603..33c429590d 100644 --- a/themes/pmahomme/scss/_codemirror.scss +++ b/themes/pmahomme/scss/_codemirror.scss @@ -93,7 +93,7 @@ span { } .CodeMirror-lint-tooltip { - z-index: 200; + z-index: 2000; font-family: inherit; code { From ad7596b53fe9f61939afd2ce608530ff42077734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Fri, 26 Apr 2024 21:46:52 +0200 Subject: [PATCH 3/5] Fix inserting value with UNIX_TIMESTAMP() without param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- libraries/classes/InsertEdit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index e88946a6a1..324453030c 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -1614,7 +1614,7 @@ class InsertEdit if ( ! in_array($multiEditFuncs[$key], $funcNoParam) - || ($currentValue != "''" + || ($currentValue !== '' && in_array($multiEditFuncs[$key], $funcOptionalParam)) ) { if ( From a2ae0e76190bdebb63b6250fed9a501deb439c2c Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 28 Apr 2024 14:07:02 +0200 Subject: [PATCH 4/5] Add a ChangeLog entry for #18276 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 83e51ffda3..b27a9ec4d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ phpMyAdmin - ChangeLog - issue #17920 Fixed moving column with empty default value will replace it with '' - issue #18006 Fixed moving columns causes the default uuid() value to get quotes around it - issue #18962 Fixed move columns with ENUM() & DEFAULT causes invalid SQL +- issue #18276 Fix on update CURRENT_TIMESTAMP doesn't show as default in attributes 5.2.1 (2023-02-07) - issue #17522 Fix case where the routes cache file is invalid From fe8a1f90d72b9af883271dba688668cf155cdaf2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 28 Apr 2024 14:30:50 +0200 Subject: [PATCH 5/5] Add ChangeLog entries for #18240 and #19125 Signed-off-by: William Desportes --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index b27a9ec4d9..c4fac74fee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,8 @@ phpMyAdmin - ChangeLog - issue #18006 Fixed moving columns causes the default uuid() value to get quotes around it - issue #18962 Fixed move columns with ENUM() & DEFAULT causes invalid SQL - issue #18276 Fix on update CURRENT_TIMESTAMP doesn't show as default in attributes +- issue #18240 Fix inserting value with UNIX_TIMESTAMP() without a parameter +- issue #19125 Fixed CodeMirror tooltip is below modals 5.2.1 (2023-02-07) - issue #17522 Fix case where the routes cache file is invalid