diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-12-20 12:14:08 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-12-20 12:14:08 +0000 |
| commit | 2998fa57b0b74b1c8483416cbf7c210292712550 (patch) | |
| tree | 71635309dabff5abecb70c120fa1b878979a586f /synapse/storage | |
| parent | Bump version and changelog (diff) | |
| parent | uncommitted changes on matrix.org (diff) | |
| download | synapse-github/hotfixes-v0.18.5.tar.xz | |
merge uncommitted changes from matrix.org into hotfixes-v0.18.5 github/hotfixes-v0.18.5 hotfixes-v0.18.5
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/event_push_actions.py | 4 | ||||
| -rw-r--r-- | synapse/storage/search.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py index 7de3e8c58c..1874737674 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -101,11 +101,11 @@ class EventPushActionsStore(SQLBaseStore): # notif=1 sql = ( "SELECT count(*)" - " FROM event_push_actions ea" + " FROM (SELECT * FROM event_push_actions" " WHERE" " user_id = ?" " AND room_id = ?" - " AND %s" + " AND %s LIMIT 100) as ea" ) % (lower_bound(token, self.database_engine, inclusive=False),) txn.execute(sql, (user_id, room_id)) diff --git a/synapse/storage/search.py b/synapse/storage/search.py index 8f2b3c4435..17c6c55714 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -600,7 +600,7 @@ def _parse_query(database_engine, search_term): results = re.findall(r"([\w\-]+)", search_term, re.UNICODE) if isinstance(database_engine, PostgresEngine): - return " & ".join(result + ":*" for result in results) + return " & ".join(result for result in results) elif isinstance(database_engine, Sqlite3Engine): return " & ".join(result + "*" for result in results) else: |