Apply code style and fix issues

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Feb 20, 2022 · aa9c6d7 · aa9c6d7
1 parent cf96392
commit aa9c6d7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 41 deletions.
diff --git a/, b/,
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -822,15 +822,12 @@ private function getValueColumnForOtherDatatypes(
         // HTML5 data-* attribute data-type
         $dataType = $this->dbi->types->getTypeClass($column['True_Type']);
         $fieldsize = $this->getColumnSize($column, $extractedColumnspec['spec_in_brackets']);
-        $htmlOutput = '';
-        $html_input = '';
-        $text_area = '';
-        $default_generated = false;
 
-        $if_is_char = $column['is_char'] && ($GLOBALS['cfg']['CharEditing'] === 'textarea' || str_contains($data, "\n"));
-        if ($if_is_char) {
+        $isTextareaRequired = $column['is_char']
+            && ($GLOBALS['cfg']['CharEditing'] === 'textarea' || str_contains($data, "\n"));
+        if ($isTextareaRequired) {
             $GLOBALS['cfg']['CharEditing'] = $defaultCharEditing;
-            $text_area = $this->getTextarea(
+            $htmlField = $this->getTextarea(
                 $column,
                 $backupField,
                 $columnNameAppendix,
@@ -843,10 +840,8 @@ private function getValueColumnForOtherDatatypes(
                 $dataType,
                 $readOnly
             );
-        }
-
-        if (! $if_is_char) {
-            $html_input = $this->getHtmlInput(
+        } else {
+            $htmlField = $this->getHtmlInput(
                 $column,
                 $columnNameAppendix,
                 $specialChars,
@@ -858,18 +853,13 @@ private function getValueColumnForOtherDatatypes(
                 $dataType,
                 $readOnly
             );
-            $default_generated = preg_match('/(VIRTUAL|PERSISTENT|GENERATED)/', $column['Extra'])
-            && ! str_contains($column['Extra'], 'DEFAULT_GENERATED');
         }
 
         return $this->template->render('table/insert/value_column_for_other_datatype', [
-            'html' => $htmlOutput,
-            'html_input' => $html_input,
+            'html_field' => $htmlField,
             'backup_field' => $backupField,
-            'is_char' => $if_is_char,
-            'text_area' => $text_area,
+            'is_textarea' => $isTextareaRequired,
             'columnNameAppendix' => $columnNameAppendix,
-            'default_generated' => $default_generated,
             'column' => $column,
         ]);
     }

diff --git a/templates/table/insert/value_column_for_other_datatype.twig b/templates/table/insert/value_column_for_other_datatype.twig
@@ -1,27 +1,23 @@
 {{ backup_field|raw }}
-{% if is_char %}
-
-{{ text_area|raw -}}
+{% if is_textarea %}
+  {{- html_field|raw -}}
 {% else %}
-  {{ html_input|raw }}
-  {% if default_generated %}
+  {{- html_field|raw -}}
+  {%- if column.Extra matches '/(VIRTUAL|PERSISTENT|GENERATED)/' and 'DEFAULT_GENERATED' not in column.Extra -%}
     <input type="hidden" name="virtual{{ columnNameAppendix }}" value="1">
-  {% endif %} 
-  {% if column.Extra == 'auto_increment' %}
+  {%- endif -%}
+  {%- if column.Extra == 'auto_increment' -%}
     <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="1">
-  {% endif %}
-  {% if column.pma_type|slice(0, 9) == 'timestamp' %}
-    <input type="hidden" name="fields_type-{{ columnNameAppendix }}" value="timestamp">
-  {% endif %}
-  {% if column.pma_type|slice(0, 4) == 'date' %}
-    {% if column.pma_type|slice(0, 8) == 'datetime' %}
-      <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="datetime">
-    {% else %}
-      <input type="hidden" name="auto_increment{{ columnNameAppendix }}" value="date">
-    {% endif %}
-  {% endif %}
-  {% if column.True_Type == 'bit' %}
+  {%- endif -%}
+  {%- if column.pma_type starts with 'timestamp' -%}
+    <input type="hidden" name="fields_type{{ columnNameAppendix }}" value="timestamp">
+  {%- endif -%}
+  {%- if column.pma_type starts with 'datetime' -%}
+    <input type="hidden" name="fields_type{{ columnNameAppendix }}" value="datetime">
+  {%- elseif column.pma_type starts with 'date' -%}
+    <input type="hidden" name="fields_type{{ columnNameAppendix }}" value="date">
+  {%- endif -%}
+  {%- if column.True_Type == 'bit' -%}
     <input type="hidden" name="fields_type{{ columnNameAppendix }}" value="bit">
-  {% endif %}
-  {{- html|raw -}}
+  {%- endif -%}
 {% endif %}
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -1101,7 +1101,7 @@ public function testGetValueColumnForOtherDatatypes(): void
         );
 
         $this->assertEquals(
-            "a\n\na\n"
+            "a\na\n"
             . '<textarea name="fieldsb" class="char charField" '
             . 'data-maxlength="25" rows="7" cols="1" dir="/" '
             . 'id="field_1_3" c tabindex="34" data-type="CHAR">'