diff --git a/scripts/port_from_sqlite_to_postgres.py b/scripts/port_from_sqlite_to_postgres.py
index f98342db51..e7ed4c309b 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
)
@@ -725,6 +723,9 @@ if __name__ == "__main__":
postgres_config = yaml.safe_load(args.postgres_config)
+ if "database" in postgres_config:
+ postgres_config = postgres_config["database"]
+
if "name" not in postgres_config:
sys.stderr.write("Malformed database config: no 'name'")
sys.exit(2)
|