[postgis-tickets] r15026 - perl as found by configure is not used in tiger, sfcgal, or address_standardizer extensions
Regina Obe
lr at pcorp.us
Sat Jul 30 09:56:44 PDT 2016
Author: robe
Date: 2016-07-30 09:56:43 -0700 (Sat, 30 Jul 2016)
New Revision: 15026
Modified:
trunk/extensions/address_standardizer/Makefile.in
trunk/extensions/postgis_sfcgal/Makefile.in
trunk/extensions/postgis_tiger_geocoder/Makefile.in
Log:
perl as found by configure is not used in tiger, sfcgal, or address_standardizer extensions
references #3602 for PostGIS 2.3 (trunk)
tiger_data not being backed up and add upgrade test
references #3515 for PostGIS 2.3 (trunk)
Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in 2016-07-27 21:50:30 UTC (rev 15025)
+++ trunk/extensions/address_standardizer/Makefile.in 2016-07-30 16:56:43 UTC (rev 15026)
@@ -170,4 +170,4 @@
PGXS := @PGXS@
include $(PGXS)
-
+PERL = @PERL@
Modified: trunk/extensions/postgis_sfcgal/Makefile.in
===================================================================
--- trunk/extensions/postgis_sfcgal/Makefile.in 2016-07-27 21:50:30 UTC (rev 15025)
+++ trunk/extensions/postgis_sfcgal/Makefile.in 2016-07-30 16:56:43 UTC (rev 15026)
@@ -91,3 +91,4 @@
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
+PERL = @PERL@
Modified: trunk/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- trunk/extensions/postgis_tiger_geocoder/Makefile.in 2016-07-27 21:50:30 UTC (rev 15025)
+++ trunk/extensions/postgis_tiger_geocoder/Makefile.in 2016-07-30 16:56:43 UTC (rev 15026)
@@ -23,7 +23,7 @@
$(PERL) -pe 's/(\d+[a-zA-Z]+)\d*/\1/'
DATA = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
-REGRESS = test-normalize_address
+REGRESS = test-normalize_address test-upgrade
REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION)
PG_CONFIG = @PG_CONFIG@
@@ -39,7 +39,7 @@
endif
ifeq ($(PG91),yes)
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/test-normalize_address.sql sql/test-pagc_normalize_address.sql expected/test-normalize_address.out expected/test-pagc_normalize_address.out sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/test-normalize_address.sql sql/test-pagc_normalize_address.sql expected/test-normalize_address.out expected/test-pagc_normalize_address.out sql/test-upgrade.sql expected/test-upgrade.out sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade
sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
mkdir -p sql
@@ -58,6 +58,13 @@
mkdir -p sql
cat $^ > $@
+sql/test-upgrade.sql:
+ mkdir -p sql
+ echo 'ALTER EXTENSION ${EXTENSION} UPDATE TO "$(EXTVERSION)next"' > $@
+
+expected/test-upgrade.out: sql/test-upgrade.sql
+ cp $< $@
+
sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
mkdir -p sql
cat $^ > $@
@@ -67,9 +74,13 @@
cat $^ > $@
#this is a cludge to allow upgrading from same SVN to same SVN
-sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql
+sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql
mkdir -p sql
cat $^ > $@
+ echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
+ cat ../postgis_extension_helper_uninstall.sql >> $@
+
+
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
@@ -79,6 +90,7 @@
#strip BEGIN/COMMIT since these are not allowed in extensions
#strip CREATE SCHEMA since we force extension
# to create schema by setting schema to tiger_geocoder in control
+#also remove tiger_data from extension if it is part of it
sql_bits/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/utility/set_search_path.sql \
../../extras/tiger_geocoder/geocode_settings.sql \
../../extras/tiger_geocoder/tiger_loader_2015.sql \
@@ -111,6 +123,7 @@
../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
cat $^ > $@
+#also remove tiger_data from extension if it is part of it so data gets backed up
sql_bits/tiger_geocoder.sql.in: sql_bits/norm_addy_create.sql.in \
../../extras/tiger_geocoder/utility/set_search_path.sql \
../../extras/tiger_geocoder/geocode_settings.sql \
@@ -146,9 +159,10 @@
../../extras/tiger_geocoder/geocode/census_tracts_functions.sql \
../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
../postgis_extension_helper.sql \
- sql_bits/add_search_path.sql \
- ../postgis_extension_helper_uninstall.sql
+ sql_bits/add_search_path.sql
cat $^ > $@
+ echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
+ cat ../postgis_extension_helper_uninstall.sql >> $@
sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
@@ -198,7 +212,7 @@
-e 's/BEGIN;//g' -e 's/COMMIT;//g' \
$< > $@
-sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql
+sql_minor_upgrade: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
done
@@ -214,3 +228,4 @@
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
+PERL=@PERL@
More information about the postgis-tickets
mailing list