Mercurial > gemma

diff schema/geoserver_views.sql @ 4107:f572722d4e8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged historization_ng
author Sascha Wilde <wilde@intevation.de>
date Mon, 29 Jul 2019 15:59:09 +0200
parents 0ba3fc89b499
children a7196b55c064
line wrap: on
line diff
--- a/schema/geoserver_views.sql	Fri Jul 26 16:09:48 2019 +0200
+++ b/schema/geoserver_views.sql	Mon Jul 29 15:59:09 2019 +0200
@@ -121,12 +121,12 @@
         g.forecast_accuracy_1d
     FROM waterway.bottlenecks b
         LEFT JOIN waterway.gauges_base_view g
-            ON b.gauge_location = g.location AND b.gauge_validity = g.validity
+            ON b.gauge_location = g.location AND g.validity @> current_timestamp
         LEFT JOIN (SELECT DISTINCT ON (bottleneck_id)
                     bottleneck_id, date_info, critical
                 FROM waterway.fairway_availability
                 ORDER BY bottleneck_id, date_info DESC) AS fal
-            ON b.id = fal.bottleneck_id
+            ON b.bottleneck_id = fal.bottleneck_id
         LEFT JOIN (SELECT DISTINCT ON (bottleneck_id)
                     bottleneck_id, max(date_info) AS date_max
                 FROM waterway.sounding_results
@@ -218,4 +218,4 @@
             ON sd.subtrahend = srs.id
         JOIN waterway.bottlenecks bn
             ON srm.bottleneck_id = bn.bottleneck_id
-                AND srm.bottleneck_validity = bn.validity;
+                AND srm.date_info::timestamptz <@ bn.validity;