diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
| commit | 4ad613f6be7211edf4b39d7b031bc7d2947d8297 (patch) | |
| tree | d3e1835e7d3f5694098d06b093edcf2cd7d0e60f /synapse/storage/prepare_database.py | |
| parent | Correctly look up key (diff) | |
| parent | Merge pull request #2037 from ricco386/fix_readme_centos_issues (diff) | |
| download | synapse-4ad613f6be7211edf4b39d7b031bc7d2947d8297.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
Diffstat (limited to 'synapse/storage/prepare_database.py')
| -rw-r--r-- | synapse/storage/prepare_database.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index ed84db6b4b..6e623843d5 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -356,7 +356,7 @@ def _get_or_create_schema_state(txn, database_engine): ), (current_version,) ) - applied_deltas = [d for d, in txn.fetchall()] + applied_deltas = [d for d, in txn] return current_version, applied_deltas, upgraded return None |