Merge branch 'develop' into markjh/SYN-513

Conflicts:
	synapse/storage/tags.py

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"