]> git.joonet.de Git - adminer.git/commitdiff
Support MariaDB virtual columns
authorJakub Vrana <jakub@vrana.cz>
Mon, 19 Aug 2019 16:37:59 +0000 (18:37 +0200)
committerJakub Vrana <jakub@vrana.cz>
Mon, 19 Aug 2019 16:38:57 +0000 (18:38 +0200)
adminer/drivers/mysql.inc.php

index dea561fe5400513b988076334d302cd3392869d8..a388203677d94393f56dcdafddf94aca36189906 100644 (file)
@@ -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;