From 2b35c0b3754b6d082181be597962794e19c4f88d Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 31 May 2016 16:16:32 +0200 Subject: [PATCH 1/2] New release task for Makefile Added new release task in the make file to automatize the new version process: - Move current version to old_versions folder - Change .control file to the new version - Create the complete SQL file for the new version - Create empty upgrade and downgrade files To call the new task you should pass the NEW_VERSION variable. Eg: make release NEW_VERSION=0.x.0 --- server/extension/Makefile | 36 +++++++++++-------- .../extension/upgrade_downgrade_template.erb | 5 +++ 2 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 server/extension/upgrade_downgrade_template.erb diff --git a/server/extension/Makefile b/server/extension/Makefile index d326f20..e015d45 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -2,39 +2,47 @@ # Once a version is released, it is not meant to be changed. E.g: once version 0.0.1 is out, it SHALL NOT be changed. EXTENSION = cdb_dataservices_server EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") - # The new version to be generated from templates +SED = sed +ERB = erb +REPLACEMENTS = -i 's/$(EXTVERSION)/$(NEW_VERSION)/g' NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql -OLD_VERSIONS = $(wildcard old_versions/*.sql) + +REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) +TEST_DIR = test/ +REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' # DATA is a special variable used by postgres build infrastructure # These are the files to be installed in the server shared dir, # for installation from scratch, upgrades and downgrades. # @see http://www.postgresql.org/docs/current/static/extend-pgxs.html -DATA = $(NEW_EXTENSION_ARTIFACT) \ - $(OLD_VERSIONS) \ - cdb_dataservices_server--0.9.0--0.10.0.sql \ - cdb_dataservices_server--0.10.0--0.9.0.sql - -REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) -TEST_DIR = test/ -REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' +DATA = $(EXTENSION)--*.sql +OLD_VERSIONS = $(wildcard old_versions/*.sql) +SOURCES_DATA_DIR = sql/ +SOURCES_DATA = $(wildcard sql/*.sql) # postgres build stuff PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) -SOURCES_DATA_DIR = sql/ - -SOURCES_DATA = $(wildcard sql/*.sql) - $(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA) rm -f $@ cat $(SOURCES_DATA_DIR)/*.sql >> $@ +.PHONY: all all: $(DATA) +.PHONY: release +release: $(EXTENSION).control $(SOURCES_DATA) + test -n "$(NEW_VERSION)" # $$NEW_VERSION VARIABLE MISSING. Eg. make release NEW_VERSION=0.x.0 + mv *.sql old_versions + $(SED) $(REPLACEMENTS) $(EXTENSION).control + cat $(SOURCES_DATA_DIR)/*.sql > $(EXTENSION)--$(NEW_VERSION).sql + $(ERB) version=$(NEW_VERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(EXTVERSION)--$(NEW_VERSION).sql + $(ERB) version=$(EXTVERSION) upgrade_downgrade_template.erb > $(EXTENSION)--$(NEW_VERSION)--$(EXTVERSION).sql + # Only meant for development time, do not use once a version is released +.PHONY: devclean devclean: rm -f $(NEW_EXTENSION_ARTIFACT) diff --git a/server/extension/upgrade_downgrade_template.erb b/server/extension/upgrade_downgrade_template.erb new file mode 100644 index 0000000..6e928d5 --- /dev/null +++ b/server/extension/upgrade_downgrade_template.erb @@ -0,0 +1,5 @@ +--DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES +-- Complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION cdb_dataservices_server UPDATE TO '<%= version %>'" to load this file. \quit + +-- HERE goes your code to upgrade/downgrade \ No newline at end of file From faab16bb64eea140362252d20f89f65c6677df61 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 31 May 2016 17:58:38 +0200 Subject: [PATCH 2/2] Fixed integration test name --- test/integration/test_data_observatory_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_data_observatory_functions.py b/test/integration/test_data_observatory_functions.py index 1bd745d..cb2e78e 100644 --- a/test/integration/test_data_observatory_functions.py +++ b/test/integration/test_data_observatory_functions.py @@ -63,7 +63,7 @@ class TestDataObservatoryFunctions(TestCase): assert_not_equal(result['measure'], None) assert_equal(result['measure'], 3241) - def test_if_get_measure_without_api_key_raise_error(self): + def test_if_get_measure_by_id_without_api_key_raise_error(self): query = "SELECT OBS_GetMeasureById('36047048500', 'us.census.acs.B01003001', 'us.census.tiger.census_tract', '2010 - 2014') as measure" try: IntegrationTestHelper.execute_query(self.sql_api_url, query)