From: Sandro Santilli <strk@kbt.io>
Date: Tue, 5 Sep 2017 21:11:57 +0000 (+0000)
Subject: Add support for 4-digits PostgreSQL (10+) in _postgis_pgsql_version
X-Git-Tag: 2.4.0rc1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c4d1910e20e8ec8f58e6f7ccdd9886b8d6efc16;p=postgis

Add support for 4-digits PostgreSQL (10+) in _postgis_pgsql_version

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

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index d0fc5fb0d..761d5e12f 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -2778,7 +2778,15 @@ 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
+	SELECT CASE
+		WHEN split_part(s,'.', 1)::integer > 9 THEN
+			split_part(s,'.', 1) || LPAD(
+				COALESCE(NULLIF(
+					split_part(s,'.', 2),
+				''), '0'), 2, '0')
+		ELSE
+			split_part(s,'.', 1) || split_part(s,'.', 2)
+	END AS v
 	FROM substring(version(), 'PostgreSQL ([0-9\.]+)') AS s;
 $$ LANGUAGE 'sql' STABLE;