X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4da4cbfe27a576ae011430b2de205c74435e241b..fd9437277e14e1911b2c011fb7dabf6fcbb2d8c4:/src/nominatim_db/tools/freeze.py?ds=inline diff --git a/src/nominatim_db/tools/freeze.py b/src/nominatim_db/tools/freeze.py index bd52ba9a..c4eedb43 100644 --- a/src/nominatim_db/tools/freeze.py +++ b/src/nominatim_db/tools/freeze.py @@ -10,9 +10,9 @@ Functions for removing unnecessary data from the database. from typing import Optional from pathlib import Path -from psycopg2 import sql as pysql +from psycopg import sql as pysql -from ..db.connection import Connection +from ..db.connection import Connection, drop_tables, table_exists UPDATE_TABLES = [ 'address_levels', @@ -39,9 +39,7 @@ def drop_update_tables(conn: Connection) -> None: + pysql.SQL(' or ').join(parts)) tables = [r[0] for r in cur] - for table in tables: - cur.drop_table(table, cascade=True) - + drop_tables(conn, *tables, cascade=True) conn.commit() @@ -55,4 +53,4 @@ def is_frozen(conn: Connection) -> bool: """ Returns true if database is in a frozen state """ - return conn.table_exists('place') is False + return table_exists(conn, 'place') is False