From 2e86709e9d7c781da1da4fcdb9b47a4dfaadb545 Mon Sep 17 00:00:00 2001 From: Reese Norris Date: Sat, 2 Nov 2024 16:44:31 -0700 Subject: [PATCH] properly utilize mysql NewConfig() --- servercontext/servercontext.go | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/servercontext/servercontext.go b/servercontext/servercontext.go index f28f992..633a180 100644 --- a/servercontext/servercontext.go +++ b/servercontext/servercontext.go @@ -116,20 +116,16 @@ func New() *ServerContext { // Instantiate protocol validator protocol.V = validator.New(validator.WithRequiredStructEnabled()) + // Create SQL config + cfg := mysql.NewConfig() + cfg.User = server.config.MySQLUser + cfg.Passwd = server.config.MySQLPass + cfg.Net = server.config.MySQLNet + cfg.Addr = server.config.MySQLAddr + cfg.DBName = server.config.MySQLDBName + cfg.Params = map[string]string{"parseTime": "true"} + // Create SQL db - cfg := mysql.Config{ - User: server.config.MySQLUser, - Passwd: server.config.MySQLPass, - Net: server.config.MySQLNet, - Addr: server.config.MySQLAddr, - DBName: server.config.MySQLDBName, - Params: map[string]string{"parseTime": "true"}, - } - - if server.config.InMemoryDB { - cfg.AllowNativePasswords = true - } - var db *sql.DB var err error if db, err = sql.Open("mysql", cfg.FormatDSN()); err != nil {