Skip to content

Commit

Permalink
Update mysql dsn parser
Browse files Browse the repository at this point in the history
to parse passwords with special characters properly
  • Loading branch information
viktorstrate committed Feb 26, 2021
1 parent e1ad587 commit 43f89d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
21 changes: 10 additions & 11 deletions api/database/database.go
Expand Up @@ -12,30 +12,29 @@ import (
"github.com/photoview/photoview/api/utils"
"github.com/pkg/errors"

"gorm.io/driver/mysql"
"github.com/go-sql-driver/mysql"
gorm_mysql "gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)

func getMysqlAddress() (*url.URL, error) {
func getMysqlAddress() (string, error) {
addressString := utils.EnvMysqlURL.GetValue()
if addressString == "" {
return nil, errors.New(fmt.Sprintf("Environment variable %s missing, exiting", utils.EnvMysqlURL.GetName()))
return "", errors.New(fmt.Sprintf("Environment variable %s missing, exiting", utils.EnvMysqlURL.GetName()))
}

address, err := url.Parse(addressString)
config, err := mysql.ParseDSN(addressString)
if err != nil {
return nil, errors.Wrap(err, "Could not parse mysql url")
return "", errors.Wrap(err, "Could not parse mysql url")
}

queryValues := address.Query()
queryValues.Add("multiStatements", "true")
queryValues.Add("parseTime", "true")
config.MultiStatements = true
config.ParseTime = true

address.RawQuery = queryValues.Encode()
return address, nil
return config.FormatDSN(), nil
}

func getPostgresAddress() (*url.URL, error) {
Expand Down Expand Up @@ -83,7 +82,7 @@ func configureDatabase(config *gorm.Config) (*gorm.DB, error) {
return nil, err
}
log.Printf("Connecting to MYSQL database: %s", mysqlAddress)
databaseDialect = mysql.Open(mysqlAddress.String())
databaseDialect = gorm_mysql.Open(mysqlAddress)

case drivers.DatabaseDriverSqlite:
sqliteAddress, err := getSqliteAddress()
Expand Down
1 change: 1 addition & 0 deletions api/go.mod
Expand Up @@ -7,6 +7,7 @@ require (
github.com/Kagami/go-face v0.0.0-20200825065730-3dd2d74dccfb
github.com/agnivade/levenshtein v1.1.0 // indirect
github.com/disintegration/imaging v1.6.2
github.com/go-sql-driver/mysql v1.5.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
Expand Down

0 comments on commit 43f89d1

Please sign in to comment.