From 56bd985718639055a9918b989b2099d84f9ddb8a Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 29 Aug 2017 07:27:47 +0000 Subject: [PATCH] Always show PGSQL version scripts were built against also add a missing NEWS item git-svn-id: http://svn.osgeo.org/postgis/trunk@15603 b70326c6-7e19-0410-871a-916f4a2858ee --- NEWS | 3 ++- postgis/postgis.sql.in | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 2959aea94..2dc1a1c0e 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,8 @@ PostGIS 2.4.0 2017/09/xx * New Features * - + - #3822, Have postgis_full_version() also show and check version of + PostgreSQL the scripts were built against (Sandro Santilli) - #2411, curves support in ST_Reverse (Sandro Santilli) - #2951, ST_Centroid for geography (Danny Götte) - #3788, Allow postgis_restore.pl to work on directory-style (-Fd) dumps diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index bc34b82fc..dad7d8b13 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -2877,6 +2877,10 @@ BEGIN fullver = fullver || ' (liblwgeom version mismatch: "' || liblwgeomver || '")'; END IF; + fullver = fullver || ' PGSQL="' || pgsql_scr_ver || '"'; + IF pgsql_scr_ver != pgsql_ver THEN + fullver = fullver || ' (procs need upgrade for use with "' || pgsql_ver || '")'; + END IF; IF geosver IS NOT NULL THEN fullver = fullver || ' GEOS="' || geosver || '"'; @@ -2913,10 +2917,6 @@ BEGIN fullver = fullver || ' (core procs from "' || dbproc || '" need upgrade)'; END IF; - IF pgsql_scr_ver != pgsql_ver THEN - fullver = fullver || ' (procs built against PostgreSQL "' || pgsql_scr_ver || '" need upgrade)'; - END IF; - IF topo_scr_ver IS NOT NULL THEN fullver = fullver || ' TOPOLOGY'; IF topo_scr_ver != relproc THEN -- 2.40.0