gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #15784 - Fix #15729 Improve virtuality dropdown for MariaDB

Browse Source 
Pull-request: #15784
Fixes: #15729
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-15 20:10:45 +01:00
commit e094e699d7
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/classes/Normalization.php
View File

@ -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(),

1
libraries/tbl_columns_definition_form.inc.php
View File

@ -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(),

1
templates/columns_definitions/column_definitions_form.twig
View File

@ -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,

3
templates/columns_definitions/table_fields_definitions.twig
View File

@ -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 %}