From e90b9ea1e16d3988d4be187f0dc50d98140282f3 Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Tue, 24 Mar 2015 22:32:59 +0800 Subject: [PATCH] Bump version to 0.10.0 after 0.9.0 release --- .gitignore | 4 ++++ Makefile.in | 10 ++++++++-- bdr.control | 2 +- bdr_version.h.in | 4 ++-- expected/upgrade.out | 5 ++++- extsql/bdr--0.9.0.3--0.10.0.0.sql | 9 +++++++++ sql/upgrade.sql | 4 ++++ 7 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 extsql/bdr--0.9.0.3--0.10.0.0.sql diff --git a/.gitignore b/.gitignore index 90e80c60cc..7f595ef3df 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,9 @@ lib*.pc /config.log /config.status /extsql/bdr--0.[89].0.?.sql +/extsql/bdr--0.1?.0.?.sql /Makefile.global /doc/Makefile +# Packages +bdr-*.asc +bdr-*.md5 diff --git a/Makefile.in b/Makefile.in index 96b013c2a4..55faf1b781 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,7 +23,8 @@ DATA = \ extsql/bdr--0.8.0.7--0.9.0.0.sql \ extsql/bdr--0.9.0.0--0.9.0.1.sql \ extsql/bdr--0.9.0.1--0.9.0.2.sql \ - extsql/bdr--0.9.0.2--0.9.0.3.sql + extsql/bdr--0.9.0.2--0.9.0.3.sql \ + extsql/bdr--0.9.0.3--0.10.0.0.sql DATA_built = \ extsql/bdr--0.8.0.1.sql \ @@ -36,7 +37,8 @@ DATA_built = \ extsql/bdr--0.9.0.0.sql \ extsql/bdr--0.9.0.1.sql \ extsql/bdr--0.9.0.2.sql \ - extsql/bdr--0.9.0.3.sql + extsql/bdr--0.9.0.3.sql \ + extsql/bdr--0.10.0.0.sql DOCS = bdr.conf.sample README.bdr SCRIPTS = scripts/bdr_initial_load bdr_init_copy bdr_resetxlog bdr_dump @@ -159,6 +161,10 @@ extsql/bdr--0.9.0.3.sql: extsql/bdr--0.9.0.2.sql extsql/bdr--0.9.0.2--0.9.0.3.sq mkdir -p extsql cat $^ > $@ +extsql/bdr--0.10.0.0.sql: extsql/bdr--0.9.0.3.sql extsql/bdr--0.9.0.3--0.10.0.0.sql + mkdir -p extsql + cat $^ > $@ + bdr_resetxlog: pg_resetxlog.o $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(libpq_pgport) $(LIBS) -o $@$(X) diff --git a/bdr.control b/bdr.control index a62e3c390f..dd5b10dcf2 100644 --- a/bdr.control +++ b/bdr.control @@ -1,6 +1,6 @@ # bdr extension comment = 'Bi-directional replication for PostgreSQL' -default_version = '0.9.0.3' +default_version = '0.10.0.0' module_pathname = '$libdir/bdr' relocatable = false requires = btree_gist diff --git a/bdr_version.h.in b/bdr_version.h.in index db71019491..040fc2d39a 100644 --- a/bdr_version.h.in +++ b/bdr_version.h.in @@ -1,5 +1,5 @@ -#define BDR_VERSION "0.9.0" -#define BDR_VERSION_NUM 900 +#define BDR_VERSION "0.10.0" +#define BDR_VERSION_NUM 1000 #define BDR_MIN_REMOTE_VERSION_NUM 700 #define BDR_VERSION_DATE "" #define BDR_VERSION_GITHASH "" diff --git a/expected/upgrade.out b/expected/upgrade.out index ec81f953f0..005912309c 100644 --- a/expected/upgrade.out +++ b/expected/upgrade.out @@ -31,6 +31,8 @@ CREATE EXTENSION bdr VERSION '0.9.0.2'; DROP EXTENSION bdr; CREATE EXTENSION bdr VERSION '0.9.0.3'; DROP EXTENSION bdr; +CREATE EXTENSION bdr VERSION '0.10.0.0'; +DROP EXTENSION bdr; -- evolve version one by one from the oldest to the newest one CREATE EXTENSION bdr VERSION '0.8.0'; ALTER EXTENSION bdr UPDATE TO '0.8.0.1'; @@ -44,8 +46,9 @@ ALTER EXTENSION bdr UPDATE TO '0.9.0.0'; ALTER EXTENSION bdr UPDATE TO '0.9.0.1'; ALTER EXTENSION bdr UPDATE TO '0.9.0.2'; ALTER EXTENSION bdr UPDATE TO '0.9.0.3'; +ALTER EXTENSION bdr UPDATE TO '0.10.0.0'; -- Should never have to do anything: You missed adding the new version above. ALTER EXTENSION bdr UPDATE; -NOTICE: version "0.9.0.3" of extension "bdr" is already installed +NOTICE: version "0.10.0.0" of extension "bdr" is already installed \c postgres DROP DATABASE extension_upgrade; diff --git a/extsql/bdr--0.9.0.3--0.10.0.0.sql b/extsql/bdr--0.9.0.3--0.10.0.0.sql new file mode 100644 index 0000000000..36938166ab --- /dev/null +++ b/extsql/bdr--0.9.0.3--0.10.0.0.sql @@ -0,0 +1,9 @@ +SET LOCAL search_path = bdr; +SET bdr.permit_unsafe_ddl_commands = true; +SET bdr.skip_ddl_replication = true; + +-- Empty 0.10.0.0 upgrade file after 0.9.0 release + +RESET bdr.permit_unsafe_ddl_commands; +RESET bdr.skip_ddl_replication; +RESET search_path; diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 6981653ac9..a31af188c5 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -45,6 +45,9 @@ DROP EXTENSION bdr; CREATE EXTENSION bdr VERSION '0.9.0.3'; DROP EXTENSION bdr; +CREATE EXTENSION bdr VERSION '0.10.0.0'; +DROP EXTENSION bdr; + -- evolve version one by one from the oldest to the newest one CREATE EXTENSION bdr VERSION '0.8.0'; ALTER EXTENSION bdr UPDATE TO '0.8.0.1'; @@ -58,6 +61,7 @@ ALTER EXTENSION bdr UPDATE TO '0.9.0.0'; ALTER EXTENSION bdr UPDATE TO '0.9.0.1'; ALTER EXTENSION bdr UPDATE TO '0.9.0.2'; ALTER EXTENSION bdr UPDATE TO '0.9.0.3'; +ALTER EXTENSION bdr UPDATE TO '0.10.0.0'; -- Should never have to do anything: You missed adding the new version above. -- 2.39.5