status-im
/
migrate
mirror of https://github.com/status-im/migrate.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update cockroachDB Txn signatures 

cockroach-go made a backwards-incompatible change to their transaction
function signatures, which was causing the cockroach instrumentation
to fail.

Updates the signature to match the cockraoch-go change.
This commit is contained in:
Taylor Wrobel 2017-08-10 22:56:41 -07:00
parent 8b5365e62c
commit 2c0f4f588e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
database/cockroachdb/cockroachdb.go
View File

@ -13,6 +13,7 @@ import (
"github.com/mattes/migrate/database"
"regexp"
"strconv"
"context"
)
func init() {
@ -142,7 +143,7 @@ func (c *CockroachDb) Close() error {
// Locking is done manually with a separate lock table. Implementing advisory locks in CRDB is being discussed
// See: https://github.com/cockroachdb/cockroach/issues/13546
func (c *CockroachDb) Lock() error {
err := crdb.ExecuteTx(c.db, func(tx *sql.Tx) error {
err := crdb.ExecuteTx(context.Background(), c.db, nil, func(tx *sql.Tx) error {
aid, err := database.GenerateAdvisoryLockId(c.config.DatabaseName)
if err != nil {
return err
@ -221,7 +222,7 @@ func (c *CockroachDb) Run(migration io.Reader) error {
}
func (c *CockroachDb) SetVersion(version int, dirty bool) error {
return crdb.ExecuteTx(c.db, func(tx *sql.Tx) error {
return crdb.ExecuteTx(context.Background(), c.db, nil, func(tx *sql.Tx) error {
if _, err := tx.Exec( `TRUNCATE "` + c.config.MigrationsTable + `"`); err != nil {
return err
}