Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
ddc89029
Unverified
Commit
ddc89029
authored
Jan 26, 2024
by
Wei Zhang
Committed by
GitHub
Jan 26, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: use mysql to parse dsn (#2838)
Signed-off-by:
Zhang Wei
<
kweizh@gmail.com
>
parent
f8b9a83d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
12 deletions
+5
-12
mysql.go
store/db/mysql/mysql.go
+5
-12
No files found.
store/db/mysql/mysql.go
View file @
ddc89029
...
...
@@ -4,7 +4,6 @@ import (
"context"
"database/sql"
"fmt"
"net/url"
"github.com/go-sql-driver/mysql"
"github.com/pkg/errors"
...
...
@@ -24,9 +23,7 @@ func NewDB(profile *profile.Profile) (store.Driver, error) {
// Open MySQL connection with parameter.
// multiStatements=true is required for migration.
// See more in: https://github.com/go-sql-driver/mysql#multistatements
dsn
,
err
:=
mergeDSNWithParams
(
profile
.
DSN
,
map
[
string
]
string
{
"multiStatements"
:
"true"
,
})
dsn
,
err
:=
mergeDSN
(
profile
.
DSN
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -113,16 +110,12 @@ func (d *DB) Close() error {
return
d
.
db
.
Close
()
}
func
mergeDSN
WithParams
(
baseDSN
string
,
params
map
[
string
]
string
)
(
string
,
error
)
{
parsedDSN
,
err
:=
url
.
Parse
(
baseDSN
)
func
mergeDSN
(
baseDSN
string
)
(
string
,
error
)
{
config
,
err
:=
mysql
.
ParseDSN
(
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
config
.
MultiStatements
=
true
return
config
.
FormatDSN
(),
nil
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment