# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1563549389 -7200
# Node ID da3ab68875e1719b391deeecc108342ba494a7a5
# Parent  639bdb17c3f23a85fc65e40c25e33259edf93ea5
Fixed duplicates for historized bottlenecks in search.

Only find bottlenecks currently valid.

diff -r 639bdb17c3f2 -r da3ab68875e1 schema/search_functions.sql
--- a/schema/search_functions.sql	Fri Jul 19 16:59:25 2019 +0200
+++ b/schema/search_functions.sql	Fri Jul 19 17:16:29 2019 +0200
@@ -55,6 +55,7 @@
                  'bottleneck' AS type
             FROM waterway.bottlenecks
             WHERE objnam ILIKE '%' || search_string || '%'
+              AND validity @> 'now'::timestamptz
           ORDER BY name) r;
   RETURN _result;
 END;
diff -r 639bdb17c3f2 -r da3ab68875e1 schema/updates/1005/01.search-only-valid-bottleneck.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/updates/1005/01.search-only-valid-bottleneck.sql	Fri Jul 19 17:16:29 2019 +0200
@@ -0,0 +1,18 @@
+CREATE OR REPLACE FUNCTION search_bottlenecks(search_string text) RETURNS jsonb
+  LANGUAGE plpgsql STABLE PARALLEL SAFE
+  AS $$
+DECLARE
+  _result jsonb;
+BEGIN
+  SELECT COALESCE(json_agg(r),'[]')
+    INTO _result
+    FROM (SELECT objnam AS name,
+                 ST_AsGeoJSON(ST_Envelope(area::geometry))::json AS geom,
+                 'bottleneck' AS type
+            FROM waterway.bottlenecks
+            WHERE objnam ILIKE '%' || search_string || '%'
+              AND validity @> 'now'::timestamptz
+          ORDER BY name) r;
+  RETURN _result;
+END;
+$$;
diff -r 639bdb17c3f2 -r da3ab68875e1 schema/version.sql
--- a/schema/version.sql	Fri Jul 19 16:59:25 2019 +0200
+++ b/schema/version.sql	Fri Jul 19 17:16:29 2019 +0200
@@ -1,1 +1,1 @@
-INSERT INTO gemma_schema_version(version) VALUES (1004);
+INSERT INTO gemma_schema_version(version) VALUES (1005);