X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fff00122490f49335f080be51e87a81be5aa8366..56d24085f9b5b2e1d0d0fd5ff8af0c905765ff04:/nominatim/tools/refresh.py?ds=inline diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py index 97e2e037..5aaee0c8 100644 --- a/nominatim/tools/refresh.py +++ b/nominatim/tools/refresh.py @@ -5,7 +5,7 @@ import json import logging from textwrap import dedent -from psycopg2.extras import execute_values +from psycopg2 import sql as pysql from nominatim.db.utils import execute_file from nominatim.db.sql_preprocessor import SQLPreprocessor @@ -49,7 +49,7 @@ def load_address_levels(conn, table, levels): _add_address_level_rows_from_entry(rows, entry) with conn.cursor() as cur: - cur.execute('DROP TABLE IF EXISTS {}'.format(table)) + cur.drop_table(table) cur.execute("""CREATE TABLE {} (country_code varchar(2), class TEXT, @@ -57,7 +57,8 @@ def load_address_levels(conn, table, levels): rank_search SMALLINT, rank_address SMALLINT)""".format(table)) - execute_values(cur, "INSERT INTO {} VALUES %s".format(table), rows) + cur.execute_values(pysql.SQL("INSERT INTO {} VALUES %s") + .format(pysql.Identifier(table)), rows) cur.execute('CREATE UNIQUE INDEX ON {} (country_code, class, type)'.format(table))