refactor: migrations in migrations/sql

ItsNotGoodName · ItsNotGoodName · commit e7739c5e45da · 2023-09-13T22:42:45.000-07:00
diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ db-migration:
 	atlas migrate diff $(name) --env local
 
 db-migrate:
-	goose -dir migrations sqlite3 "$(DB_PATH)" up
+	goose -dir migrations/sql sqlite3 "$(DB_PATH)" up
 
 # Generation
 
diff --git a/atlas.hcl b/atlas.hcl
@@ -14,7 +14,7 @@ env "local" {
 
   migration {
     // URL where the migration directory resides.
-    dir = "file://migrations"
+    dir = "file://migrations/sql"
     // An optional format of the migration directory:
     // atlas (default) | flyway | liquibase | goose | golang-migrate | dbmate
     format = goose
diff --git a/migrations/atlas.sum b/migrations/atlas.sum
diff --git a/migrations/migrations.go b/migrations/migrations.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-//go:embed *.sql
+//go:embed sql/*.sql
 var migrations embed.FS
 
 func Migrate(db database.Querier) error {
@@ -20,7 +20,7 @@ func Migrate(db database.Querier) error {
 		return err
 	}
 
-	if err := goose.Up(db.Conn(), "."); err != nil {
+	if err := goose.Up(db.Conn(), "sql"); err != nil {
 		return err
 	}
 
diff --git a/migrations/sql/20230914054000_initial.sql b/migrations/sql/20230914054000_initial.sql
diff --git a/migrations/sql/atlas.sum b/migrations/sql/atlas.sum
@@ -0,0 +1,2 @@
+h1:LeQgvlh56kt/FcBSH9aMRKCf3cpFyBNaXyfa0QzZzDs=
+20230914054000_initial.sql h1:sLErXQyZGtS68lIer4uJhgjYKxSwOG93/KaK9OZ6YaY=

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/rs/zerolog/log"`
`11`	`11`	`)`
`12`	`12`
`13`		`-//go:embed *.sql`
	`13`	`+//go:embed sql/*.sql`
`14`	`14`	`var migrations embed.FS`
`15`	`15`
`16`	`16`	`func Migrate(db database.Querier) error {`
`@@ -20,7 +20,7 @@ func Migrate(db database.Querier) error {`
`20`	`20`	`return err`
`21`	`21`	`}`
`22`	`22`
`23`		`- if err := goose.Up(db.Conn(), "."); err != nil {`
	`23`	`+ if err := goose.Up(db.Conn(), "sql"); err != nil {`
`24`	`24`	`return err`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+h1:LeQgvlh56kt/FcBSH9aMRKCf3cpFyBNaXyfa0QzZzDs=`
	`2`	`+20230914054000_initial.sql h1:sLErXQyZGtS68lIer4uJhgjYKxSwOG93/KaK9OZ6YaY=`