From b6556d6e907167e97919f6fc213d9a3e93f8dddc Mon Sep 17 00:00:00 2001
From: "Stanislav N. aka pztrn" <pztrn@pztrn.name>
Date: Sat, 1 Dec 2018 02:29:14 +0500
Subject: [PATCH] Moved database migrations for MySQL dialect into approriate
 package.

---
 cmd/fastpastebin/fastpastebin.go                             | 3 ---
 database/{ => dialects/mysql}/migrations/1_initial.go        | 0
 database/{ => dialects/mysql}/migrations/2_paste_lang.go     | 0
 database/{ => dialects/mysql}/migrations/3_private_pastes.go | 0
 .../{ => dialects/mysql}/migrations/4_passworded_pastes.go   | 0
 database/{ => dialects/mysql}/migrations/exported.go         | 0
 database/dialects/mysql/mysqldatabase.go                     | 5 +++++
 7 files changed, 5 insertions(+), 3 deletions(-)
 rename database/{ => dialects/mysql}/migrations/1_initial.go (100%)
 rename database/{ => dialects/mysql}/migrations/2_paste_lang.go (100%)
 rename database/{ => dialects/mysql}/migrations/3_private_pastes.go (100%)
 rename database/{ => dialects/mysql}/migrations/4_passworded_pastes.go (100%)
 rename database/{ => dialects/mysql}/migrations/exported.go (100%)

diff --git a/cmd/fastpastebin/fastpastebin.go b/cmd/fastpastebin/fastpastebin.go
index 78f4706..42294ff 100644
--- 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()
diff --git a/database/migrations/1_initial.go b/database/dialects/mysql/migrations/1_initial.go
similarity index 100%
rename from database/migrations/1_initial.go
rename to database/dialects/mysql/migrations/1_initial.go
diff --git a/database/migrations/2_paste_lang.go b/database/dialects/mysql/migrations/2_paste_lang.go
similarity index 100%
rename from database/migrations/2_paste_lang.go
rename to database/dialects/mysql/migrations/2_paste_lang.go
diff --git a/database/migrations/3_private_pastes.go b/database/dialects/mysql/migrations/3_private_pastes.go
similarity index 100%
rename from database/migrations/3_private_pastes.go
rename to database/dialects/mysql/migrations/3_private_pastes.go
diff --git a/database/migrations/4_passworded_pastes.go b/database/dialects/mysql/migrations/4_passworded_pastes.go
similarity index 100%
rename from database/migrations/4_passworded_pastes.go
rename to database/dialects/mysql/migrations/4_passworded_pastes.go
diff --git a/database/migrations/exported.go b/database/dialects/mysql/migrations/exported.go
similarity index 100%
rename from database/migrations/exported.go
rename to database/dialects/mysql/migrations/exported.go
diff --git a/database/dialects/mysql/mysqldatabase.go b/database/dialects/mysql/mysqldatabase.go
index d05379a..e1e3feb 100644
--- 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) {