From e86739426144d78a17a6d851dbeca6e7336a2c8c Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 7 Mar 2016 15:46:04 +0100 Subject: [PATCH] Move the old version files to a folder --- client/Makefile | 9 ++------- .../cdb_dataservices_client--0.0.1--0.1.0.sql | 0 .../cdb_dataservices_client--0.0.1.sql | 0 .../cdb_dataservices_client--0.1.0--0.0.1.sql | 0 .../cdb_dataservices_client--0.1.0--0.2.0.sql | 0 .../cdb_dataservices_client--0.1.0.sql | 0 .../cdb_dataservices_client--0.2.0--0.1.0.sql | 0 .../cdb_dataservices_client--0.2.0.sql | 0 server/extension/.gitignore | 2 ++ server/extension/Makefile | 19 ++++--------------- .../cdb_dataservices_server--0.0.1--0.1.0.sql | 0 .../cdb_dataservices_server--0.0.1.sql | 0 .../cdb_dataservices_server--0.1.0--0.0.1.sql | 0 .../cdb_dataservices_server--0.1.0--0.2.0.sql | 0 .../cdb_dataservices_server--0.1.0.sql | 0 .../cdb_dataservices_server--0.2.0--0.1.0.sql | 0 .../cdb_dataservices_server--0.2.0--0.3.0.sql | 0 .../cdb_dataservices_server--0.2.0.sql | 0 .../cdb_dataservices_server--0.3.0--0.2.0.sql | 0 .../cdb_dataservices_server--0.3.0--0.4.0.sql | 0 .../cdb_dataservices_server--0.3.0.sql | 0 .../cdb_dataservices_server--0.4.0--0.3.0.sql | 0 .../cdb_dataservices_server--0.4.0--0.5.0.sql | 0 .../cdb_dataservices_server--0.4.0.sql | 0 .../cdb_dataservices_server--0.5.0--0.4.0.sql | 0 .../cdb_dataservices_server--0.5.0.sql | 0 26 files changed, 8 insertions(+), 22 deletions(-) rename client/{ => old_versions}/cdb_dataservices_client--0.0.1--0.1.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.0.1.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.1.0--0.0.1.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.1.0--0.2.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.1.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.2.0--0.1.0.sql (100%) rename client/{ => old_versions}/cdb_dataservices_client--0.2.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.0.1--0.1.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.0.1.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.1.0--0.0.1.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.1.0--0.2.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.1.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.2.0--0.1.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.2.0--0.3.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.2.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.3.0--0.2.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.3.0--0.4.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.3.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.4.0--0.3.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.4.0--0.5.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.4.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.5.0--0.4.0.sql (100%) rename server/extension/{ => old_versions}/cdb_dataservices_server--0.5.0.sql (100%) diff --git a/client/Makefile b/client/Makefile index a15da74..074cd73 100644 --- a/client/Makefile +++ b/client/Makefile @@ -5,19 +5,14 @@ EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/defau # The new version to be generated from templates NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql +OLD_VERSIONS = $(wildcard old_versions/*.sql) # 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) \ - cdb_dataservices_client--0.0.1.sql \ - cdb_dataservices_client--0.1.0.sql \ - cdb_dataservices_client--0.2.0.sql \ - cdb_dataservices_client--0.1.0--0.0.1.sql \ - cdb_dataservices_client--0.0.1--0.1.0.sql \ - cdb_dataservices_client--0.2.0--0.1.0.sql \ - cdb_dataservices_client--0.1.0--0.2.0.sql \ + $(OLD_VERSIONS) \ cdb_dataservices_client--0.2.0--0.3.0.sql \ cdb_dataservices_client--0.3.0--0.2.0.sql diff --git a/client/cdb_dataservices_client--0.0.1--0.1.0.sql b/client/old_versions/cdb_dataservices_client--0.0.1--0.1.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.0.1--0.1.0.sql rename to client/old_versions/cdb_dataservices_client--0.0.1--0.1.0.sql diff --git a/client/cdb_dataservices_client--0.0.1.sql b/client/old_versions/cdb_dataservices_client--0.0.1.sql similarity index 100% rename from client/cdb_dataservices_client--0.0.1.sql rename to client/old_versions/cdb_dataservices_client--0.0.1.sql diff --git a/client/cdb_dataservices_client--0.1.0--0.0.1.sql b/client/old_versions/cdb_dataservices_client--0.1.0--0.0.1.sql similarity index 100% rename from client/cdb_dataservices_client--0.1.0--0.0.1.sql rename to client/old_versions/cdb_dataservices_client--0.1.0--0.0.1.sql diff --git a/client/cdb_dataservices_client--0.1.0--0.2.0.sql b/client/old_versions/cdb_dataservices_client--0.1.0--0.2.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.1.0--0.2.0.sql rename to client/old_versions/cdb_dataservices_client--0.1.0--0.2.0.sql diff --git a/client/cdb_dataservices_client--0.1.0.sql b/client/old_versions/cdb_dataservices_client--0.1.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.1.0.sql rename to client/old_versions/cdb_dataservices_client--0.1.0.sql diff --git a/client/cdb_dataservices_client--0.2.0--0.1.0.sql b/client/old_versions/cdb_dataservices_client--0.2.0--0.1.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.2.0--0.1.0.sql rename to client/old_versions/cdb_dataservices_client--0.2.0--0.1.0.sql diff --git a/client/cdb_dataservices_client--0.2.0.sql b/client/old_versions/cdb_dataservices_client--0.2.0.sql similarity index 100% rename from client/cdb_dataservices_client--0.2.0.sql rename to client/old_versions/cdb_dataservices_client--0.2.0.sql diff --git a/server/extension/.gitignore b/server/extension/.gitignore index 3990497..f103abf 100644 --- a/server/extension/.gitignore +++ b/server/extension/.gitignore @@ -5,3 +5,5 @@ cdb_geocoder_server--0.0.1.sql cdb_geocoder_server--0.1.0.sql cdb_geocoder_server--0.2.0.sql cdb_geocoder_server--0.3.0.sql +cdb_geocoder_server--0.4.0.sql +cdb_geocoder_server--0.5.0.sql \ No newline at end of file diff --git a/server/extension/Makefile b/server/extension/Makefile index 0d8091c..40e6163 100644 --- a/server/extension/Makefile +++ b/server/extension/Makefile @@ -5,27 +5,16 @@ EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/defau # The new version to be generated from templates NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql +OLD_VERSIONS = $(wildcard old_versions/*.sql) # 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) \ - cdb_dataservices_server--0.0.1.sql \ - cdb_dataservices_server--0.1.0.sql \ - cdb_dataservices_server--0.2.0.sql \ - cdb_dataservices_server--0.3.0.sql \ - cdb_dataservices_server--0.4.0.sql \ - cdb_dataservices_server--0.1.0--0.0.1.sql \ - cdb_dataservices_server--0.0.1--0.1.0.sql \ - cdb_dataservices_server--0.2.0--0.1.0.sql \ - cdb_dataservices_server--0.1.0--0.2.0.sql \ - cdb_dataservices_server--0.2.0--0.3.0.sql \ - cdb_dataservices_server--0.3.0--0.2.0.sql \ - cdb_dataservices_server--0.3.0--0.4.0.sql \ - cdb_dataservices_server--0.4.0--0.3.0.sql \ - cdb_dataservices_server--0.5.0--0.4.0.sql \ - cdb_dataservices_server--0.4.0--0.5.0.sql + $(OLD_VERSIONS) \ + cdb_dataservices_server--0.5.1--0.5.0.sql \ + cdb_dataservices_server--0.5.0--0.5.1.sql REGRESS = $(notdir $(basename $(wildcard test/$(EXTVERSION)/sql/*test.sql))) TEST_DIR = test/$(EXTVERSION) diff --git a/server/extension/cdb_dataservices_server--0.0.1--0.1.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.0.1--0.1.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.0.1--0.1.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.0.1--0.1.0.sql diff --git a/server/extension/cdb_dataservices_server--0.0.1.sql b/server/extension/old_versions/cdb_dataservices_server--0.0.1.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.0.1.sql rename to server/extension/old_versions/cdb_dataservices_server--0.0.1.sql diff --git a/server/extension/cdb_dataservices_server--0.1.0--0.0.1.sql b/server/extension/old_versions/cdb_dataservices_server--0.1.0--0.0.1.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.1.0--0.0.1.sql rename to server/extension/old_versions/cdb_dataservices_server--0.1.0--0.0.1.sql diff --git a/server/extension/cdb_dataservices_server--0.1.0--0.2.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.1.0--0.2.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.1.0--0.2.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.1.0--0.2.0.sql diff --git a/server/extension/cdb_dataservices_server--0.1.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.1.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.1.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.1.0.sql diff --git a/server/extension/cdb_dataservices_server--0.2.0--0.1.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.2.0--0.1.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.2.0--0.1.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.2.0--0.1.0.sql diff --git a/server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.2.0--0.3.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.2.0--0.3.0.sql diff --git a/server/extension/cdb_dataservices_server--0.2.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.2.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.2.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.2.0.sql diff --git a/server/extension/cdb_dataservices_server--0.3.0--0.2.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.3.0--0.2.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.3.0--0.2.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.3.0--0.2.0.sql diff --git a/server/extension/cdb_dataservices_server--0.3.0--0.4.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.3.0--0.4.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.3.0--0.4.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.3.0--0.4.0.sql diff --git a/server/extension/cdb_dataservices_server--0.3.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.3.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.3.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.3.0.sql diff --git a/server/extension/cdb_dataservices_server--0.4.0--0.3.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.4.0--0.3.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.4.0--0.3.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.4.0--0.3.0.sql diff --git a/server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.4.0--0.5.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.4.0--0.5.0.sql diff --git a/server/extension/cdb_dataservices_server--0.4.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.4.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.4.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.4.0.sql diff --git a/server/extension/cdb_dataservices_server--0.5.0--0.4.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.5.0--0.4.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.5.0--0.4.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.5.0--0.4.0.sql diff --git a/server/extension/cdb_dataservices_server--0.5.0.sql b/server/extension/old_versions/cdb_dataservices_server--0.5.0.sql similarity index 100% rename from server/extension/cdb_dataservices_server--0.5.0.sql rename to server/extension/old_versions/cdb_dataservices_server--0.5.0.sql