From 7d2a400ece7d1669b30ea6b6ba44804627238c02 Mon Sep 17 00:00:00 2001 From: Greg Arakelian Date: Fri, 24 May 2019 22:00:02 -0400 Subject: [PATCH 1/3] Update database.go --- core/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/database.go b/core/database.go index 79955442e..f15e26b24 100644 --- a/core/database.go +++ b/core/database.go @@ -194,7 +194,7 @@ func (db *DbConfig) Connect(retry bool, location string) error { dbType = "sqlite3" case "mysql": host := fmt.Sprintf("%v:%v", Configs.DbHost, Configs.DbPort) - conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC", Configs.DbUser, Configs.DbPass, host, Configs.DbData) + conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=UTC", Configs.DbUser, Configs.DbPass, host, Configs.DbData) case "postgres": sslMode := "disable" if postgresSSL != "" { From 2cc526ead2ebcaec214da5cb75372e693be24351 Mon Sep 17 00:00:00 2001 From: Greg Arakelian Date: Fri, 24 May 2019 22:10:45 -0400 Subject: [PATCH 2/3] Update database.go --- core/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/database.go b/core/database.go index f15e26b24..c9ca0ee78 100644 --- a/core/database.go +++ b/core/database.go @@ -194,7 +194,7 @@ func (db *DbConfig) Connect(retry bool, location string) error { dbType = "sqlite3" case "mysql": host := fmt.Sprintf("%v:%v", Configs.DbHost, Configs.DbPort) - conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=UTC", Configs.DbUser, Configs.DbPass, host, Configs.DbData) + conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=%27UTC%27", Configs.DbUser, Configs.DbPass, host, Configs.DbData) case "postgres": sslMode := "disable" if postgresSSL != "" { From bc5edacc8eac2c7a6824b96f55c5ecd52b45b9da Mon Sep 17 00:00:00 2001 From: Greg Arakelian Date: Fri, 24 May 2019 23:25:22 -0400 Subject: [PATCH 3/3] Add escaping --- core/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/database.go b/core/database.go index c9ca0ee78..c565b8067 100644 --- a/core/database.go +++ b/core/database.go @@ -194,7 +194,7 @@ func (db *DbConfig) Connect(retry bool, location string) error { dbType = "sqlite3" case "mysql": host := fmt.Sprintf("%v:%v", Configs.DbHost, Configs.DbPort) - conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=%27UTC%27", Configs.DbUser, Configs.DbPass, host, Configs.DbData) + conn = fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8&parseTime=True&loc=UTC&time_zone=%%27UTC%%27", Configs.DbUser, Configs.DbPass, host, Configs.DbData) case "postgres": sslMode := "disable" if postgresSSL != "" {