Bump version to 0.10.0 after 0.9.0 release

diff --git a/.gitignore b/.gitignore
index 90e80c60cc5ddc4593ca042444900adb7ffa70c5..7f595ef3dfc0534a015655d5a106b94fa9088f97 100644 (file)
--- 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 96b013c2a4d1812f5175bc9252e10d658cba2b29..55faf1b78179835551e43d14f627c42fae4de71f 100644 (file)
--- 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 a62e3c390f1761229fc06efaf21da13561c4139b..dd5b10dcf203a8d5359bc139fd921de55545c021 100644 (file)
--- 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 db71019491fe6becaf9708430c6a3a8aa20c1fb9..040fc2d39a3e544bc7e98d8256797bcd6f027c7c 100644 (file)
--- 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 ec81f953f0e6e7bd1ff9f4cc579cca4ad772e576..005912309c15d7b1c64ff81e6c30af09d7fd5174 100644 (file)
--- 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 (file)
index 0000000..3693816
--- /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 6981653ac9d172c4b2d24aae651b51e6cdf0fcf4..a31af188c58e9a1efac521bfe444b89aa1ab37eb 100644 (file)
--- 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.