Mercurial > gemma

comparison pkg/controllers/importqueue.go @ 1351:89d013d55ec9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed SQL in accepting/declining imports.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 26 Nov 2018 15:04:07 +0100
parents d753ce6cf588
children b0ebb77f4ab0
comparison
equal deleted inserted replaced
1350:58d41573e530 1351:89d013d55ec9
42 42
43 selectHasImportSQL = ` 43 selectHasImportSQL = `
44 SELECT true FROM Waterway.imports WHERE id = $1` 44 SELECT true FROM Waterway.imports WHERE id = $1`
45 45
46 selectHasNoRunningImportSQL = ` 46 selectHasNoRunningImportSQL = `
47 SELECT true FROM Waterway.imports 47 SELECT true FROM waterway.imports
48 WHERE id = $1 AND state <> 'running'::waterway.import_state` 48 WHERE id = $1 AND state <> 'running'::waterway.import_state`
49 49
50 selectImportLogsSQL = ` 50 selectImportLogsSQL = `
51 SELECT 51 SELECT
52 time, 52 time,
303 return 303 return
304 } 304 }
305 305
306 const ( 306 const (
307 isPendingSQL = ` 307 isPendingSQL = `
308 SELECT state = 'pending'::waterway.import_state, kind WHERE id = $1` 308 SELECT state = 'pending'::waterway.import_state, kind
309 FROM waterway.imports
310 WHERE id = $1`
309 311
310 reviewSQL = ` 312 reviewSQL = `
311 UPDATE waterway.imports SET 313 UPDATE waterway.imports SET
312 state = $1::waterway.import_state, 314 state = $1::waterway.import_state,
313 signer = $2 315 signer = $2
387 389
388 if _, err = tx.ExecContext(ctx, reviewSQL, state, who, id); err != nil { 390 if _, err = tx.ExecContext(ctx, reviewSQL, state, who, id); err != nil {
389 return 391 return
390 } 392 }
391 393
392 if err = tx.Commit(); err != nil { 394 err = tx.Commit()
393 return
394 }
395 return 395 return
396 } 396 }