From e22399bebead1f92a53f2d371334491394b998ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Nov 2017 17:49:56 +0100 Subject: [PATCH] Add support for JSON field in MariaDB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixs #13038 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/TypesMySQL.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06444922de..0b887576d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - issue #13517 Fixed check all interaction with filtering - issue #13803 Add SJIS-win to default list of allowed charsets - issue #13436 Improve detection that MySQL server needs SSL connection +- issue #13038 Support JSON datatype on MariaDB 10.2.7 and newer 4.7.5 (2017-10-23) - issue #13615 Avoid problems with browsing unknown query types diff --git a/libraries/TypesMySQL.php b/libraries/TypesMySQL.php index a1ee7bacb3..852a12230c 100644 --- a/libraries/TypesMySQL.php +++ b/libraries/TypesMySQL.php @@ -535,8 +535,8 @@ class TypesMySQL extends Types 'GEOMETRYCOLLECTION', ); - if (PMA_MYSQL_INT_VERSION >= 50708 - && \PMA\libraries\Util::getServerType() != 'MariaDB' + if ((PMA_MYSQL_INT_VERSION >= 50708 && \PMA\libraries\Util::getServerType() != 'MariaDB') || + (PMA_MYSQL_INT_VERSION >= 100207 && \PMA\libraries\Util::getServerType() == 'MariaDB') ) { $ret['JSON'] = array( 'JSON',