From 306e8733e765404edb72663710a290ef0af177bb Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 19 Aug 2019 18:37:59 +0200 Subject: [PATCH] Support MariaDB virtual columns --- adminer/drivers/mysql.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index dea561fe..a3882036 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -555,7 +555,8 @@ if (!defined("DRIVER")) { "privileges" => array_flip(preg_split('~, *~', $row["Privileges"])), "comment" => $row["Comment"], "primary" => ($row["Key"] == "PRI"), - "generated" => preg_match('~ GENERATED$~', $row["Extra"]), + // https://mariadb.com/kb/en/library/show-columns/, https://dev.mysql.com/doc/refman/8.0/en/show-columns.html + "generated" => preg_match('~^(VIRTUAL|PERSISTENT)~', $row["Extra"]), ); } return $return;