From b4017539d49b16e2d91ca8e7d312c9da4dbf3ae7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Feb 2017 10:42:57 +0000
Subject: [PATCH 1/2] Make the pushers lang field column longer

To accommodate things like zh-Hans-CN

Fixes https://github.com/vector-im/riot-ios/issues/1031
---
 synapse/storage/schema/delta/40/pushers.sql | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 synapse/storage/schema/delta/40/pushers.sql

diff --git a/synapse/storage/schema/delta/40/pushers.sql b/synapse/storage/schema/delta/40/pushers.sql
new file mode 100644
index 0000000000..7e34927efa
--- /dev/null
+++ b/synapse/storage/schema/delta/40/pushers.sql
@@ -0,0 +1,39 @@
+/* Copyright 2017 Vector Creations 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.
+ */
+
+CREATE TABLE IF NOT EXISTS pushers2 (
+    id BIGINT PRIMARY KEY,
+    user_name TEXT NOT NULL,
+    access_token BIGINT DEFAULT NULL,
+    profile_tag VARCHAR(32) NOT NULL,
+    kind VARCHAR(8) NOT NULL,
+    app_id VARCHAR(64) NOT NULL,
+    app_display_name VARCHAR(64) NOT NULL,
+    device_display_name VARCHAR(128) NOT NULL,
+    pushkey TEXT NOT NULL,
+    ts BIGINT NOT NULL,
+    lang VARCHAR(16),
+    data TEXT,
+    last_stream_ordering INTEGER,
+    last_success BIGINT,
+    failing_since BIGINT,
+    UNIQUE (app_id, pushkey, user_name)
+);
+
+INSERT INTO pushers2 SELECT * FROM PUSHERS;
+
+DROP TABLE PUSHERS;
+
+ALTER TABLE pushers2 RENAME TO pushers;

From 4aa29508af2ac9ac07f91a33d5d682b4b5815a9c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Feb 2017 10:51:49 +0000
Subject: [PATCH 2/2] Use TEXT rather than VARCHAR

While we're changing anyway
---
 synapse/storage/schema/delta/40/pushers.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/synapse/storage/schema/delta/40/pushers.sql b/synapse/storage/schema/delta/40/pushers.sql
index 7e34927efa..054a223f14 100644
--- a/synapse/storage/schema/delta/40/pushers.sql
+++ b/synapse/storage/schema/delta/40/pushers.sql
@@ -17,14 +17,14 @@ CREATE TABLE IF NOT EXISTS pushers2 (
     id BIGINT PRIMARY KEY,
     user_name TEXT NOT NULL,
     access_token BIGINT DEFAULT NULL,
-    profile_tag VARCHAR(32) NOT NULL,
-    kind VARCHAR(8) NOT NULL,
-    app_id VARCHAR(64) NOT NULL,
-    app_display_name VARCHAR(64) NOT NULL,
-    device_display_name VARCHAR(128) NOT NULL,
+    profile_tag TEXT NOT NULL,
+    kind TEXT NOT NULL,
+    app_id TEXT NOT NULL,
+    app_display_name TEXT NOT NULL,
+    device_display_name TEXT NOT NULL,
     pushkey TEXT NOT NULL,
     ts BIGINT NOT NULL,
-    lang VARCHAR(16),
+    lang TEXT,
     data TEXT,
     last_stream_ordering INTEGER,
     last_success BIGINT,