Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. #8074
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
|
@kennyj could you add a CHANGELOG entry? |
| @@ -14,7 +14,7 @@ def cache(&block) | |||
|
|
|||
| # Disable the query cache within the block if Active Record is configured. | |||
| def uncached(&block) | |||
| if ActiveRecord::Base.configurations.blank? | |||
| unless ActiveRecord::Base.connected? | |||
| yield | |||
| else | |||
| connection.uncached(&block) | |||
There was a problem hiding this comment.
Perhaps we should invert the unless..else block here, wdyt?
There was a problem hiding this comment.
Some people really really really hate unless/else, but it doesn't bother me.
There was a problem hiding this comment.
Hehe.. I don't hate, but I try to avoid :)
….yml but also DATABASE_URL.
|
Thanks guys. I don't like |
rafaelfranca
added a commit
that referenced
this pull request
Oct 31, 2012
Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
kennyj
added a commit
to kennyj/rails
that referenced
this pull request
Nov 13, 2012
…g not only database.yml but also DATABASE_URL.
rafaelfranca
added a commit
that referenced
this pull request
Nov 13, 2012
Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
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.
This PR closes #6951.
If we use
DATABASE_URL,ActiveRecord::Base.configurationsis not populated. Thus we can't use query cache with DATABASE_URL.See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/query_cache.rb#L7