PostgreSQL: Support JSON and JSONB data types (bug #542)

vrana · Apr 8, 2017 · 504c562 · SeinopSys · Apr 8, 2017 · vrana
1 parent 88803c6
commit 504c562
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
@@ -186,12 +186,20 @@ function table($idf) {
 	}
 
 	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
@@ -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