summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-11-09 15:01:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-11-09 15:01:59 +0000
commitbbe10e8be7fa900c37e525d791e5a344ad34f165 (patch)
tree02aba4e8638e248f4452fbde91963ca01e02cc50 /synapse/storage
parentSYN-513: Include updates for rooms that have had all their tags deleted (diff)
parentfix comedy important missing comma breaking recent-ordered FTS on sqlite (diff)
downloadsynapse-bbe10e8be7fa900c37e525d791e5a344ad34f165.tar.xz
Merge branch 'develop' into markjh/SYN-513
Conflicts:
	synapse/storage/tags.py
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/search.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 3cea2011fa..91a96d2a83 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -154,7 +154,7 @@ class SearchStore(SQLBaseStore):
             )
         elif isinstance(self.database_engine, Sqlite3Engine):
             sql = (
-                "SELECT rank(matchinfo(event_search)) as rank, room_id, event_id"
+                "SELECT rank(matchinfo(event_search)) as rank, room_id, event_id,"
                 " topological_ordering, stream_ordering"
                 " FROM event_search"
                 " NATURAL JOIN events"