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 bf7aae89d34fa25598e8152ab82a2c3da17cec16..bbec040e6399940ceafd99c89fa8e5c2f402cbd1 100644 (file)
--- 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 93f8521ad7d250eaec9580135528547f19607106..a3e075d97f3fd03bfb8ac5df7fb057e6349dee6e 100644 (file)
--- 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 98be61791a8217887a6524772b17def7979941b9..13b56429487d548726c0f24fbb72c722ca2d9622 100644 (file)
--- 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