summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-26 16:52:47 +0000
committerDavid Baker <dave@matrix.org>2015-01-26 16:52:47 +0000
commit69a75b7ebebb393c1ce84ff949f3480a6af0a782 (patch)
treecc71f76b9ee148fae4d60dc203f61efd40c7a2df /synapse/storage/__init__.py
parentPushers should only try & look for rejected devices in something that's a lis... (diff)
downloadsynapse-69a75b7ebebb393c1ce84ff949f3480a6af0a782.tar.xz
Add brackets to make get room name / alias work
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 8f56d90d95..2534d109fd 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -402,8 +402,8 @@ class DataStore(RoomMemberStore, RoomStore,
             "redacted": del_sql,
         }
 
-        sql += " AND (s.type = 'm.room.name' AND s.state_key = '')"
-        sql += " OR s.type = 'm.room.aliases'"
+        sql += " AND ((s.type = 'm.room.name' AND s.state_key = '')"
+        sql += " OR s.type = 'm.room.aliases')"
         args = (room_id,)
 
         results = yield self._execute_and_decode(sql, *args)