Mercurial > gemma

changeset 4055:98e2041c7ebf historization_ng

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapted sr-import to new historization model.
author Sascha Wilde <wilde@intevation.de>
date Wed, 24 Jul 2019 18:16:27 +0200
parents 033a8e3fec8e
children 6bfe42f88638
files pkg/imports/sr.go pkg/models/sr.go
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/sr.go	Wed Jul 24 17:40:17 2019 +0200
+++ b/pkg/imports/sr.go	Wed Jul 24 18:16:27 2019 +0200
@@ -116,13 +116,11 @@
 	insertHullSQL = `
 INSERT INTO waterway.sounding_results (
   bottleneck_id,
-  bottleneck_validity,
   date_info,
   depth_reference,
   area
 ) SELECT
   bottleneck_id,
-  validity,
   $2::date,
   $3,
   (SELECT
@@ -190,7 +188,7 @@
 FROM waterway.gauges_reference_water_levels grwl
   JOIN waterway.bottlenecks bns
     ON grwl.location = bns.gauge_location
-      AND grwl.validity = bns.gauge_validity
+      AND grwl.validity @> CAST($2 AS timestamptz)
 WHERE bns.objnam = $1
   AND bns.validity @> CAST($2 AS timestamptz)
   AND grwl.depth_reference like 'LDC%'
--- a/pkg/models/sr.go	Wed Jul 24 17:40:17 2019 +0200
+++ b/pkg/models/sr.go	Wed Jul 24 18:16:27 2019 +0200
@@ -41,7 +41,7 @@
 SELECT EXISTS(SELECT 1
   FROM waterway.bottlenecks bn
     JOIN waterway.gauges g
-      ON bn.gauge_location = g.location AND bn.gauge_validity = g.validity
+      ON bn.gauge_location = g.location AND $3::timestamptz <@ g.validity
     JOIN waterway.gauges_reference_water_levels rl
       ON g.location = rl.location AND g.validity = rl.validity
   WHERE bn.objnam = $1
@@ -85,7 +85,8 @@
 		err = conn.QueryRowContext(ctx,
 			checkDepthReferenceSQL,
 			m.Bottleneck,
-			m.DepthReference).Scan(&b)
+			m.DepthReference,
+			m.Date.Time).Scan(&b)
 		switch {
 		case !b:
 			errs = append(errs,