Skip to content
Snippets Groups Projects
Commit 6c306e58 authored by Kevin Lyda's avatar Kevin Lyda :speech_balloon:
Browse files

Merge branch 'master' into microsoft

parents e441cd51 925bc7eb
No related branches found
No related tags found
No related merge requests found
...@@ -6,8 +6,8 @@ env: ...@@ -6,8 +6,8 @@ env:
- MYSQL_TEST="true" - MYSQL_TEST="true"
go: go:
- 1.8.4 - 1.10.3
- 1.9.1 - 1.9.7
- tip - tip
matrix: matrix:
......
...@@ -38,14 +38,12 @@ func NewSQLStore(c config.Database) (*SQLStore, error) { ...@@ -38,14 +38,12 @@ func NewSQLStore(c config.Database) (*SQLStore, error) {
if err != nil { if err != nil {
address = address + ":3306" address = address + ":3306"
} }
m := &mysql.Config{ m := mysql.NewConfig()
User: c["username"], m.User = c["username"]
Passwd: c["password"], m.Passwd = c["password"]
Net: "tcp", m.Addr = address
Addr: address, m.DBName = "certs"
DBName: "certs", m.ParseTime = true
ParseTime: true,
}
dsn = m.FormatDSN() dsn = m.FormatDSN()
case "sqlite": case "sqlite":
driver = "sqlite3" driver = "sqlite3"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment