#3183: Logic to upgrade the address_standardizer extensions

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

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index ef4fa97d326943596f0fd049a3b6c6240c46daa5..89ce122efd9a0a9fcae7f1a392527b6a21f42724 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -35,7 +35,8 @@ MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULE_big = address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 EXTENSION = address_standardizer
 DATA = address_standardizer_data_us.control us_lex.sql us_gaz.sql us_rules.sql
-DATA_built = sql/address_standardizer.sql sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--@POSTGIS_LIB_VERSION@.sql   sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql
+DATA_built = sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION)--$(EXTVERSION)next.sql sql/address_standardizer--$(EXTVERSION)next--$(EXTVERSION).sql sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--@POSTGIS_LIB_VERSION@.sql   sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql
+
 DOCS = README.address_standardizer
 PG_CPPFLAGS = @CPPFLAGS@ -g -O0
 
@@ -58,10 +59,25 @@ sql/%.sql: %.sql.in
        $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
        $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/${EXTENSION}-${MINORVERSION}'g" > $@
        
-sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql: sql/address_standardizer.sql
+sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
+    sql/address_standardizer_functions.sql
+       cat $^ > $@
+       
+sql/address_standardizer.sql: sql/address_standardizer_types.sql \
+    sql/address_standardizer_functions.sql
+       cat $^ > $@
+       
+sql/address_standardizer--1.0--$(EXTVERSION).sql:  sql/address_standardizer_functions.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
        cat $^ > $@
 
-
+# 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
+       cat $^ > $@             
+       
 # build us data extension
 sql/$(EXTENSION)_data_us--$(EXTVERSION).sql: us_lex.sql us_gaz.sql us_rules.sql sql_bits/address_standardizer_data_us_mark_editable_objects.sql.in
        mkdir -p sql

diff --git a/extensions/address_standardizer/address_standardizer.sql.in b/extensions/address_standardizer/address_standardizer_functions.sql.in
similarity index 70%
rename from extensions/address_standardizer/address_standardizer.sql.in
rename to extensions/address_standardizer/address_standardizer_functions.sql.in
index de8a2a9788208794d38883c60304328f09ccaa13..c89a91e956c8f0a745e705af97889d1b14fa9ca3 100644 (file)
--- a/extensions/address_standardizer/address_standardizer.sql.in
+++ b/extensions/address_standardizer/address_standardizer_functions.sql.in
@@ -1,31 +1,8 @@
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION address_standardizer" to load this file. \quit
-
 ---------------------------------------------------------------------
 -- Core function to access the PAGC address standardizer
 -- Author: Stephen Woodbridge <woodbri@imaptools.com>
 ---------------------------------------------------------------------
 
-DROP TYPE IF EXISTS stdaddr;
-CREATE TYPE stdaddr AS (
-    building text,
-    house_num text,
-    predir text,
-    qual text,
-    pretype text,
-    name text,
-    suftype text,
-    sufdir text,
-    ruralroute text,
-    extra text,
-    city text,
-    state text,
-    country text,
-    postcode text,
-    box text,
-    unit text
-);
-
 CREATE OR REPLACE FUNCTION standardize_address(
         lextab text,
         gaztab text,

diff --git a/extensions/address_standardizer/address_standardizer_types.sql.in b/extensions/address_standardizer/address_standardizer_types.sql.in
new file mode 100644 (file)
index 0000000..15de26d
--- /dev/null
+++ b/extensions/address_standardizer/address_standardizer_types.sql.in
@@ -0,0 +1,23 @@
+---------------------------------------------------------------------\r
+-- Core types to access the PAGC address standardizer\r
+-- Author: Stephen Woodbridge <woodbri@imaptools.com>\r
+---------------------------------------------------------------------\r
+\r
+CREATE TYPE stdaddr AS (\r
+    building text,\r
+    house_num text,\r
+    predir text,\r
+    qual text,\r
+    pretype text,\r
+    name text,\r
+    suftype text,\r
+    sufdir text,\r
+    ruralroute text,\r
+    extra text,\r
+    city text,\r
+    state text,\r
+    country text,\r
+    postcode text,\r
+    box text,\r
+    unit text\r
+);\r