be more strict about removal from place_to_be_deleted

If the type of a place is changed and then the same insert issued
again, the old data will effectively remain in the table.

Fixed #3168.

diff --git a/lib-sql/functions/place_triggers.sql b/lib-sql/functions/place_triggers.sql
index 6a52021bb02d40f2a83ce4e71e88f0185b4efe41..3def65960215ddc3b72db2e7f52dfc1d45affd34 100644 (file)
--- a/lib-sql/functions/place_triggers.sql
+++ b/lib-sql/functions/place_triggers.sql
@@ -37,7 +37,7 @@ BEGIN
   -- Remove the place from the list of places to be deleted
   DELETE FROM place_to_be_deleted pdel
     WHERE pdel.osm_type = NEW.osm_type and pdel.osm_id = NEW.osm_id
   -- Remove the place from the list of places to be deleted
   DELETE FROM place_to_be_deleted pdel
     WHERE pdel.osm_type = NEW.osm_type and pdel.osm_id = NEW.osm_id

-          and pdel.class = NEW.class;
+          and pdel.class = NEW.class and pdel.type = NEW.type;

 
   -- Have we already done this place?
   SELECT * INTO existing
 
   -- Have we already done this place?
   SELECT * INTO existing