Fixes adding attribute while updating virtual col

Fixes phpmyadmin#13105 Signed-off-by: Raghuram Vadapalli<[email protected]>
linaspasv · Mar 20, 2017 · c1b9c83 · c1b9c83
1 parent 548b6b4
commit c1b9c83
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/libraries/Table.php b/libraries/Table.php
@@ -371,21 +371,21 @@ static function generateFieldSpec($name, $type, $length = '',
             // so we can't just convert it to integer
             $query .= '(' . $length . ')';
         }
+        if ($attribute != '') {
+            $query .= ' ' . $attribute;
+
+            if ($is_timestamp
+                && preg_match('/TIMESTAMP/i', $attribute)
+                && strlen($length) !== 0
+                && $length !== 0
+            ) {
+                $query .= '(' . $length . ')';
+            }
+        }
 
         if ($virtuality) {
             $query .= ' AS (' . $expression . ') ' . $virtuality;
         } else {
-            if ($attribute != '') {
-                $query .= ' ' . $attribute;
-
-                if ($is_timestamp
-                    && preg_match('/TIMESTAMP/i', $attribute)
-                    && strlen($length) !== 0
-                    && $length !== 0
-                ) {
-                    $query .= '(' . $length . ')';
-                }
-            }
 
             $matches = preg_match(
                 '@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR|ENUM|SET)$@i',