Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 05:36:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into markjh/SYN-513

Browse Source 
Conflicts:
	synapse/storage/tags.py
This commit is contained in:
Mark Haines 2015-11-09 15:01:59 +00:00
commit bbe10e8be7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/storage/search.py
View File

@ -154,7 +154,7 @@ class SearchStore(SQLBaseStore):
) )
elif isinstance(self.database_engine, Sqlite3Engine): elif isinstance(self.database_engine, Sqlite3Engine):
sql = ( 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" " topological_ordering, stream_ordering"
" FROM event_search" " FROM event_search"
" NATURAL JOIN events" " NATURAL JOIN events"