-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix in the URL parser with go 1.12.8 and github.com/go-sql-driver/mysql #265
Merged
dhui
merged 6 commits into
golang-migrate:master
from
erikdubbelboer:fix-mysql-port-issue-264
Aug 17, 2019
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b5f8430
Fix in the URL parser with go 1.12.8 and github.com/go-sql-driver/mysql
erikdubbelboer 2e39eb9
The mysql driver itself also used net/url.Parse
erikdubbelboer 4b604b8
Also fix TestPasswordUnencodedReservedURLChars
erikdubbelboer 62106bd
Keep backwards compatibility with url encoded username and passwords
erikdubbelboer da4d8b3
Fix suggestions
erikdubbelboer 867c399
Reuse old function names
erikdubbelboer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,15 +74,14 @@ func schemeFromURL(url string) (string, error) { | |
return "", errEmptyURL | ||
} | ||
|
||
u, err := nurl.Parse(url) | ||
if err != nil { | ||
return "", err | ||
} | ||
if len(u.Scheme) == 0 { | ||
i := strings.Index(url, ":") | ||
|
||
// No : or : is the first character. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for the comment! |
||
if i < 1 { | ||
return "", errNoScheme | ||
} | ||
|
||
return u.Scheme, nil | ||
return url[0:i], nil | ||
} | ||
|
||
// FilterCustomQuery filters all query values starting with `x-` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did these tests break? My understanding is that the hostname/port parsing was fixed. I don't see any changes to
parseAuthority()
in the fix: golang/go@3226f2dThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see where it changed either but it did: https://play.golang.org/p/gQLxfWBQnQD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like these characters needed to be percent-encoded in the first place.
ABNF for authority part of an URI:
https://tools.ietf.org/html/rfc3986#appendix-A