diff options
| author | Eugene Triguba <hello@eugenetriguba.com> | 2026-11-13 22:13:14 -0800 |
|---|---|---|
| committer | Eugene Triguba <hello@eugenetriguba.com> | 2026-11-13 22:13:14 -0800 |
| commit | 9656e14fc758053f34f5cb0e906093e2a18f6162 (patch) | |
| tree | 3d7799305de92be6a09bcd12c29fe0843b7b8cab /internal/repositories | |
| parent | Remove migration dependencies (diff) | |
| download | cli-9656e14fc758053f34f5cb0e906093e2a18f6162.zip | |
Remove timestamp version style in favor of always using sequential
Diffstat (limited to 'internal/repositories')
| -rw-r--r-- | internal/repositories/migration_db_repo_test.go | 17 | ||||
| -rw-r--r-- | internal/repositories/migration_fs_repo.go | 6 | ||||
| -rw-r--r-- | internal/repositories/migration_fs_repo_test.go | 29 |
3 files changed, 23 insertions, 29 deletions
diff --git a/internal/repositories/migration_db_repo_test.go b/internal/repositories/migration_db_repo_test.go index 8098e03..6787d3d 100644 --- a/internal/repositories/migration_db_repo_test.go +++ b/internal/repositories/migration_db_repo_test.go @@ -4,7 +4,6 @@ import ( "database/sql" "errors" "testing" - "time" "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" "git.sr.ht/~eugenetriguba/bolt/internal/models" @@ -181,7 +180,7 @@ func TestApply(t *testing.T) { repo, err := repositories.NewMigrationDBRepo("bolt_migrations", testdb) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") err = repo.Apply(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`, migration) assert.Nil(t, err) assert.Equal(t, migration.Applied, true) @@ -198,7 +197,7 @@ func TestApply_MalformedSql(t *testing.T) { db := bolttest.NewTestDB(t) repo, err := repositories.NewMigrationDBRepo("bolt_migrations", db) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") err = repo.Apply("this is not SQL", migration) @@ -210,7 +209,7 @@ func TestApplyWithTx_ExecErr(t *testing.T) { db := bolttest.NewTestDB(t) repo, err := repositories.NewMigrationDBRepo("bolt_migrations", db) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") err = repo.ApplyWithTx("SELECT 1 FROM abc123donotexist;", migration) @@ -222,7 +221,7 @@ func TestApplyWithTx_SuccessfullyApplied(t *testing.T) { repo, err := repositories.NewMigrationDBRepo("bolt_migrations", testdb) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") err = repo.ApplyWithTx(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`, migration) assert.Nil(t, err) assert.Equal(t, migration.Applied, true) @@ -243,7 +242,7 @@ func TestRevert(t *testing.T) { _, err = testdb.Exec(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") _, err = testdb.Exec( "INSERT INTO bolt_migrations(version) VALUES(?)", migration.Version, @@ -268,7 +267,7 @@ func TestRevert_MalformedSql(t *testing.T) { db := bolttest.NewTestDB(t) repo, err := repositories.NewMigrationDBRepo("bolt_migrations", db) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") migration.Applied = true err = repo.Revert("this is not SQL", migration) @@ -280,7 +279,7 @@ func TestRevertWithTx_ExecErr(t *testing.T) { db := bolttest.NewTestDB(t) repo, err := repositories.NewMigrationDBRepo("bolt_migrations", db) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") err = repo.RevertWithTx("DROP TABLE abc123donotexist;", migration) @@ -295,7 +294,7 @@ func TestRevertWithTx_SuccessfullyReverted(t *testing.T) { _, err = testdb.Exec(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "test") + migration := models.NewMigration(1, "test") _, err = testdb.Exec( "INSERT INTO bolt_migrations(version) VALUES(?)", migration.Version, diff --git a/internal/repositories/migration_fs_repo.go b/internal/repositories/migration_fs_repo.go index 72057ec..b328c90 100644 --- a/internal/repositories/migration_fs_repo.go +++ b/internal/repositories/migration_fs_repo.go @@ -90,11 +90,13 @@ func (mr migrationFsRepo) List() (map[string]*models.Migration, error) { if err != nil { return nil, err } - _, exists := migrations[migration.Version] + existing, exists := migrations[migration.Version] if exists { return nil, fmt.Errorf( - "%w: a local migration file with version %s already exists", + "%w: %s and %s both have version %s; renumber one of them", ErrMigrationVersionConflict, + existing.Name(), + migration.Name(), migration.Version, ) } diff --git a/internal/repositories/migration_fs_repo_test.go b/internal/repositories/migration_fs_repo_test.go index 7625c06..c3c71c4 100644 --- a/internal/repositories/migration_fs_repo_test.go +++ b/internal/repositories/migration_fs_repo_test.go @@ -5,7 +5,6 @@ import ( "os" "path/filepath" "testing" - "time" "git.sr.ht/~eugenetriguba/bolt/internal/configloader" "git.sr.ht/~eugenetriguba/bolt/internal/models" @@ -54,7 +53,7 @@ func TestCreate_SuccessfullyCreated(t *testing.T) { migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "add users table") + migration := models.NewMigration(1, "add users table") err = repo.Create(migration) assert.Nil(t, err) @@ -68,7 +67,7 @@ func TestCreate_FailsToCreateMigration(t *testing.T) { &configloader.MigrationsConfig{DirectoryPath: tempDir}, ) assert.Nil(t, err) - migration := models.NewTimestampMigration(time.Now(), "add users table") + migration := models.NewMigration(1, "add users table") _, err = os.OpenFile( filepath.Join(tempDir, fmt.Sprintf("%s.sql", migration.Name())), os.O_CREATE, @@ -88,7 +87,7 @@ func TestReadUpgradeScript_SuccessfullyRead(t *testing.T) { repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration := models.NewSequentialMigration(1, "add users table") + migration := models.NewMigration(1, "add users table") err = repo.Create(migration) assert.Nil(t, err) @@ -109,7 +108,7 @@ func TestReadUpgradeScript_FileDoesNotExist(t *testing.T) { migrationsConfig := configloader.MigrationsConfig{DirectoryPath: t.TempDir()} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration := models.NewSequentialMigration(1, "add users table") + migration := models.NewMigration(1, "add users table") _, err = repo.ReadUpgradeScript(migration) @@ -123,7 +122,7 @@ func TestReadDowngradeScript_SuccessfullyRead(t *testing.T) { repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration := models.NewSequentialMigration(1, "add users table") + migration := models.NewMigration(1, "add users table") err = repo.Create(migration) assert.Nil(t, err) @@ -144,7 +143,7 @@ func TestReadDowngradeScript_FileDoesNotExist(t *testing.T) { migrationsConfig := configloader.MigrationsConfig{DirectoryPath: t.TempDir()} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration := models.NewSequentialMigration(1, "add users table") + migration := models.NewMigration(1, "add users table") _, err = repo.ReadDowngradeScript(migration) @@ -158,14 +157,8 @@ func TestList_Success(t *testing.T) { repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration1 := models.NewTimestampMigration( - time.Date(2020, 10, 12, 1, 1, 1, 1, time.UTC), - "migration_1", - ) - migration2 := models.NewTimestampMigration( - time.Date(2022, 10, 12, 1, 1, 1, 1, time.UTC), - "migration_2", - ) + migration1 := models.NewMigration(1, "migration_1") + migration2 := models.NewMigration(2, "migration_2") err = repo.Create(migration1) assert.Nil(t, err) repo.Create(migration2) @@ -215,8 +208,8 @@ func TestList_DuplicateMigrationVersion(t *testing.T) { migrationsConfig := configloader.MigrationsConfig{DirectoryPath: migrationsDir} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.Nil(t, err) - migration1 := models.NewSequentialMigration(1, "migration_1") - migration2 := models.NewSequentialMigration(1, "migration_2") + migration1 := models.NewMigration(1, "migration_1") + migration2 := models.NewMigration(1, "migration_2") err = repo.Create(migration1) assert.Nil(t, err) repo.Create(migration2) @@ -228,6 +221,6 @@ func TestList_DuplicateMigrationVersion(t *testing.T) { assert.ErrorContains( t, err, - "a local migration file with version 001 already exists", + "001_migration_1 and 001_migration_2 both have version 001; renumber one of them", ) } |