Merge branch 'master' into peak_doc

openmaptiles · Jul 21, 2020 · 6f778b3 · 6f778b3
2 parents 417e6be + dd1b2d3
commit 6f778b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/layers/water_name/update_water_lakeline.sql b/layers/water_name/update_water_lakeline.sql
@@ -66,7 +66,10 @@ BEGIN
     INSERT INTO osm_water_lakeline
     SELECT *
     FROM osm_water_lakeline_view
-    WHERE osm_water_lakeline_view.osm_id = NEW.osm_id;
+    WHERE osm_water_lakeline_view.osm_id = NEW.osm_id
+    -- May happen in case we replay update
+    ON CONFLICT ON CONSTRAINT osm_water_point_pk
+    DO NOTHING;
 
     RETURN NULL;
 END;

diff --git a/layers/water_name/update_water_point.sql b/layers/water_name/update_water_point.sql
@@ -66,7 +66,10 @@ BEGIN
     INSERT INTO osm_water_point
     SELECT *
     FROM osm_water_point_view
-    WHERE osm_water_point_view.osm_id = NEW.osm_id;
+    WHERE osm_water_point_view.osm_id = NEW.osm_id
+    -- May happen in case we replay update
+    ON CONFLICT ON CONSTRAINT osm_water_point_pk
+    DO NOTHING;
 
     RETURN NULL;
 END;