From a526e874d2051601c8f441920a48b8bf70045f3f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 22 Oct 2017 19:00:29 +0000 Subject: [PATCH] Fix unpackaged extension creation check See #3892 git-svn-id: http://svn.osgeo.org/postgis/trunk@16048 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 1 - extensions/postgis/unpackaged_check.sql.in | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 4e7fb4c85..0dc25b895 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -80,7 +80,6 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql cp $< $@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl unpackaged_check.sql Makefile | sql - cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | $(PERL) ../../utils/create_unpackaged.pl postgis > $@ # Ensure version is correct cat unpackaged_check.sql > $@ cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) \ diff --git a/extensions/postgis/unpackaged_check.sql.in b/extensions/postgis/unpackaged_check.sql.in index eb4b26b72..19152f673 100644 --- a/extensions/postgis/unpackaged_check.sql.in +++ b/extensions/postgis/unpackaged_check.sql.in @@ -5,8 +5,9 @@ BEGIN ver := split_part(postgis_scripts_installed(), ' ', 1); IF ver != '@EXTVERSION@' THEN RAISE EXCEPTION 'Installed PostGIS version is %', ver - USING HINT = 'Try `CREATE EXTENSION postgis VERSION ''@EXTVERSION@'' from unpackaged`,' - 'or source postgis_upgrade.sql`'; + USING HINT = 'Try `CREATE EXTENSION postgis VERSION ''' + || ver || ''' from unpackaged`,' + ' or source postgis_upgrade.sql`'; END IF; END; $$ LANGUAGE 'plpgsql'; -- 2.40.0