Merge branch 'master' into debian

4 files changed, 14 insertions, 0 deletions

diff --git a/tests/db-upgrade-0-1-delim-mismatch/before.sql b/tests/db-upgrade-0-1-delim-mismatch/before.sql
new file mode 120000
index 0000000..6c31715
--- /dev/null
+++ b/tests/db-upgrade-0-1-delim-mismatch/before.sql
@@ -0,0 +1 @@
+../db-upgrade-0-1/before.sql
\ No newline at end of file
diff --git a/tests/db-upgrade-0-1-delim-mismatch/local.conf b/tests/db-upgrade-0-1-delim-mismatch/local.conf
new file mode 100644
index 0000000..900c73f
--- /dev/null
+++ b/tests/db-upgrade-0-1-delim-mismatch/local.conf
@@ -0,0 +1,3 @@
+namespace inbox {
+    separator = "\""
+}
diff --git a/tests/db-upgrade-0-1-delim-mismatch/remote.conf b/tests/db-upgrade-0-1-delim-mismatch/remote.conf
new file mode 100644
index 0000000..2d08a24
--- /dev/null
+++ b/tests/db-upgrade-0-1-delim-mismatch/remote.conf
@@ -0,0 +1,3 @@
+namespace inbox {
+    separator = ^
+}
diff --git a/tests/db-upgrade-0-1-delim-mismatch/t b/tests/db-upgrade-0-1-delim-mismatch/t
new file mode 100644
index 0000000..d133437
--- /dev/null
+++ b/tests/db-upgrade-0-1-delim-mismatch/t
@@ -0,0 +1,7 @@
+# import an existing non-migrated database
+sqlite3 "$XDG_DATA_HOME/interimap/remote.db" <"$TESTDIR/before.sql" || error "Couldn't import DB"
+! interimap || error
+
+grep -Fx 'ERROR: Local and remote hierachy delimiters differ (local "\"", remote "^"), refusing to update table `mailboxes`.' <"$STDERR" || error
+
+# vim: set filetype=sh :