From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 14 Feb 2021 11:17:30 +0000 (+0100)
Subject: ignore failure to get replication date
X-Git-Tag: v3.7.0~37
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/fbe7be760be870189a15cc7ea7d7fc89e02a56b6

ignore failure to get replication date
---

diff --git a/nominatim/db/status.py b/nominatim/db/status.py
index 75da3c16..225638f4 100644
--- a/nominatim/db/status.py
+++ b/nominatim/db/status.py
@@ -40,13 +40,19 @@ def compute_database_date(conn):
 
 
 def set_status(conn, date, seq=None, indexed=True):
-    """ Replace the current status with the given status.
+    """ Replace the current status with the given status. If date is `None`
+        then only sequence and indexed will be updated as given. Otherwise
+        the whole status is replaced.
     """
-    assert date.tzinfo == dt.timezone.utc
+    assert date is None or date.tzinfo == dt.timezone.utc
     with conn.cursor() as cur:
-        cur.execute("TRUNCATE TABLE import_status")
-        cur.execute("""INSERT INTO import_status (lastimportdate, sequence_id, indexed)
-                       VALUES (%s, %s, %s)""", (date, seq, indexed))
+        if date is None:
+            cur.execute("UPDATE import_status set sequence_id = %s, indexed = %s",
+                        (seq, indexed))
+        else:
+            cur.execute("TRUNCATE TABLE import_status")
+            cur.execute("""INSERT INTO import_status (lastimportdate, sequence_id, indexed)
+                           VALUES (%s, %s, %s)""", (date, seq, indexed))
 
     conn.commit()
 
diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index cb201b1e..a3ef84fe 100644
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -119,6 +119,7 @@ def update(conn, options):
 
     # Write the current status to the file
     endstate = repl.get_state_info(endseq)
-    status.set_status(conn, endstate.timestamp, seq=endseq, indexed=False)
+    status.set_status(conn, endstate.timestamp if endstate else None,
+                      seq=endseq, indexed=False)
 
     return UpdateState.UP_TO_DATE
diff --git a/test/python/test_db_status.py b/test/python/test_db_status.py
index 399a0036..c6591471 100644
--- a/test/python/test_db_status.py
+++ b/test/python/test_db_status.py
@@ -65,7 +65,6 @@ def test_set_status_filled_table(status_table, temp_db_conn, temp_db_cursor):
 
     assert 1 == temp_db_cursor.scalar("SELECT count(*) FROM import_status")
 
-
     date = dt.datetime.fromordinal(1000100).replace(tzinfo=dt.timezone.utc)
     nominatim.db.status.set_status(temp_db_conn, date=date, seq=456, indexed=False)
 
@@ -75,6 +74,20 @@ def test_set_status_filled_table(status_table, temp_db_conn, temp_db_cursor):
     assert temp_db_cursor.fetchone() == [date, 456, False]
 
 
+def test_set_status_missing_date(status_table, temp_db_conn, temp_db_cursor):
+    date = dt.datetime.fromordinal(1000000).replace(tzinfo=dt.timezone.utc)
+    nominatim.db.status.set_status(temp_db_conn, date=date)
+
+    assert 1 == temp_db_cursor.scalar("SELECT count(*) FROM import_status")
+
+    nominatim.db.status.set_status(temp_db_conn, date=None, seq=456, indexed=False)
+
+    temp_db_cursor.execute("SELECT * FROM import_status")
+
+    assert temp_db_cursor.rowcount == 1
+    assert temp_db_cursor.fetchone() == [date, 456, False]
+
+
 def test_get_status_empty_table(status_table, temp_db_conn):
     assert nominatim.db.status.get_status(temp_db_conn) == (None, None, None)