diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
| commit | 6e80c03d45c3d09a7e7457f58beff69f14034964 (patch) | |
| tree | 06d05072f93e410dbccba1437d7fd5a545c10b86 /synapse/storage/appservice.py | |
| parent | Explicit join (diff) | |
| parent | Merge pull request #1032 from matrix-org/matthew/workerdoc (diff) | |
| download | synapse-6e80c03d45c3d09a7e7457f58beff69f14034964.tar.xz | |
Merge branch 'develop' into dbkr/notifications_api
Diffstat (limited to 'synapse/storage/appservice.py')
| -rw-r--r-- | synapse/storage/appservice.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py index b496b918b7..a854a87eab 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py @@ -366,8 +366,11 @@ class ApplicationServiceTransactionStore(SQLBaseStore): def get_new_events_for_appservice_txn(txn): sql = ( "SELECT e.stream_ordering, e.event_id" - " FROM events AS e, appservice_stream_position AS a" - " WHERE a.stream_ordering < e.stream_ordering AND e.stream_ordering <= ?" + " FROM events AS e" + " WHERE" + " (SELECT stream_ordering FROM appservice_stream_position)" + " < e.stream_ordering" + " AND e.stream_ordering <= ?" " ORDER BY e.stream_ordering ASC" " LIMIT ?" ) |