summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:25:40 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:25:40 +0100
commite8cf77fa496de10246735fa8a11020663285bdd2 (patch)
tree7dfcf1f24dd965c8d34331fc70d1b17fbb6f03ad /synapse/storage
parent/tokenrefresh POST endpoint (diff)
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-e8cf77fa496de10246735fa8a11020663285bdd2.tar.xz
Merge branch 'develop' into refresh
Conflicts:
	synapse/rest/client/v1/login.py
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/schema/delta/22/user_threepids_unique.sql19
1 files changed, 19 insertions, 0 deletions
diff --git a/synapse/storage/schema/delta/22/user_threepids_unique.sql b/synapse/storage/schema/delta/22/user_threepids_unique.sql
new file mode 100644
index 0000000000..87edfa454c
--- /dev/null
+++ b/synapse/storage/schema/delta/22/user_threepids_unique.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS user_threepids2 (
+    user_id TEXT NOT NULL,
+    medium TEXT NOT NULL,
+    address TEXT NOT NULL,
+    validated_at BIGINT NOT NULL,
+    added_at BIGINT NOT NULL,
+    CONSTRAINT medium_address UNIQUE (medium, address)
+);
+
+INSERT INTO user_threepids2
+	SELECT * FROM user_threepids WHERE added_at IN (
+		SELECT max(added_at) FROM user_threepids GROUP BY medium, address
+	)
+;
+
+DROP TABLE user_threepids;
+ALTER TABLE user_threepids2 RENAME TO user_threepids;
+
+CREATE INDEX user_threepids_user_id ON user_threepids(user_id);