Fix case when we want a UrlConfig but the URL is nil #35102
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
Previously if the `url` key in a config hash was nil we'd ignore the configuration as invalid. This can happen when you're relying on a `DATABASE_URL` in the env and that is not set in the environment. ``` production: <<: *default url: ENV['DATABASE_URL'] ``` This PR fixes that case by checking if there is a `url` key in the config instead of checking if the `url` is not nil in the config. In addition to changing the conditional we then need to build a url hash to merge with the original hash in the `UrlConfig` object. Fixes rails#35091
|
@eileencodes I confirm the fix, it's now working as it was before. Thanks for this PR and for all your amazing contributions to the Rails 🎉 |
|
Thanks for following up @msdundar! And thank you for testing the Rails 6 beta so we could find and fix this issue before the final release ❤️ |
msdundar
added a commit
to omu/nokul
that referenced
this pull request
Jan 30, 2019
See rails/rails#35102 for details
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.
Previously if the
urlkey in a config hash was nil we'd ignore theconfiguration as invalid. This can happen when you're relying on a
DATABASE_URLin the env and that is not set in the environment.This PR fixes that case by checking if there is a
urlkey in theconfig instead of checking if the
urlis not nil in the config.In addition to changing the conditional we then need to build a url hash
to merge with the original hash in the
UrlConfigobject.Fixes #35091
cc/ @gmcgibbon @msdundar this should fix the issue you opened.