YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use mysql to parse dsn (#2838)

Browse Source 
Signed-off-by: Zhang Wei <kweizh@gmail.com>
This commit is contained in:
Wei Zhang
2024-01-26 13:43:48 +08:00
committed by GitHub
parent f8b9a83d4a
commit ddc89029b7
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
store/db/mysql/mysql.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"database/sql" "database/sql"
"fmt" "fmt"
"net/url"
"github.com/go-sql-driver/mysql" "github.com/go-sql-driver/mysql"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -24,9 +23,7 @@ func NewDB(profile *profile.Profile) (store.Driver, error) {
// Open MySQL connection with parameter. // Open MySQL connection with parameter.
// multiStatements=true is required for migration. // multiStatements=true is required for migration.
// See more in: https://github.com/go-sql-driver/mysql#multistatements // See more in: https://github.com/go-sql-driver/mysql#multistatements
dsn, err := mergeDSNWithParams(profile.DSN, map[string]string{ dsn, err := mergeDSN(profile.DSN)
"multiStatements": "true",
})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -113,16 +110,12 @@ func (d *DB) Close() error {
return d.db.Close() return d.db.Close()
} }
func mergeDSNWithParams(baseDSN string, params map[string]string) (string, error) { func mergeDSN(baseDSN string) (string, error) {
parsedDSN, err := url.Parse(baseDSN) config, err := mysql.ParseDSN(baseDSN)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "failed to parse DSN: %s", baseDSN) return "", errors.Wrapf(err, "failed to parse DSN: %s", baseDSN)
} }
existingParams := parsedDSN.Query() config.MultiStatements = true
for key, value := range params { return config.FormatDSN(), nil
existingParams.Add(key, value)
}
parsedDSN.RawQuery = existingParams.Encode()
return parsedDSN.String(), nil
} }