From 9bcb9c1b16810c9e955cd7df699b483743e3eb79 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Fri, 29 Mar 2019 11:38:48 +0100
Subject: [PATCH] Fixed creating db engine

---
 pkg/db/db.go                    | 52 ++++++++++++++++++++-------------
 pkg/migration/20190324205606.go |  2 +-
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/pkg/db/db.go b/pkg/db/db.go
index 41ebb0fe9..69acda4ae 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -37,32 +37,42 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 
 	// Use Mysql if set
 	if viper.GetString("database.type") == "mysql" {
-		connStr := fmt.Sprintf(
-			"%s:%s@tcp(%s)/%s?charset=utf8&parseTime=true",
-			viper.GetString("database.user"),
-			viper.GetString("database.password"),
-			viper.GetString("database.host"),
-			viper.GetString("database.database"))
-		e, err := xorm.NewEngine("mysql", connStr)
-		e.SetMaxOpenConns(viper.GetInt("database.openconnections"))
-		return e, err
-	}
-
-	// Otherwise use sqlite
-	path := viper.GetString("database.path")
-	if path == "" {
-		path = "./db.db"
-	}
-
-	engine, err = xorm.NewEngine("sqlite3", path)
-	if err != nil {
-		return nil, err
+		engine, err = initMysqlEngine()
+		if err != nil {
+			return
+		}
+	} else {
+		// Otherwise use sqlite
+		engine, err = initSqliteEngine()
+		if err != nil {
+			return
+		}
 	}
 
 	engine.SetMapper(core.GonicMapper{})
-
 	engine.ShowSQL(viper.GetString("log.database") != "off")
 	engine.SetLogger(xorm.NewSimpleLogger(log.GetLogWriter("database")))
 
 	return
 }
+
+func initMysqlEngine() (engine *xorm.Engine, err error) {
+	connStr := fmt.Sprintf(
+		"%s:%s@tcp(%s)/%s?charset=utf8&parseTime=true",
+		viper.GetString("database.user"),
+		viper.GetString("database.password"),
+		viper.GetString("database.host"),
+		viper.GetString("database.database"))
+	engine, err = xorm.NewEngine("mysql", connStr)
+	engine.SetMaxOpenConns(viper.GetInt("database.openconnections"))
+	return
+}
+
+func initSqliteEngine() (engine *xorm.Engine, err error) {
+	path := viper.GetString("database.path")
+	if path == "" {
+		path = "./db.db"
+	}
+
+	return xorm.NewEngine("sqlite3", path)
+}
diff --git a/pkg/migration/20190324205606.go b/pkg/migration/20190324205606.go
index b5e5b9a8d..6c2f3739e 100644
--- a/pkg/migration/20190324205606.go
+++ b/pkg/migration/20190324205606.go
@@ -33,7 +33,7 @@ func (tasksReminderDateMigration20190324205606) TableName() string {
 func init() {
 	migrations = append(migrations, &xormigrate.Migration{
 		ID:          "20190324205606",
-		Description: "Remove reminder_unix from tasks",
+		Description: "Remove reminders_unix from tasks",
 		Migrate: func(tx *xorm.Engine) error {
 			return dropTableColum(tx, "tasks", "reminders_unix")
 		},