From f08c33e83482d6cd92cfad6c6e69355a62d6e1e9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 8 May 2015 13:29:00 +0100 Subject: Fix port_from_sqlite_to_postgres after changes to storage layer. --- scripts/port_from_sqlite_to_postgres.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/port_from_sqlite_to_postgres.py') 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 ) -- cgit 1.5.1 From 4fa0f53521546c5be48a3a94815203aff84c2639 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 8 May 2015 13:45:58 +0100 Subject: Support reading directly from a config --- scripts/port_from_sqlite_to_postgres.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/port_from_sqlite_to_postgres.py') diff --git a/scripts/port_from_sqlite_to_postgres.py b/scripts/port_from_sqlite_to_postgres.py index da25113093..e7ed4c309b 100755 --- a/scripts/port_from_sqlite_to_postgres.py +++ b/scripts/port_from_sqlite_to_postgres.py @@ -723,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) -- cgit 1.5.1