From ba6cdd875d37e450835a38eb1248d148753a8888 Mon Sep 17 00:00:00 2001 From: Robbe Haesendonck Date: Wed, 27 Sep 2023 09:24:04 +0200 Subject: [PATCH] Removed unused variable, fixed connection --- nominatim/clicmd/setup.py | 3 +-- nominatim/db/connection.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py index 49a9363d..626e3f2a 100644 --- a/nominatim/clicmd/setup.py +++ b/nominatim/clicmd/setup.py @@ -105,8 +105,7 @@ class SetupAll: rouser=args.config.DATABASE_WEBUSER) return 0 - if not args.prepare_database or \ - args.continue_at == 'import-from-file': + if args.continue_at == 'import-from-file': # Check if the correct plugins are installed database_import.check_existing_database_plugins(args.config.get_libpq_dsn()) LOG.warning('Setting up country tables') diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py index 51110f54..82801ae7 100644 --- a/nominatim/db/connection.py +++ b/nominatim/db/connection.py @@ -179,7 +179,7 @@ class Connection(psycopg2.extensions.connection): """ Return True if the hstore extension is loaded in the database. """ with self.cursor() as cur: - cur.execute('SELECT extname FROM pg_extension WHERE extname = %s', (extension_name)) + cur.execute('SELECT extname FROM pg_extension WHERE extname = %s', (extension_name, )) return cur.rowcount > 0 -- 2.39.5