From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 19 Aug 2019 16:37:59 +0000 (+0200)
Subject: Support MariaDB virtual columns
X-Git-Tag: v4.7.3~21
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=306e8733e765404edb72663710a290ef0af177bb;p=adminer.git

Support MariaDB virtual columns
---

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;