Mercurial > gemma

changeset 2661:542d3441c2d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring context.Context parameters to front.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 14 Mar 2019 18:31:59 +0100
parents 2b4b9fa9812c
children b219ca1514f4
files pkg/imports/misc.go pkg/imports/wa.go
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/misc.go	Thu Mar 14 18:26:00 2019 +0100
+++ b/pkg/imports/misc.go	Thu Mar 14 18:31:59 2019 +0100
@@ -31,8 +31,8 @@
 }
 
 func Savepoint(
+	ctx context.Context,
 	tx *sql.Tx,
-	ctx context.Context,
 	name string,
 ) error {
 	_, err := tx.ExecContext(ctx, "SAVEPOINT "+name)
@@ -40,8 +40,8 @@
 }
 
 func RollbackToSavepoint(
+	ctx context.Context,
 	tx *sql.Tx,
-	ctx context.Context,
 	name string,
 ) error {
 	_, err := tx.ExecContext(ctx, "ROLLBACK TO SAVEPOINT "+name)
@@ -49,8 +49,8 @@
 }
 
 func ReleaseSavepoint(
+	ctx context.Context,
 	tx *sql.Tx,
-	ctx context.Context,
 	name string,
 ) error {
 	_, err := tx.ExecContext(ctx, "RELEASE SAVEPOINT "+name)
--- a/pkg/imports/wa.go	Thu Mar 14 18:26:00 2019 +0100
+++ b/pkg/imports/wa.go	Thu Mar 14 18:31:59 2019 +0100
@@ -231,7 +231,7 @@
 				if err := json.Unmarshal(*feature.Geometry.Coordinates, &p); err != nil {
 					return err
 				}
-				if err := Savepoint(tx, ctx, featureSavepoint); err != nil {
+				if err := Savepoint(ctx, tx, featureSavepoint); err != nil {
 					return err
 				}
 				if _, err := insertStmt.ExecContext(
@@ -242,11 +242,11 @@
 					dirimp,
 				); err != nil {
 					feedback.Warn(handleError(err).Error())
-					if err = RollbackToSavepoint(tx, ctx, featureSavepoint); err != nil {
+					if err = RollbackToSavepoint(ctx, tx, featureSavepoint); err != nil {
 						return err
 					}
 				} else {
-					if err = ReleaseSavepoint(tx, ctx, featureSavepoint); err != nil {
+					if err = ReleaseSavepoint(ctx, tx, featureSavepoint); err != nil {
 						return err
 					}
 					features++