diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-09 15:01:59 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-09 15:01:59 +0000 |
| commit | bbe10e8be7fa900c37e525d791e5a344ad34f165 (patch) | |
| tree | 02aba4e8638e248f4452fbde91963ca01e02cc50 | |
| parent | SYN-513: Include updates for rooms that have had all their tags deleted (diff) | |
| parent | fix comedy important missing comma breaking recent-ordered FTS on sqlite (diff) | |
| download | synapse-bbe10e8be7fa900c37e525d791e5a344ad34f165.tar.xz | |
Merge branch 'develop' into markjh/SYN-513
Conflicts: synapse/storage/tags.py
| -rw-r--r-- | synapse/storage/search.py | 2 |
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" |