[postgis-tickets] r17687 - Add upgrade install paths for address_standardizer

[Regina Obe]

Author: robe
Date: 2019-08-10 19:36:53 -0700 (Sat, 10 Aug 2019)
New Revision: 17687

Modified:
   trunk/NEWS
   trunk/doc/release_notes.xml
   trunk/extensions/address_standardizer/Makefile.in
Log:
Add upgrade install paths for address_standardizer
Closese #4420 for PostGIS 3.0 (trunk)

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2019-08-11 01:44:24 UTC (rev 17686)
+++ trunk/NEWS	2019-08-11 02:36:53 UTC (rev 17687)
@@ -21,6 +21,7 @@
   - #4419, Use protobuf version to enable/disable mvt/geobuf (Paul Ramsey)
   - #4437, Handle POINT EMPTY in shape loader/dumper (Paul Ramsey)
   - #4456, add Rasbery Pi 32-bit jenkins bot for testing (Bruce Rindahl,Regina Obe)
+  - #4420, update path does not exists for address_standardizer extension (Regina Obe)
 
 PostGIS 3.0.0alpha3
 2019/07/01

Modified: trunk/doc/release_notes.xml
===================================================================
--- trunk/doc/release_notes.xml	2019-08-11 01:44:24 UTC (rev 17686)
+++ trunk/doc/release_notes.xml	2019-08-11 02:36:53 UTC (rev 17687)
@@ -27,6 +27,7 @@
           <para>4419, Use protobuf version to enable/disable mvt/geobuf (Paul Ramsey)</para>
           <para>4437, Handle POINT EMPTY in shape loader/dumper (Paul Ramsey)</para>
           <para>4456, add Rasbery Pi 32-bit jenkins bot for testing (Bruce Rindahl,Regina Obe)</para>
+          <para>4420, update path does not exists for address_standardizer extension (Regina Obe)</para>
       </simplesect>
     </sect1>
 

Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2019-08-11 01:44:24 UTC (rev 17686)
+++ trunk/extensions/address_standardizer/Makefile.in	2019-08-11 02:36:53 UTC (rev 17687)
@@ -1,3 +1,4 @@
+include ../upgradeable_versions.mk
 OBJS = \
     address_parser.o \
     address_standardizer.o \
@@ -44,7 +45,7 @@
 	$(EXTENSION)_data_us.control \
 	$(NULL)
 
-all:  sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION)--$(EXTVERSION)next.sql sql/address_standardizer--$(EXTVERSION)next--$(EXTVERSION).sql \
+all:  sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql \
  sql/$(EXTENSION)_data_us.sql sql/address_standardizer-- at POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us-- at POSTGIS_LIB_VERSION@.sql  sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
 sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql \
 sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
@@ -87,10 +88,7 @@
 	mkdir -p sql
 	cat $^ > $@
 
-# upgrade logic for us data extension (to go to next cludge for dev upgrading)
-sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
-	mkdir -p sql
-	cat $^ > $@
+EXTENSION_UPGRADE_SCRIPTS = sql/address_standardizer_functions.sql
 
 # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
@@ -116,6 +114,12 @@
 	mkdir -p sql
 	cat $^ > $@
 
+
+sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
+	cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
+
+include ../upgrade-paths-rules.mk
+
 mk-st-regexp: mk-st-regexp.pl
 	$(PERL) -c mk-st-regexp.pl
 	rm -f mk-st-regexp