From b0bdde37fa7109ceb0aa626f0c5ce6927fb54512 Mon Sep 17 00:00:00 2001 From: Jack Philippi Date: Wed, 21 Aug 2024 16:53:39 +1000 Subject: [PATCH 1/3] Updated error message for inconsistent migrations --- migrate/migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrate/migrate.go b/migrate/migrate.go index 382a2dd..0b552c3 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -128,7 +128,7 @@ func FromFS(ctx context.Context, session gocqlx.Session, f fs.FS) error { for i := 0; i < len(dbm); i++ { if dbm[i].Name != fm[i] { - return fmt.Errorf("inconsistent migrations found, expected %q got %q at %d", fm[i], dbm[i].Name, i) + return fmt.Errorf("inconsistent migrations found, expected %q got %q at %d", dbm[i].Name, fm[i], i) } c, err := fileChecksum(f, fm[i]) if err != nil { From 52bc0e415e029e86c79e3f55ab4a095ff954b242 Mon Sep 17 00:00:00 2001 From: Jack Philippi Date: Wed, 21 Aug 2024 17:04:12 +1000 Subject: [PATCH 2/3] Fixed typo in error --- migrate/migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrate/migrate.go b/migrate/migrate.go index 0b552c3..b9329b6 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -135,7 +135,7 @@ func FromFS(ctx context.Context, session gocqlx.Session, f fs.FS) error { return fmt.Errorf("calculate checksum for %q: %s", fm[i], err) } if dbm[i].Checksum != c { - return fmt.Errorf("file %q was tempered with, expected md5 %s", fm[i], dbm[i].Checksum) + return fmt.Errorf("file %q was tampered with, expected md5 %s", fm[i], dbm[i].Checksum) } } From 71ed3ea2d7df78c65fb593a0877e620c1d8c9a4a Mon Sep 17 00:00:00 2001 From: Jack Philippi Date: Mon, 26 Aug 2024 16:50:46 +1000 Subject: [PATCH 3/3] Updated test to remove typo --- migrate/migrate_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrate/migrate_test.go b/migrate/migrate_test.go index 01ba037..2aaeb08 100644 --- a/migrate/migrate_test.go +++ b/migrate/migrate_test.go @@ -83,7 +83,7 @@ func TestMigration(t *testing.T) { f := makeTestFS(4) writeFile(f, 3, "SELECT * FROM bla;") - if err := migrate.FromFS(ctx, session, f); err == nil || !strings.Contains(err.Error(), "tempered") { + if err := migrate.FromFS(ctx, session, f); err == nil || !strings.Contains(err.Error(), "tampered") { t.Fatal("expected error") } else { t.Log(err)