Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[109] Fix: Cannot run a project if it does not have any DB migration #114

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[109] Fix: Cannot run a project if it does not have any DB migration #114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a0fb79
[109] Check if migration file exist before running migration
carryall Sep 29, 2023
4611bd3
[109] Improve prompt
carryall Oct 23, 2023
2cf02a4
[109] Add missing imports
carryall Oct 23, 2023
1183eb4
[109] Change condition
carryall Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions {{cookiecutter.app_name}}/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ env-teardown:

db/migrate:
make wait-for-postgres
goose -dir database/migrations -table "migration_versions" postgres "$(DATABASE_URL)" up
ifneq ("$(wildcard $(database/migrations/.keep))","")
goose -dir database/migrations -table "migration_versions" postgres "$(DATABASE_URL)" up
else
$(info NO migration files to run)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ifneq ("$(wildcard $(database/migrations/.keep))","")
goose -dir database/migrations -table "migration_versions" postgres "$(DATABASE_URL)" up
else
$(info NO migration files to run)
ifeq ("$(wildcard $(database/migrations/.keep))","")
$(info NO migration files to run)
else
goose -dir database/migrations -table "migration_versions" postgres "$(DATABASE_URL)" up

Not sure if that work, but can we use an ifeq so we don't need to process the negative form (if NOT X do A else B vs if X do B else A`)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works so changed in 1183eb4 🙌🏼

endif

db/rollback:
make wait-for-postgres
Expand All @@ -39,7 +43,7 @@ dev:

install-dependencies:
go install github.com/cosmtrek/[email protected]
go install github.com/pressly/goose/v3/cmd/goose@v3.9.0
go install github.com/pressly/goose/v3/cmd/goose@v3.15.0
go install github.com/ddollar/forego@latest
go mod tidy
npm install
Expand Down
21 changes: 18 additions & 3 deletions {{cookiecutter.app_name}}/database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (

var database *gorm.DB

const databaseDir = "database/migrations"

func InitDatabase(databaseURL string) {
db, err := gorm.Open(postgres.Open(databaseURL), &gorm.Config{})
if err != nil {
Expand All @@ -38,12 +40,25 @@ func migrateDB(db *gorm.DB) {
log.Fatalf("Failed to convert gormDB to sqlDB: %v", err)
}

err = goose.Up(sqlDB, "database/migrations", goose.WithAllowMissing())
if migrationFileExist() {
err = goose.Up(sqlDB, databaseDir, goose.WithAllowMissing())
if err != nil {
log.Fatalf("Failed to migrate database: %v", err)
carryall marked this conversation as resolved.
Show resolved Hide resolved
}

log.Println("Migrated database successfully.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
log.Println("Migrated database successfully.")
log.Println("Database migrated successfully.")

😇

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, changed in 4611bd3

} else {
log.Println("NO migration files")
}
}

func migrationFileExist() bool {
files, err := os.ReadDir(databaseDir)
if err != nil {
log.Fatalf("Failed to migrate database: %v", err)
log.Fatalf("Missing migration directory: %v", err)
}

log.Println("Migrated database successfully.")
return len(files) > 0 && files[0].Name() != ".keep"
}

func GetDB() *gorm.DB {
Expand Down
Loading