# HG changeset patch # User Sascha Wilde # Date 1563981083 -7200 # Node ID 02d5c2e17eb8f31e85d72c0c033cf9e25322b18a # Parent 9072584b205fd07778176ca7f9b0ad8ddb0ecb36 Adapted surveys back end to new historization model. diff -r 9072584b205f -r 02d5c2e17eb8 pkg/controllers/surveys.go --- a/pkg/controllers/surveys.go Wed Jul 24 16:46:54 2019 +0200 +++ b/pkg/controllers/surveys.go Wed Jul 24 17:11:23 2019 +0200 @@ -32,9 +32,9 @@ g.objname AS gauge_objname, r.value AS waterlevel_value FROM waterway.bottlenecks AS b + JOIN waterway.sounding_results AS s ON b.bottleneck_id = s.bottleneck_id JOIN waterway.gauges AS g - ON b.gauge_location = g.location AND b.gauge_validity = g.validity - JOIN waterway.sounding_results AS s ON b.bottleneck_id = s.bottleneck_id + ON b.gauge_location = g.location AND s.date_info::timestamptz <@ g.validity LEFT JOIN waterway.gauges_reference_water_levels AS r ON s.depth_reference = r.depth_reference AND g.location = r.location AND g.validity = r.validity