skip wikipedia table test on reverse-only installations

[nominatim.git] / nominatim / tools / freeze.py

diff --git a/nominatim/tools/freeze.py b/nominatim/tools/freeze.py
index cc1bf97e09a92556cc1cc79cd47cfe03e605181c..e502c963de414a80c4f525d7c72e128ceaffd532 100644 (file)
--- a/nominatim/tools/freeze.py
+++ b/nominatim/tools/freeze.py
@@ -1,8 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Functions for removing unnecessary data from the database.
 """
 from pathlib import Path
 
 """
 Functions for removing unnecessary data from the database.
 """
 from pathlib import Path
 

+from psycopg2 import sql as pysql
+

 UPDATE_TABLES = [
     'address_levels',
     'gb_postcode',
 UPDATE_TABLES = [
     'address_levels',
     'gb_postcode',


@@ -21,15 +29,15 @@ def drop_update_tables(conn):
     """ Drop all tables only necessary for updating the database from
         OSM replication data.
     """
     """ Drop all tables only necessary for updating the database from
         OSM replication data.
     """

-
-    where = ' or '.join(["(tablename LIKE '{}')".format(t) for t in UPDATE_TABLES])
+    parts = (pysql.SQL("(tablename LIKE {})").format(pysql.Literal(t)) for t in UPDATE_TABLES)

 
     with conn.cursor() as cur:
 
     with conn.cursor() as cur:

-        cur.execute("SELECT tablename FROM pg_tables WHERE " + where)
+        cur.execute(pysql.SQL("SELECT tablename FROM pg_tables WHERE ")
+                    + pysql.SQL(' or ').join(parts))

         tables = [r[0] for r in cur]
 
         for table in tables:
         tables = [r[0] for r in cur]
 
         for table in tables:

-            cur.execute('DROP TABLE IF EXISTS "{}" CASCADE'.format(table))
+            cur.drop_table(table, cascade=True)

 
     conn.commit()
 
 
     conn.commit()