Mercurial > gemma
changeset 1351:89d013d55ec9
Fixed SQL in accepting/declining imports.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 26 Nov 2018 15:04:07 +0100 |
| parents | 58d41573e530 |
| children | d524d6f54f87 |
| files | pkg/controllers/importqueue.go |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 }