diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-14 18:05:31 +0100 |
| commit | d59acb8c5b7ff74b0045b1e4df0c79ce6f645004 (patch) | |
| tree | b7427c8e6cf1d48cab0341fbcbda307707e75338 /scripts | |
| parent | Also check the domains for membership state_keys (diff) | |
| parent | Merge pull request #265 from matrix-org/erikj/check_room_exists (diff) | |
| download | synapse-d59acb8c5b7ff74b0045b1e4df0c79ce6f645004.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/synapse_port_db | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db index e7ed4c309b..6aba72e459 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db @@ -29,7 +29,7 @@ import traceback import yaml -logger = logging.getLogger("port_from_sqlite_to_postgres") +logger = logging.getLogger("synapse_port_db") BOOLEAN_COLUMNS = { @@ -412,14 +412,17 @@ class Porter(object): self._convert_rows("sent_transactions", headers, rows) inserted_rows = len(rows) - max_inserted_rowid = max(r[0] for r in rows) + if inserted_rows: + max_inserted_rowid = max(r[0] for r in rows) - def insert(txn): - self.postgres_store.insert_many_txn( - txn, "sent_transactions", headers[1:], rows - ) + def insert(txn): + self.postgres_store.insert_many_txn( + txn, "sent_transactions", headers[1:], rows + ) - yield self.postgres_store.execute(insert) + yield self.postgres_store.execute(insert) + else: + max_inserted_rowid = 0 def get_start_id(txn): txn.execute( |