Merge pull request #10485 from ziggie1984/migration-kvdb-sql-payments-part1

payments: kv-to-sql migration (tests + wiring)

graph/db/migration1/test_sql.go

@@ -31,16 +31,15 @@ func (t *testBatchedSQLQueries) ExecTx(ctx context.Context,
 	if err != nil {
 		return err
 	}
-	defer func() {
-		if err != nil {
-			_ = tx.Rollback()
-		} else {
-			err = tx.Commit()
-		}
-	}()
 
 	reset()
 	queries := sqlc.New(tx)
 
-	return txBody(queries)
+	if err := txBody(queries); err != nil {
+		_ = tx.Rollback()
+
+		return err
+	}
+
+	return tx.Commit()
 }