Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit 24b1569

Browse files
committed
Add -dev inside directory name
1 parent f1bb971 commit 24b1569

File tree

9 files changed

+40
-41
lines changed

9 files changed

+40
-41
lines changed

pkg/pgmodel/migrate.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,9 @@ func replaceSchemaNames(r io.ReadCloser) (string, error) {
361361
}
362362

363363
//A migration file is inside a directory that is a semver version number. The filename itself has the format
364-
//<migration file number)-<description>.sql. That file correspond to the semver of <dirname>-dev.<migration file number>
365-
//All app versions >= to that semver will include the migration file
364+
//<migration file number)-<description>.sql. That file correspond to the semver of <dirname>.<migration file number>
365+
//where the migration file number is always part of prerelease tag.
366+
//All app versions >= (inclusive) migration files's semver will include the migration file
366367
func (t *Migrator) getMigrationFileVersion(dirName string, fileName string) (*semver.Version, error) {
367368
var migrationFileNumber int
368369
matches := migrationFileNameRegexp.FindStringSubmatch(fileName)
@@ -378,16 +379,12 @@ func (t *Migrator) getMigrationFileVersion(dirName string, fileName string) (*se
378379
if err != nil {
379380
return nil, fmt.Errorf("unable to parse version from directory %v: %w", dirName, err)
380381
}
381-
devPrVersion, err := semver.NewPRVersion("dev")
382-
if err != nil {
383-
return nil, fmt.Errorf("unable to create dev PR version: %w", err)
384-
}
385382
migrationNumberPrVersion, err := semver.NewPRVersion(fmt.Sprintf("%d", migrationFileNumber))
386383
if err != nil {
387384
return nil, fmt.Errorf("unable to create dev PR version: %w", err)
388385
}
389386

390-
migrationFileVersion.Pre = append(migrationFileVersion.Pre, devPrVersion, migrationNumberPrVersion)
387+
migrationFileVersion.Pre = append(migrationFileVersion.Pre, migrationNumberPrVersion)
391388
return &migrationFileVersion, nil
392389
}
393390

pkg/pgmodel/test_migrations/migration_files_generated.go

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
INSERT INTO log VALUES('migration 0.10.1=1');
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
INSERT INTO log VALUES('migration 0.10.1=2');

0 commit comments

Comments
 (0)