TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Inlining locked?

Browse Source 
Since `locked?` and `arel_from_relation` overlaps, so just do
`arel_from_relation` first and inline `locked?`.
This commit is contained in:
Ryuta Kamizono 2021-01-12 18:14:08 +09:00
parent 0aa832e590
commit b453bff351
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
View File

@ -94,8 +94,11 @@ def clear_query_cache
end
def select_all(arel, name = nil, binds = [], preparable: nil)
if @query_cache_enabled && !locked?(arel)
arel = arel_from_relation(arel)
arel = arel_from_relation(arel)
# If arel is locked this is a SELECT ... FOR UPDATE or somesuch.
# Such queries should not be cached.
if @query_cache_enabled && !(arel.respond_to?(:locked) && arel.locked)
sql, binds, preparable = to_sql_and_binds(arel, binds, preparable)
cache_sql(sql, name, binds) { super(sql, name, binds, preparable: preparable) }
@ -134,13 +137,6 @@ def cache_notification_info(sql, name, binds)
}
end
# If arel is locked this is a SELECT ... FOR UPDATE or somesuch. Such
# queries should not be cached.
def locked?(arel)
arel = arel.arel if arel.is_a?(Relation)
arel.respond_to?(:locked) && arel.locked
end
def configure_query_cache!
enable_query_cache! if pool.query_cache_enabled
end