bdr: add delete_delete conflict type to bdr_conflict_type.

Bump BDR extension version accordingly and when at it bump the BDR version too.

diff --git a/Makefile b/Makefile
index 16ea3d7b4d31eed08d21d6e1f77a51ff9c9e6b8a..fdd811b418286f926502864801ed10eeb30264cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 MODULE_big = bdr
 
 EXTENSION = bdr
-DATA = bdr--0.6.sql
+DATA = bdr--0.7.sql
 DOCS = bdr.conf.sample README.bdr
 SCRIPTS = scripts/bdr_initial_load bdr_init_copy
 

diff --git a/bdr--0.6.sql b/bdr--0.7.sql
similarity index 99%
rename from bdr--0.6.sql
rename to bdr--0.7.sql
index 5badf688caf6c7e4024f279a43f70b71a6208df4..02bd4b8fe6cdf9fb8c9bee4bd35cd0a9d01fd365 100644 (file)
--- a/bdr--0.6.sql
+++ b/bdr--0.7.sql
@@ -158,6 +158,7 @@ CREATE TYPE bdr_conflict_type AS ENUM
     'insert_update',
     'update_update',
     'update_delete',
+    'delete_delete',
     'unhandled_tx_abort'
 );
 

diff --git a/bdr.control b/bdr.control
index 50a490421fe866de7846c8eb9c3c4dd1b7405bca..c07483cd5dc0f711584e77c50b96f24abe8a4822 100644 (file)
--- a/bdr.control
+++ b/bdr.control
@@ -1,6 +1,6 @@
 # bdr extension
 comment = 'bdr support functions'
-default_version = '0.6'
+default_version = '0.7'
 module_pathname = '$libdir/bdr'
 relocatable = false
 requires = btree_gist

diff --git a/bdr_version.h.in b/bdr_version.h.in
index 0ca593768a9e2fd6cbc28b47d1e4bef1657b9881..3742e103875327b017979e67fd5d9eea24ba6476 100644 (file)
--- a/bdr_version.h.in
+++ b/bdr_version.h.in
@@ -1,6 +1,6 @@
-#define BDR_VERSION "0.6.1"
-#define BDR_VERSION_NUM 601
-#define BDR_MIN_REMOTE_VERSION_NUM 601
+#define BDR_VERSION "0.7"
+#define BDR_VERSION_NUM 700
+#define BDR_MIN_REMOTE_VERSION_NUM 700
 #define BDR_VERSION_DATE ""
 #define BDR_VERSION_GITHASH ""
 #define BDR_VERSION_STR BDR_VERSION"-"BDR_VERSION_DATE"-"BDR_VERSION_GITHASH