1 files changed, 36 insertions, 23 deletions

diff --git a/store/sql_store.go b/store/sql_store.go
index a0a1a9f23..2e4981e6b 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -24,6 +24,7 @@ import (
 	sqltrace "log"
 	"math/rand"
 	"os"
+	"strings"
 	"time"
 )
 
@@ -81,7 +82,14 @@ func NewSqlStore() Store {
 
 func setupConnection(con_type string, driver string, dataSource string, maxIdle int, maxOpen int, trace bool) *gorp.DbMap {
 
-	db, err := dbsql.Open(driver, dataSource)
+	charset := ""
+	if strings.Index(dataSource, "?") > -1 {
+		charset = "&charset=utf8mb4,utf8"
+	} else {
+		charset = "?charset=utf8mb4,utf8"
+	}
+
+	db, err := dbsql.Open(driver, dataSource+charset)
 	if err != nil {
 		l4g.Critical("Failed to open sql connection to '%v' err:%v", dataSource, err)
 		time.Sleep(time.Second)
@@ -104,7 +112,7 @@ func setupConnection(con_type string, driver string, dataSource string, maxIdle
 	if driver == "sqlite3" {
 		dbmap = &gorp.DbMap{Db: db, TypeConverter: mattermConverter{}, Dialect: gorp.SqliteDialect{}}
 	} else if driver == "mysql" {
-		dbmap = &gorp.DbMap{Db: db, TypeConverter: mattermConverter{}, Dialect: gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"}}
+		dbmap = &gorp.DbMap{Db: db, TypeConverter: mattermConverter{}, Dialect: gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8MB4"}}
 	} else {
 		l4g.Critical("Failed to create dialect specific driver")
 		time.Sleep(time.Second)
@@ -118,9 +126,9 @@ func setupConnection(con_type string, driver string, dataSource string, maxIdle
 	return dbmap
 }
 
-func (ss SqlStore) CreateColumnIfNotExists(tableName string, columnName string, afterName string, colType string, defaultValue string) bool {
+func (ss SqlStore) DoesColumnExist(tableName string, columnName string) bool {
 	count, err := ss.GetMaster().SelectInt(
-		`SELECT 
+		`SELECT
 		    COUNT(0) AS column_exists
 		FROM
 		    information_schema.COLUMNS
@@ -137,11 +145,15 @@ func (ss SqlStore) CreateColumnIfNotExists(tableName string, columnName string,
 		panic("Failed to check if column exists " + err.Error())
 	}
 
-	if count > 0 {
+	return count > 0
+}
+
+func (ss SqlStore) CreateColumnIfNotExists(tableName string, columnName string, afterName string, colType string, defaultValue string) bool {
+	if ss.DoesColumnExist(tableName, columnName) {
 		return false
 	}
 
-	_, err = ss.GetMaster().Exec("ALTER TABLE " + tableName + " ADD " + columnName + " " + colType + " DEFAULT '" + defaultValue + "'" + " AFTER " + afterName)
+	_, err := ss.GetMaster().Exec("ALTER TABLE " + tableName + " ADD " + columnName + " " + colType + " DEFAULT '" + defaultValue + "'" + " AFTER " + afterName)
 	if err != nil {
 		l4g.Critical("Failed to create column %v", err)
 		time.Sleep(time.Second)
@@ -152,31 +164,32 @@ func (ss SqlStore) CreateColumnIfNotExists(tableName string, columnName string,
 }
 
 func (ss SqlStore) RemoveColumnIfExists(tableName string, columnName string) bool {
-	count, err := ss.GetMaster().SelectInt(
-		`SELECT 
-		    COUNT(0) AS column_exists
-		FROM
-		    information_schema.COLUMNS
-		WHERE
-		    TABLE_SCHEMA = DATABASE()
-		        AND TABLE_NAME = ?
-		        AND COLUMN_NAME = ?`,
-		tableName,
-		columnName,
-	)
+	if !ss.DoesColumnExist(tableName, columnName) {
+		return false
+	}
+
+	_, err := ss.GetMaster().Exec("ALTER TABLE " + tableName + " DROP COLUMN " + columnName)
 	if err != nil {
-		l4g.Critical("Failed to check if column exists %v", err)
+		l4g.Critical("Failed to drop column %v", err)
 		time.Sleep(time.Second)
-		panic("Failed to check if column exists " + err.Error())
+		panic("Failed to drop column " + err.Error())
 	}
 
-	if count == 0 {
+	return true
+}
+
+func (ss SqlStore) RenameColumnIfExists(tableName string, oldColumnName string, newColumnName string, colType string) bool {
+	if !ss.DoesColumnExist(tableName, oldColumnName) {
 		return false
 	}
 
-	_, err = ss.GetMaster().Exec("ALTER TABLE " + tableName + " DROP COLUMN " + columnName)
+	_, err := ss.GetMaster().Exec("ALTER TABLE " + tableName + " CHANGE " + oldColumnName + " " + newColumnName + " " + colType)
+
+	// when we eventually support PostgreSQL, we can use the following instead
+	//_, err := ss.GetMaster().Exec("ALTER TABLE " + tableName + " RENAME COLUMN " + oldColumnName + " TO " + newColumnName)
+
 	if err != nil {
-		l4g.Critical("Failed to drop column %v", err)
+		l4g.Critical("Failed to rename column %v", err)
 		time.Sleep(time.Second)
 		panic("Failed to drop column " + err.Error())
 	}