From 352a5d79d5e429b8bd94e076155be452e2cac19f Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Thu, 15 Dec 2016 09:47:17 +0530 Subject: [PATCH 1/2] MySQL allows precision to be specified for DATETIME, TIME type fields too Fix #12814 Ref : http://dev.mysql.com/doc/refman/5.7/en/fractional-seconds.html Signed-off-by: Deven Bansod --- js/rte.js | 2 -- libraries/rte/rte_routines.lib.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/js/rte.js b/js/rte.js index 9a189aeae3..18b4f23a82 100644 --- a/js/rte.js +++ b/js/rte.js @@ -792,8 +792,6 @@ RTE.ROUTINE = { // Process for parameter length switch ($type.val()) { case 'DATE': - case 'DATETIME': - case 'TIME': case 'TINYBLOB': case 'TINYTEXT': case 'BLOB': diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 9194f281de..fba5b79c44 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1161,7 +1161,7 @@ function PMA_RTN_getQueryFromRequest() } if ($item_param_length[$i] != '' && !preg_match( - '@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|' + '@^(DATE|TINYBLOB|TINYTEXT|BLOB|TEXT|' . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|' . 'SERIAL|BOOLEAN)$@i', $item_param_type[$i] From 967755a1de0d56adf75acb764943b3ce9142b584 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Thu, 15 Dec 2016 09:49:58 +0530 Subject: [PATCH 2/2] ChangeLog for #12814 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 594852e6ac..5961d7c222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #12800 Fixed various issues with PHP 7.1 - issue #11816 Fixed operation with lower_case_table_names=2 - issue #12813 Fixed stored procedure execution +- issue #12814 DateTime won't allow to input length in Routine editor 4.6.5.2 (2016-12-05) - issue #12765 Fixed SQL export with newlines