From 504c56216c65f0af95ae0a99868adf0d9ea1440b Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 8 Apr 2017 19:59:13 +0200 Subject: [PATCH] PostgreSQL: Support JSON and JSONB data types (bug #542) --- adminer/drivers/pgsql.inc.php | 10 +++++++++- changes.txt | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 9f47cc45..99733a46 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -186,12 +186,20 @@ if (isset($_GET["pgsql"])) { } function connect() { - global $adminer; + global $adminer, $types, $structured_types; $connection = new Min_DB; $credentials = $adminer->credentials(); if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) { if ($connection->server_info >= 9) { $connection->query("SET application_name = 'Adminer'"); + if ($connection->server_info >= 9.2) { + $structured_types[lang('Strings')][] = "json"; + $types["json"] = 4294967295; + if ($connection->server_info >= 9.2) { + $structured_types[lang('Strings')][] = "jsonb"; + $types["jsonb"] = 4294967295; + } + } } return $connection; } diff --git a/changes.txt b/changes.txt index cceb5bc4..ffbd04c2 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,7 @@ Adminer 4.3.1-dev: PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (regression from 4.3.0) PostgreSQL: Fix nullable fields in export +PostgreSQL: Support JSON and JSONB data types Adminer 4.3.0 (released 2017-03-15): Make maxlength in edit fields a soft limit