summary refs log tree commit diff
path: root/synapse/storage/schema
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-30 16:54:55 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-30 16:54:55 +0100
commit2d4d2bbae4f35e3128fa492e45cfc5b0750524bc (patch)
tree8e3fa03a60443dc2a1af80d5fb13aa0e28ffddca /synapse/storage/schema
parentWrite a default log_config when generating config (diff)
parentAdd get_rooms_for_user cache (diff)
downloadsynapse-2d4d2bbae4f35e3128fa492e45cfc5b0750524bc.tar.xz
Merge branch 'develop' into markjh/config_cleanup
Conflicts:
	synapse/config/captcha.py
Diffstat (limited to 'synapse/storage/schema')
-rw-r--r--synapse/storage/schema/delta/17/user_threepids.sql9
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/storage/schema/delta/17/user_threepids.sql b/synapse/storage/schema/delta/17/user_threepids.sql
new file mode 100644
index 0000000000..c17715ac80
--- /dev/null
+++ b/synapse/storage/schema/delta/17/user_threepids.sql
@@ -0,0 +1,9 @@
+CREATE TABLE user_threepids (
+    user_id TEXT NOT NULL,
+    medium TEXT NOT NULL,
+    address TEXT NOT NULL,
+    validated_at BIGINT NOT NULL,
+    added_at BIGINT NOT NULL,
+    CONSTRAINT user_medium_address UNIQUE (user_id, medium, address)
+);
+CREATE INDEX user_threepids_user_id ON user_threepids(user_id);