Merge branch 'develop' into markjh/SYN-513

Mark Haines · Mark Haines · commit bbe10e8be7fa · 2015-11-09T15:01:59.000Z
Conflicts:
	synapse/storage/tags.py
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
@@ -154,7 +154,7 @@ def search_room(self, room_id, search_term, keys, limit, pagination_token=None):
             )
         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"

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ def search_room(self, room_id, search_term, keys, limit, pagination_token=None):`
`154`	`154`	`)`
`155`	`155`	`elif isinstance(self.database_engine, Sqlite3Engine):`
`156`	`156`	`sql = (`
`157`		`- "SELECT rank(matchinfo(event_search)) as rank, room_id, event_id"`
	`157`	`+ "SELECT rank(matchinfo(event_search)) as rank, room_id, event_id,"`
`158`	`158`	`" topological_ordering, stream_ordering"`
`159`	`159`	`" FROM event_search"`
`160`	`160`	`" NATURAL JOIN events"`