diff options
| author | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
| commit | 9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch) | |
| tree | 3b231aab16688d64bc6e30561ddd42949c2ab727 /synapse/storage/events.py | |
| parent | Remove code that's now been obsoleted or moved elsewhere (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 5be5bc01b1..308a2c9b02 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1148,7 +1148,7 @@ class EventsStore(SQLBaseStore): upper_bound = current_forward_id sql = ( - "SELECT -event_stream_ordering FROM current_state_resets" + "SELECT event_stream_ordering FROM current_state_resets" " WHERE ? < event_stream_ordering" " AND event_stream_ordering <= ?" " ORDER BY event_stream_ordering ASC" @@ -1157,7 +1157,7 @@ class EventsStore(SQLBaseStore): state_resets = txn.fetchall() sql = ( - "SELECT -event_stream_ordering, event_id, state_group" + "SELECT event_stream_ordering, event_id, state_group" " FROM ex_outlier_stream" " WHERE ? > event_stream_ordering" " AND event_stream_ordering >= ?" |