summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-08 13:29:00 +0100
committerErik Johnston <erik@matrix.org>2015-05-08 13:29:00 +0100
commitf08c33e83482d6cd92cfad6c6e69355a62d6e1e9 (patch)
tree978ce4baa0a3476c6f487cdad307b4af995d458e
parentMerge branch 'release-v0.9.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-f08c33e83482d6cd92cfad6c6e69355a62d6e1e9.tar.xz
Fix port_from_sqlite_to_postgres after changes to storage layer.
-rwxr-xr-xscripts/port_from_sqlite_to_postgres.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/port_from_sqlite_to_postgres.py b/scripts/port_from_sqlite_to_postgres.py

index f98342db51..da25113093 100755 --- a/scripts/port_from_sqlite_to_postgres.py +++ b/scripts/port_from_sqlite_to_postgres.py
@@ -106,7 +106,7 @@ class Store(object): try: txn = conn.cursor() return func( - LoggingTransaction(txn, desc, self.database_engine), + LoggingTransaction(txn, desc, self.database_engine, []), *args, **kwargs ) except self.database_engine.module.DatabaseError as e: @@ -378,9 +378,7 @@ class Porter(object): for i, row in enumerate(rows): rows[i] = tuple( - self.postgres_store.database_engine.encode_parameter( - conv(j, col) - ) + conv(j, col) for j, col in enumerate(row) if j > 0 )