Removed folder-based versioning for extension files

2018-02-19 11:27:23 +01:00
parent a5c7f313ac
commit 4326ac3430
23 changed files with 1426 additions and 3 deletions
--- a/geocoder/extension/Makefile
+++ b/geocoder/extension/Makefile
@@ -5,7 +5,9 @@ EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/defau

 DATA = $(EXTENSION)--$(EXTVERSION).sql

-REGRESS = $(notdir $(basename $(sort $(wildcard sql/*test.sql))))
+REGRESS = $(notdir $(basename $(sort $(wildcard test/sql/*test.sql))))
+TEST_DIR = test/
+REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' --user='postgres'

 # postgres build stuff
 PG_CONFIG = pg_config
@@ -13,10 +15,10 @@ PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)


-SOURCES_DATA = $(wildcard sql/$(EXTVERSION)/*.sql)
+SOURCES_DATA = $(wildcard sql/*.sql)

 $(DATA): $(SOURCES_DATA)
-	rm -f $@
+	rm -f $(EXTENSION)--*.sql
 	cat $(SOURCES_DATA) >> $@

 all: $(DATA)
--- a/geocoder/extension/cdb_geocoder--0.0.2.sql
+++ b/geocoder/extension/cdb_geocoder--0.0.2.sql
--- a/geocoder/extension/sql/0.0.1/00_header.sql
+++ b/geocoder/extension/sql/0.0.1/00_header.sql
--- a/geocoder/extension/sql/0.0.1/05_types.sql
+++ b/geocoder/extension/sql/0.0.1/05_types.sql
--- a/geocoder/extension/sql/0.0.1/10_aux_functions.sql
+++ b/geocoder/extension/sql/0.0.1/10_aux_functions.sql
--- a/geocoder/extension/sql/0.0.1/20_admin0.sql
+++ b/geocoder/extension/sql/0.0.1/20_admin0.sql
--- a/geocoder/extension/sql/0.0.1/25_country_decoder_table.sql
+++ b/geocoder/extension/sql/0.0.1/25_country_decoder_table.sql
--- a/geocoder/extension/sql/0.0.1/30_admin1.sql
+++ b/geocoder/extension/sql/0.0.1/30_admin1.sql
--- a/geocoder/extension/sql/0.0.1/40_ipaddr.sql
+++ b/geocoder/extension/sql/0.0.1/40_ipaddr.sql
--- a/geocoder/extension/sql/0.0.1/50_namedplaces.sql
+++ b/geocoder/extension/sql/0.0.1/50_namedplaces.sql
--- a/geocoder/extension/sql/0.0.1/60_postalcodes.sql
+++ b/geocoder/extension/sql/0.0.1/60_postalcodes.sql
--- a/geocoder/extension/test/expected/00_install_test.out
+++ b/geocoder/extension/test/expected/00_install_test.out
--- a/geocoder/extension/test/expected/20_admin0_test.out
+++ b/geocoder/extension/test/expected/20_admin0_test.out
--- a/geocoder/extension/test/expected/30_admin1_test.out
+++ b/geocoder/extension/test/expected/30_admin1_test.out
--- a/geocoder/extension/test/expected/40_ipaddr_test.out
+++ b/geocoder/extension/test/expected/40_ipaddr_test.out
--- a/geocoder/extension/test/expected/50_namedplaces_test.out
+++ b/geocoder/extension/test/expected/50_namedplaces_test.out
--- a/geocoder/extension/test/expected/60_postalcode_test.out
+++ b/geocoder/extension/test/expected/60_postalcode_test.out
--- a/geocoder/extension/test/sql/00_install_test.sql
+++ b/geocoder/extension/test/sql/00_install_test.sql
--- a/geocoder/extension/test/sql/20_admin0_test.sql
+++ b/geocoder/extension/test/sql/20_admin0_test.sql
--- a/geocoder/extension/test/sql/30_admin1_test.sql
+++ b/geocoder/extension/test/sql/30_admin1_test.sql
--- a/geocoder/extension/test/sql/40_ipaddr_test.sql
+++ b/geocoder/extension/test/sql/40_ipaddr_test.sql
--- a/geocoder/extension/test/sql/50_namedplaces_test.sql
+++ b/geocoder/extension/test/sql/50_namedplaces_test.sql
--- a/geocoder/extension/test/sql/60_postalcode_test.sql
+++ b/geocoder/extension/test/sql/60_postalcode_test.sql