From fa722a699cd2637546f02451b8ee969c7bc1a84d Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 8 Sep 2016 17:35:16 +0100
Subject: [PATCH] Reapply 34/device_outbox in 35/device_outbox_again.py since
 the schema was bumped before it landed on develop

---
 .../schema/delta/35/device_outbox_again.py    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 synapse/storage/schema/delta/35/device_outbox_again.py

diff --git a/synapse/storage/schema/delta/35/device_outbox_again.py b/synapse/storage/schema/delta/35/device_outbox_again.py
new file mode 100644
index 000000000..46da12a93
--- /dev/null
+++ b/synapse/storage/schema/delta/35/device_outbox_again.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Re-apply 34/device_outbox.sql since the schema version was bumped before it
+# was added to develop.
+
+import synapse.storage.prepare_database
+import os
+
+
+def run_create(cur, database_engine, *args, **kwargs):
+    try:
+        delta_dir = os.path.join(os.path.dirname(__file__), "..")
+        synapse.storage.prepare_database.executescript(
+            cur, os.path.join(delta_dir, "34", "device_outbox.sql")
+        )
+    except:
+        pass