diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-16 15:06:30 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-16 15:06:30 -0400 |
| commit | 65ded7c0133ae011a30546fb4fd1e00fc3179874 (patch) | |
| tree | 305c9655c581ba5c959d56cf801a96bf80683dd7 /internal/services | |
| parent | Update README (diff) | |
| download | cli-65ded7c0133ae011a30546fb4fd1e00fc3179874.zip | |
Update migration file format
Diffstat (limited to 'internal/services')
| -rw-r--r-- | internal/services/migration.go | 34 | ||||
| -rw-r--r-- | internal/services/migration_test.go | 37 |
2 files changed, 35 insertions, 36 deletions
diff --git a/internal/services/migration.go b/internal/services/migration.go index 10cc1b2..3b0f297 100644 --- a/internal/services/migration.go +++ b/internal/services/migration.go @@ -4,14 +4,12 @@ import ( "fmt" "sort" "strconv" - "strings" "time" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/output" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/bolt/internal/sqlparse" ) type MigrationService struct { @@ -118,21 +116,15 @@ func (ms MigrationService) ApplyMigration(migration *models.Migration) error { ), ) - scriptContents, err := ms.fsRepo.ReadUpgradeScript(migration) + upgradeScript, err := ms.fsRepo.ReadUpgradeScript(migration) if err != nil { - return err - } - - sqlParser := sqlparse.NewSqlParser() - execOptions, err := sqlParser.Parse(strings.NewReader(scriptContents)) - if err != nil { - return fmt.Errorf("unable to parse sql file for upgrade script: %w", err) + return fmt.Errorf("unable to read upgrade script: %w", err) } - if execOptions.UseTransaction { - err = ms.dbRepo.ApplyWithTx(scriptContents, migration) + if upgradeScript.Options.UseTransaction { + err = ms.dbRepo.ApplyWithTx(upgradeScript.Contents, migration) } else { - err = ms.dbRepo.Apply(scriptContents, migration) + err = ms.dbRepo.Apply(upgradeScript.Contents, migration) } if err != nil { @@ -225,21 +217,15 @@ func (ms MigrationService) RevertMigration(migration *models.Migration) error { migration.Message, ), ) - scriptContents, err := ms.fsRepo.ReadDowngradeScript(migration) - if err != nil { - return err - } - - sqlParser := sqlparse.NewSqlParser() - execOptions, err := sqlParser.Parse(strings.NewReader(scriptContents)) + downgradeScript, err := ms.fsRepo.ReadDowngradeScript(migration) if err != nil { - return fmt.Errorf("unable to parse sql file for downgrade script: %w", err) + return fmt.Errorf("unable to read downgrade script: %w", err) } - if execOptions.UseTransaction { - err = ms.dbRepo.RevertWithTx(scriptContents, migration) + if downgradeScript.Options.UseTransaction { + err = ms.dbRepo.RevertWithTx(downgradeScript.Contents, migration) } else { - err = ms.dbRepo.Revert(scriptContents, migration) + err = ms.dbRepo.Revert(downgradeScript.Contents, migration) } if err != nil { diff --git a/internal/services/migration_test.go b/internal/services/migration_test.go index db9448f..6828d28 100644 --- a/internal/services/migration_test.go +++ b/internal/services/migration_test.go @@ -8,6 +8,7 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" + "github.com/eugenetriguba/bolt/internal/sqlparse" "github.com/eugenetriguba/checkmate/assert" "github.com/eugenetriguba/checkmate/check" ) @@ -582,8 +583,11 @@ func TestCreateMigration_SequentialVersionIncrementsParsingErr(t *testing.T) { func TestApplyMigration_WithTransaction(t *testing.T) { migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadUpgradeScriptReturnValue: bolttest.ReadUpgradeScriptReturnValue{ - ScriptContents: "CREATE TABLE tmp(id INT PRIMARY KEY, id2 INT, id3 INT);", - Err: nil, + Script: sqlparse.MigrationScript{ + Contents: "CREATE TABLE tmp(id INT PRIMARY KEY, id2 INT, id3 INT);", + Options: sqlparse.ExecutionOptions{UseTransaction: true}, + }, + Err: nil, }, } @@ -609,8 +613,11 @@ func TestApplyMigration_WithTransaction(t *testing.T) { func TestApplyMigration_WithoutTransaction(t *testing.T) { migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadUpgradeScriptReturnValue: bolttest.ReadUpgradeScriptReturnValue{ - ScriptContents: "-- bolt: no-transaction\nCREATE TABLE tmp(id INT PRIMARY KEY, id2 INT, id3 INT);", - Err: nil, + Script: sqlparse.MigrationScript{ + Contents: "CREATE TABLE tmp(id INT PRIMARY KEY, id2 INT, id3 INT);", + Options: sqlparse.ExecutionOptions{UseTransaction: false}, + }, + Err: nil, }, } @@ -637,8 +644,8 @@ func TestApplyMigration_ReadUpgradeScriptErr(t *testing.T) { expectedErr := errors.New("error!") migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadUpgradeScriptReturnValue: bolttest.ReadUpgradeScriptReturnValue{ - ScriptContents: "", - Err: expectedErr, + Script: sqlparse.MigrationScript{}, + Err: expectedErr, }, } @@ -860,8 +867,11 @@ func TestApplyUpToVersion_AppliesMigrations(t *testing.T) { func TestRevertMigration_WithTransaction(t *testing.T) { migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadDowngradeScriptReturnValue: bolttest.ReadDowngradeScriptReturnValue{ - ScriptContents: "DROP TABLE tmp;", - Err: nil, + Script: sqlparse.MigrationScript{ + Contents: "DROP TABLE tmp;", + Options: sqlparse.ExecutionOptions{UseTransaction: true}, + }, + Err: nil, }, } @@ -887,8 +897,11 @@ func TestRevertMigration_WithTransaction(t *testing.T) { func TestRevertMigration_WithoutTransaction(t *testing.T) { migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadDowngradeScriptReturnValue: bolttest.ReadDowngradeScriptReturnValue{ - ScriptContents: "-- bolt: no-transaction\nDROP TABLE tmp;", - Err: nil, + Script: sqlparse.MigrationScript{ + Contents: "DROP TABLE tmp;", + Options: sqlparse.ExecutionOptions{UseTransaction: false}, + }, + Err: nil, }, } migrationDbRepo := &bolttest.MockMigrationDBRepo{ @@ -914,8 +927,8 @@ func TestRevertMigration_ReadUpgradeScriptErr(t *testing.T) { expectedErr := errors.New("error!") migrationFsRepo := &bolttest.MockMigrationFsRepo{ ReadDowngradeScriptReturnValue: bolttest.ReadDowngradeScriptReturnValue{ - ScriptContents: "", - Err: expectedErr, + Script: sqlparse.MigrationScript{}, + Err: expectedErr, }, } migrationDbRepo := &bolttest.MockMigrationDBRepo{} |