From e545c4e275734397e5bf5521b7b8289c595632ff Mon Sep 17 00:00:00 2001
From: Jayati Shrivastava <gaurijove@gmail.com>
Date: Mon, 13 Jan 2020 21:38:16 +0530
Subject: [PATCH] Fixes virtuality dropdown Fixes #15729

Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
---
 libraries/classes/Normalization.php                         | 1 +
 libraries/tbl_columns_definition_form.inc.php               | 1 +
 templates/columns_definitions/column_definitions_form.twig  | 1 +
 templates/columns_definitions/table_fields_definitions.twig | 3 +--
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php
index 71a4301ea2..dec02e281a 100644
--- a/libraries/classes/Normalization.php
+++ b/libraries/classes/Normalization.php
@@ -189,6 +189,7 @@ class Normalization
             'is_virtual_columns_supported' => Util::isVirtualColumnsSupported(),
             'browse_mime' => $GLOBALS['cfg']['BrowseMIME'],
             'server_type' => Util::getServerType(),
+            'server_version' => $this->dbi->getVersion(),
             'max_rows' => intval($GLOBALS['cfg']['MaxRows']),
             'char_editing' => $GLOBALS['cfg']['CharEditing'],
             'attribute_types' => $this->dbi->types->getAttributes(),
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 8c58c9409e..78d98ea3c5 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -531,6 +531,7 @@ $html = $template->render('columns_definitions/column_definitions_form', [
     'is_virtual_columns_supported' => Util::isVirtualColumnsSupported(),
     'browse_mime' => $GLOBALS['cfg']['BrowseMIME'] ?? null,
     'server_type' => Util::getServerType(),
+    'server_version' => $GLOBALS['dbi']->getVersion(),
     'max_rows' => intval($GLOBALS['cfg']['MaxRows']),
     'char_editing' => $GLOBALS['cfg']['CharEditing'] ?? null,
     'attribute_types' => $GLOBALS['dbi']->types->getAttributes(),
diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig
index d8c53b4d06..bfd6cbaa5e 100644
--- a/templates/columns_definitions/column_definitions_form.twig
+++ b/templates/columns_definitions/column_definitions_form.twig
@@ -54,6 +54,7 @@
             'content_cells': content_cells,
             'change_column': change_column,
             'is_virtual_columns_supported': is_virtual_columns_supported,
+            'server_version' : server_version,
             'browse_mime': browse_mime,
             'server_type': server_type,
             'max_rows': max_rows,
diff --git a/templates/columns_definitions/table_fields_definitions.twig b/templates/columns_definitions/table_fields_definitions.twig
index 4c20e7d5d2..b3ebdb06ea 100644
--- a/templates/columns_definitions/table_fields_definitions.twig
+++ b/templates/columns_definitions/table_fields_definitions.twig
@@ -95,9 +95,8 @@
         {% endif %}
     </tr>
     {% set options = {'': '', 'VIRTUAL': 'VIRTUAL'} %}
-    {% if server_type == 'MariaDB' %}
+    {% if server_type == 'MariaDB' and server_version <= 100200 %}
         {% set options = options|merge({'PERSISTENT': 'PERSISTENT'}) %}
-        {% set options = options|merge({'STORED': 'STORED'}) %}
     {% else %}
         {% set options = options|merge({'STORED': 'STORED'}) %}
     {% endif %}