Use `server_version_num` instead of parsing `version()`

References #4296

git-svn-id: http://svn.osgeo.org/postgis/branches/2.5@17180 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index aff81842e15de57c7c9a31843a595bc2b4040db2..a815e04f4523bd8ac8d1d1744a80b16e9eec1656 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,8 @@ XXXX/XX/XX
 
   - #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
 
+  - #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
+
 PostGIS 2.5.1
 2018/11/18
 

diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index a5e6a0ad245bb4e7b0df5eb3a78f6361d186b979..c93493a443b6d4ff658d5338c5e801b862380864 100644 (file)
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -28,8 +28,7 @@ DECLARE
        var_class text := '';
        var_is_aggregate boolean := false;
        var_sql_list text := '';
-       var_pgsql_version integer := CASE WHEN split_part(s,'.',1)::integer > 9 THEN split_part(s,'.',1) || '0' ELSE split_part(s,'.', 1) || split_part(s,'.', 2) END AS v
-       FROM substring(version(), 'PostgreSQL ([0-9\.]+)') AS s;
+       var_pgsql_version integer := current_setting('server_version_num');
 BEGIN
                var_class := CASE WHEN lower(param_type) = 'function' OR lower(param_type) = 'aggregate' THEN 'pg_proc' ELSE '' END;
                var_is_aggregate := CASE WHEN lower(param_type) = 'aggregate' THEN true ELSE false END;

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 54c554d57e7cbec202b4426488afca365bcac09c..0806c25339ff897d43aa126e549cc19eb75dbbfe 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -2808,8 +2808,7 @@ CREATE OR REPLACE FUNCTION _postgis_scripts_pgsql_version() RETURNS text
 
 CREATE OR REPLACE FUNCTION _postgis_pgsql_version() RETURNS text
 AS $$
-       SELECT CASE WHEN split_part(s,'.',1)::integer > 9 THEN split_part(s,'.',1) || '0' ELSE split_part(s,'.', 1) || split_part(s,'.', 2) END AS v
-       FROM substring(version(), 'PostgreSQL ([0-9\.]+)') AS s;
+       SELECT current_setting('server_version_num');
 $$ LANGUAGE 'sql' STABLE;
 
 -- Availability: 2.5.0