# HG changeset patch # User Sascha L. Teichmann # Date 1543241047 -3600 # Node ID 89d013d55ec9e30b45116f785a79444ef5d9fe00 # Parent 58d41573e5302f6faabafc9f8f3dea59460f0bfd Fixed SQL in accepting/declining imports. diff -r 58d41573e530 -r 89d013d55ec9 pkg/controllers/importqueue.go --- a/pkg/controllers/importqueue.go Mon Nov 26 14:42:48 2018 +0100 +++ b/pkg/controllers/importqueue.go Mon Nov 26 15:04:07 2018 +0100 @@ -44,7 +44,7 @@ SELECT true FROM Waterway.imports WHERE id = $1` selectHasNoRunningImportSQL = ` -SELECT true FROM Waterway.imports +SELECT true FROM waterway.imports WHERE id = $1 AND state <> 'running'::waterway.import_state` selectImportLogsSQL = ` @@ -305,7 +305,9 @@ const ( isPendingSQL = ` -SELECT state = 'pending'::waterway.import_state, kind WHERE id = $1` +SELECT state = 'pending'::waterway.import_state, kind +FROM waterway.imports +WHERE id = $1` reviewSQL = ` UPDATE waterway.imports SET @@ -389,8 +391,6 @@ return } - if err = tx.Commit(); err != nil { - return - } + err = tx.Commit() return }