Let database.Open() use schemeFromURL as well #271
Merged
Conversation
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
Otherwise it will fail on MySQL DSNs. Moved schemeFromURL into the database package. Also removed databaseSchemeFromURL and sourceSchemeFromURL as they were just calling schemeFromURL. Fixes golang-migrate#265 (comment)
dhui
requested changes
Aug 18, 2019
There was a problem hiding this comment.
Thanks @lou-lan for the report and @erikdubbelboer for the fix!
| var errNoScheme = errors.New("no scheme") | ||
| var errEmptyURL = errors.New("URL cannot be empty") | ||
|
|
||
| func sourceSchemeFromURL(url string) (string, error) { |
There was a problem hiding this comment.
Thanks for cleaning up this code! e.g. removing sourceSchemeFromURL and databaseSchemeFromURL
|
FYI, builds have been fixed and I'm able to merge master into your repo/branch so I did so. Just be aware of that when you're addressing the PR comments. |
Also merged the test cases.
Pull Request Test Coverage Report for Build 521
💛 - Coveralls |
erikdubbelboer
force-pushed
the
scheme-from-url2
branch
from
f35af21 to
7eaa808
Compare
|
I have no idea why the build fails, seems like it has nothing do with this change. |
dhui
requested changes
Aug 19, 2019
database/driver_test.go
Outdated
| t.Fatalf("expected %q got %q", u, md.url) | ||
| } | ||
|
|
||
| if _, err := Open("unknown://bla"); err == nil { |
dhui
requested changes
Aug 19, 2019
migrate.go
Outdated
| @@ -13,6 +13,7 @@ import ( | |||
| "time" | |||
|
|
|||
| "github.com/golang-migrate/migrate/v4/database" | |||
| "github.com/golang-migrate/migrate/v4/internal/url" | |||
There was a problem hiding this comment.
Let's use the name iurl like you did in database/driver.go
dhui
requested changes
Aug 20, 2019
erikdubbelboer
force-pushed
the
scheme-from-url2
branch
from
7b55ce4 to
e3b7009
Compare
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Otherwise it will fail on MySQL DSNs.
Moved schemeFromURL into the database package. Also removed databaseSchemeFromURL
and sourceSchemeFromURL as they were just calling schemeFromURL.
Fixes #265 (comment)