[postgis-tickets] r17620 - postgis_extensions_upgrade() also updates after pg_upgrade

[Raul]

Author: algunenano
Date: 2019-07-22 06:27:46 -0700 (Mon, 22 Jul 2019)
New Revision: 17620

Modified:
   trunk/NEWS
   trunk/postgis/postgis.sql.in
Log:
postgis_extensions_upgrade() also updates after pg_upgrade

Closes #4271
Closes https://github.com/postgis/postgis/pull/449




Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2019-07-22 11:35:56 UTC (rev 17619)
+++ trunk/NEWS	2019-07-22 13:27:46 UTC (rev 17620)
@@ -15,6 +15,7 @@
   - #4456, add Rasbery Pi 32-bit jenkins bot for testing (Bruce Rindahl)
   - #4454, Speed up _ST_OrderingEquals (Raúl Marín)
   - #4453, Speed up ST_IsEmpty (Raúl Marín)
+  - #4271, postgis_extensions_upgrade() also updates after pg_upgrade (Raúl Marín)
 
 PostGIS 3.0.0alpha3
 2019/07/01

Modified: trunk/postgis/postgis.sql.in
===================================================================
--- trunk/postgis/postgis.sql.in	2019-07-22 11:35:56 UTC (rev 17619)
+++ trunk/postgis/postgis.sql.in	2019-07-22 13:27:46 UTC (rev 17620)
@@ -2854,11 +2854,11 @@
 				rec.name, rec.installed_version, rec.default_version;
 			RAISE DEBUG '%', sql;
 			EXECUTE sql;
-		ELSIF rec.default_version = rec.installed_version AND
-					rec.installed_version ILIKE '%dev'
+		ELSIF (rec.default_version = rec.installed_version AND rec.installed_version ILIKE '%dev') OR
+			(@extschema at ._postgis_pgsql_version() != @extschema at ._postgis_scripts_pgsql_version())
 		THEN
 			-- we need to upgrade to next and back
-			RAISE NOTICE 'Updating dev extension % %',
+			RAISE NOTICE 'Updating extension % %',
 				rec.name, rec.installed_version;
 			sql = 'ALTER EXTENSION ' || rec.name || ' UPDATE TO ' ||
 						quote_ident(rec.default_version || 'next')   || ';';