Mercurial > gemma

changeset 4069:12f476e91c70 historization_ng

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapted bn-import to new historization model.
author Sascha Wilde <wilde@intevation.de>
date Thu, 25 Jul 2019 12:54:30 +0200
parents 76482935b6e5
children 4332b9e26e2f
files pkg/imports/bn.go
diffstat 1 files changed, 16 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/bn.go	Thu Jul 25 12:36:07 2019 +0200
+++ b/pkg/imports/bn.go	Thu Jul 25 12:54:30 2019 +0200
@@ -54,7 +54,6 @@
   bottleneck_id,
   validity,
   gauge_location,
-  gauge_validity,
   objnam,
   nobjnm,
   stretch,
@@ -66,11 +65,10 @@
   limiting,
   date_info,
   source_organization
-) SELECT
+) VALUES (
   $1,
-  validity * $2, -- intersections with gauge validity ranges
-  location,
-  validity,
+  $2::tstzrange,
+  isrs_fromText($3),
   $4,
   $5,
   (SELECT r FROM r),
@@ -86,8 +84,7 @@
   $12,
   $13,
   $14
-  FROM waterway.gauges
-  WHERE location = isrs_fromText($3) AND validity && $2
+)
 RETURNING id
 `
 
@@ -101,7 +98,6 @@
   bottleneck_id,
   validity,
   gauge_location,
-  gauge_validity,
   objnam,
   nobjnm,
   stretch,
@@ -113,11 +109,10 @@
   limiting,
   date_info,
   source_organization
-) = ( SELECT
+) = (
   $2,
-  validity * $3, -- intersections with gauge validity ranges
-  location,
-  validity,
+  $3::tstzrange,
+  isrs_fromText($4),
   $5,
   $6,
   (SELECT r FROM r),
@@ -133,8 +128,7 @@
   $13,
   $14::timestamptz,
   $15
-  FROM waterway.gauges
-  WHERE location = isrs_fromText($4) AND validity && $3 )
+)
 WHERE id=$1
 RETURNING id
 `
@@ -150,7 +144,6 @@
   bottleneck_id,
   validity,
   gauge_location,
-  gauge_validity,
   objnam,
   nobjnm,
   stretch,
@@ -164,9 +157,8 @@
   staging_done
 ) = ( SELECT
   $1,
-  validity * $2, -- intersections with gauge validity ranges
-  location,
-  validity,
+  $2::tstzrange,
+  isrs_fromText($3),
   $4,
   $5,
   (SELECT r FROM r),
@@ -178,8 +170,6 @@
   $13::timestamptz,
   $14,
   true
-  FROM waterway.gauges
-  WHERE location = isrs_fromText($3) AND validity && $2
 )
 `
 
@@ -189,14 +179,16 @@
   bottleneck_id,
   validity,
   staging_done
-) = ( SELECT
+) = (
   $1,
-  validity * $2, -- intersections with gauge validity ranges
+  $2::tstzrange,
   true
-  FROM waterway.gauges
-  WHERE location = isrs_fromText($3) AND validity && $2
 )
 `
+	// FIXME: Is this still neede wtih the new simplified historization
+	// model?  My intuition is: no it isn't and should be removed, but we
+	// should double check before doing so... [sw]
+	//
 	// Alignment with gauge validity might have generated new entries
 	// for the same time range. Thus, remove the old ones
 	deleteObsoleteBNSQL = `
@@ -531,7 +523,6 @@
 	err = findMatchingBNStmt.QueryRowContext(ctx,
 		bn.Bottleneck_id,
 		&validity,
-		bn.Fk_g_fid,
 	).Scan(&existing_bn_id)
 	switch {
 	case err == sql.ErrNoRows: