Moved database migrations for MySQL dialect into approriate package.

2018-12-01 02:29:14 +05:00 · 2018-12-01 02:29:14 +05:00 · b6556d6e90
commit b6556d6e90
parent 400ce0db0c
7 changed files with 5 additions and 3 deletions
--- a/cmd/fastpastebin/fastpastebin.go
+++ b/cmd/fastpastebin/fastpastebin.go
@ -35,7 +35,6 @@ import (
 	"gitlab.com/pztrn/fastpastebin/captcha"
 	"gitlab.com/pztrn/fastpastebin/context"
 	"gitlab.com/pztrn/fastpastebin/database"
-	"gitlab.com/pztrn/fastpastebin/database/migrations"
 	"gitlab.com/pztrn/fastpastebin/pastes"
 	"gitlab.com/pztrn/fastpastebin/templater"
 )
@ -56,8 +55,6 @@ func main() {
 	c.LoadConfiguration()
 	database.New(c)
 	c.Database.Initialize()
-	migrations.New(c)
-	migrations.Migrate()
 	templater.Initialize(c)
 	api.New(c)
 	api.InitializeAPI()
--- a/database/dialects/mysql/migrations/1_initial.go
+++ b/database/dialects/mysql/migrations/1_initial.go
--- a/database/dialects/mysql/migrations/2_paste_lang.go
+++ b/database/dialects/mysql/migrations/2_paste_lang.go
--- a/database/dialects/mysql/migrations/3_private_pastes.go
+++ b/database/dialects/mysql/migrations/3_private_pastes.go
--- a/database/dialects/mysql/migrations/4_passworded_pastes.go
+++ b/database/dialects/mysql/migrations/4_passworded_pastes.go
--- a/database/dialects/mysql/migrations/exported.go
+++ b/database/dialects/mysql/migrations/exported.go
--- a/database/dialects/mysql/mysqldatabase.go
+++ b/database/dialects/mysql/mysqldatabase.go
@ -30,6 +30,7 @@ import (
 	"fmt"

 	// local
+	"gitlab.com/pztrn/fastpastebin/database/dialects/mysql/migrations"
 	"gitlab.com/pztrn/fastpastebin/pastes/model"

 	// other
@ -145,6 +146,10 @@ func (db *Database) Initialize() {

 	c.Logger.Info().Msg("Database connection established")
 	db.db = dbConn
+
+	// Perform migrations.
+	migrations.New(c)
+	migrations.Migrate()
 }

 func (db *Database) SavePaste(p *pastesmodel.Paste) (int64, error) {