From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 8 Apr 2017 17:32:29 +0000 (+0200)
Subject: PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (reverts 4c78976c)
X-Git-Tag: v4.3.1~10
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=f556f6acb12d1ec4db667772e48b77d22f2fcf85;p=adminer.git

PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (reverts 4c78976c)
---

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index bf7aae89..bbec040e 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -244,7 +244,7 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_indexes_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", c.relhasoids::int AS \"Oid\", c.reltuples as \"Rows\", n.nspname
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", c.relhasoids::int AS \"Oid\", c.reltuples as \"Rows\", n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
 WHERE relkind IN ('r', 'm', 'v')
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 93f8521a..a3e075d9 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.3.0";
+$VERSION = "4.3.1-dev";
diff --git a/changes.txt b/changes.txt
index 98be6179..13b56429 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.3.1-dev:
+PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (regression from 4.3.0)
+
 Adminer 4.3.0 (released 2017-03-15):
 Make maxlength in edit fields a soft limit
 Add accessibility labels