Updated database schema for full utf8 compatibility
Этот коммит содержится в:
@@ -35,6 +35,11 @@ func NewSqlPostStore(sqlStore *SqlStore) PostStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s SqlPostStore) UpgradeSchemaIfNeeded() {
|
func (s SqlPostStore) UpgradeSchemaIfNeeded() {
|
||||||
|
|
||||||
|
// These execs are for upgrading currently created databases to full utf8mb4 compliance
|
||||||
|
// Will be removed as seen fit for upgrading
|
||||||
|
s.GetMaster().Exec("ALTER TABLE Posts charset=utf8mb4")
|
||||||
|
s.GetMaster().Exec("ALTER TABLE Posts MODIFY COLUMN Message varchar(4000) CHARACTER SET utf8mb4")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s SqlPostStore) CreateIndexesIfNotExists() {
|
func (s SqlPostStore) CreateIndexesIfNotExists() {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import (
|
|||||||
sqltrace "log"
|
sqltrace "log"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
"time"
|
"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 {
|
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 {
|
if err != nil {
|
||||||
l4g.Critical("Failed to open sql connection to '%v' err:%v", dataSource, err)
|
l4g.Critical("Failed to open sql connection to '%v' err:%v", dataSource, err)
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
@@ -104,7 +112,7 @@ func setupConnection(con_type string, driver string, dataSource string, maxIdle
|
|||||||
if driver == "sqlite3" {
|
if driver == "sqlite3" {
|
||||||
dbmap = &gorp.DbMap{Db: db, TypeConverter: mattermConverter{}, Dialect: gorp.SqliteDialect{}}
|
dbmap = &gorp.DbMap{Db: db, TypeConverter: mattermConverter{}, Dialect: gorp.SqliteDialect{}}
|
||||||
} else if driver == "mysql" {
|
} 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 {
|
} else {
|
||||||
l4g.Critical("Failed to create dialect specific driver")
|
l4g.Critical("Failed to create dialect specific driver")
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user