Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / db / properties.py

diff --git a/nominatim/db/properties.py b/nominatim/db/properties.py
index 9cc371fee22c0f9287b32a6c8985f890db6bef40..270204872dd56459691c4105156fe8073d6aa815 100644 (file)
--- a/nominatim/db/properties.py
+++ b/nominatim/db/properties.py
@@ -1,3 +1,9 @@
+# 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.

 """
 Query and access functions for the in-database property table.
 """
 """
 Query and access functions for the in-database property table.
 """


@@ -21,6 +27,9 @@ def get_property(conn, name):
     """ Return the current value of the given propery or None if the property
         is not set.
     """
     """ Return the current value of the given propery or None if the property
         is not set.
     """

+    if not conn.table_exists('nominatim_properties'):
+        return None
+

     with conn.cursor() as cur:
         cur.execute('SELECT value FROM nominatim_properties WHERE property = %s',
                     (name, ))
     with conn.cursor() as cur:
         cur.execute('SELECT value FROM nominatim_properties WHERE property = %s',
                     (name, ))