From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 4 Apr 2023 09:09:17 +0000 (+0200)
Subject: use place_to_be_deleted when force deleting objects
X-Git-Tag: v4.3.0~82
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b8a73192128b162ea32bf2f622875a543a39d955?ds=inline;hp=--cc

use place_to_be_deleted when force deleting objects
---

b8a73192128b162ea32bf2f622875a543a39d955
diff --git a/lib-sql/functions/utils.sql b/lib-sql/functions/utils.sql
index ad262670..f5be7b61 100644
--- a/lib-sql/functions/utils.sql
+++ b/lib-sql/functions/utils.sql
@@ -429,9 +429,10 @@ BEGIN
   SELECT osm_type, osm_id, class, type FROM placex WHERE place_id = placeid INTO osmtype, osmid, pclass, ptype;
   DELETE FROM import_polygon_delete where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype;
   DELETE FROM import_polygon_error where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype;
-  -- force delete from place/placex by making it a very small geometry
-  UPDATE place set geometry = ST_SetSRID(ST_Point(0,0), 4326) where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype;
-  DELETE FROM place where osm_type = osmtype and osm_id = osmid and class = pclass and type = ptype;
+  -- force delete by directly entering it into the to-be-deleted table
+  INSERT INTO place_to_be_deleted (osm_type, osm_id, class, type, deferred)
+         VALUES(osmtype, osmid, pclass, ptype, false);
+  PERFORM flush_deleted_places();
 
   RETURN TRUE;
 END;