From 36fe47f8b9b23444229e7be7d0314cc0cee7a8aa Mon Sep 17 00:00:00 2001
From: Saksham Gupta <shucon01@gmail.com>
Date: Thu, 27 May 2021 19:42:27 +0530
Subject: [PATCH] Fixes #16892: current_timestamp() stringified on INSERT for
 date field

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add tests and fix condition

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix lint

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
---
 libraries/classes/InsertEdit.php |  7 ++++---
 test/classes/InsertEditTest.php  | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 161e41a051..d241723c7d 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1725,9 +1725,10 @@ class InsertEdit
                 $html_output .= '<input type="hidden" name="fields_type'
                     . $column_name_appendix . '" value="timestamp">';
             }
-            if (substr($column['pma_type'], 0, 8) === 'datetime') {
+            if (substr($column['pma_type'], 0, 4) === 'date') {
+                $type = substr($column['pma_type'], 0, 8) === 'datetime' ? 'datetime' : 'date';
                 $html_output .= '<input type="hidden" name="fields_type'
-                    . $column_name_appendix . '" value="datetime">';
+                    . $column_name_appendix . '" value="' . $type . '">';
             }
             if ($column['True_Type'] === 'bit') {
                 $html_output .= '<input type="hidden" name="fields_type'
@@ -2902,7 +2903,7 @@ class InsertEdit
                 $current_value = preg_replace('/[^01]/', '0', $current_value);
                 $current_value = "b'" . $this->dbi->escapeString($current_value)
                     . "'";
-            } elseif (! ($type === 'datetime' || $type === 'timestamp')
+            } elseif (! ($type === 'datetime' || $type === 'timestamp' || $type === 'date')
                 || ($current_value !== 'CURRENT_TIMESTAMP'
                     && $current_value !== 'current_timestamp()')
             ) {
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 193b8d89f9..0c977f8f01 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -2182,6 +2182,35 @@ class InsertEditTest extends AbstractTestCase
             '<input type="hidden" name="fields_typeb" value="datetime">',
             $result
         );
+
+        // case 4: (else -> date)
+        $column['pma_type'] = 'date';
+        $result = $this->callFunction(
+            $this->insertEdit,
+            InsertEdit::class,
+            'getValueColumnForOtherDatatypes',
+            [
+                $column,
+                'defchar',
+                'a',
+                'b',
+                'c',
+                22,
+                '&lt;',
+                12,
+                1,
+                '/',
+                '&lt;',
+                "foo\nbar",
+                $extracted_columnspec,
+                false,
+            ]
+        );
+
+        $this->assertStringContainsString(
+            '<input type="hidden" name="fields_typeb" value="date">',
+            $result
+        );
     }
 
     /**