changeset 2672:b997e1fd1d3d import-overview-rework

Fixed warning SQL prefix for selection.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 14 Mar 2019 17:29:36 +0100
parents 8f3facf902dd
children df2a31e8f257
files pkg/controllers/importqueue.go
diffstat 1 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go	Thu Mar 14 17:25:33 2019 +0100
+++ b/pkg/controllers/importqueue.go	Thu Mar 14 17:29:36 2019 +0100
@@ -34,13 +34,12 @@
 
 const (
 	warningSQLPrefix = `
-`
-	selectImportsSQL = `
 WITH warned AS (
   SELECT distinct(import_id) AS id
   FROM import.import_logs
   WHERE kind = 'warn'::log_type
-)
+)`
+	selectImportsSQL = warningSQLPrefix + `
 SELECT
   imports.id AS id,
   state::varchar,
@@ -53,6 +52,14 @@
 FROM import.imports
 WHERE
 `
+	selectBeforeSQL = warningSQLPrefix + `
+SELECT enqueued FROM import.imports
+WHERE
+`
+	selectAfterSQL = warningSQLPrefix + `
+SELECT enqueued FROM import.imports
+WHERE
+`
 	selectImportSummaySQL = `
 SELECT summary FROM import.imports WHERE id = $1`
 
@@ -74,16 +81,6 @@
 
 	deleteImportSQL = `
 DELETE FROM import.imports WHERE id = $1`
-
-	selectBeforeSQL = `
-SELECT enqueued FROM import.imports
-WHERE
-`
-
-	selectAfterSQL = `
-SELECT enqueued FROM import.imports
-WHERE
-`
 )
 
 func toInt8Array(txt string) *pgtype.Int8Array {