mirror of
https://github.com/usememos/memos.git
synced 2025-06-05 22:09:59 +02:00
fix: merge mysql dsn with params
This commit is contained in:
@ -4,6 +4,7 @@ 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"
|
||||||
@ -23,9 +24,13 @@ 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 := fmt.Sprintf("%s?multiStatements=true", profile.DSN)
|
dsn, err := mergeDSNWithParams(profile.DSN, map[string]string{
|
||||||
|
"multiStatements": "true",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
var err error
|
|
||||||
driver := DB{profile: profile}
|
driver := DB{profile: profile}
|
||||||
driver.config, err = mysql.ParseDSN(dsn)
|
driver.config, err = mysql.ParseDSN(dsn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -104,3 +109,17 @@ func (d *DB) GetCurrentDBSize(ctx context.Context) (int64, error) {
|
|||||||
func (d *DB) Close() error {
|
func (d *DB) Close() error {
|
||||||
return d.db.Close()
|
return d.db.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func mergeDSNWithParams(baseDSN string, params map[string]string) (string, error) {
|
||||||
|
parsedDSN, err := url.Parse(baseDSN)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrapf(err, "failed to parse DSN: %s", baseDSN)
|
||||||
|
}
|
||||||
|
|
||||||
|
existingParams := parsedDSN.Query()
|
||||||
|
for key, value := range params {
|
||||||
|
existingParams.Add(key, value)
|
||||||
|
}
|
||||||
|
parsedDSN.RawQuery = existingParams.Encode()
|
||||||
|
return parsedDSN.String(), nil
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user