mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35431 from kamipo/enable_sql_cache_on_find 

Enable SQL statement cache for `find` on base class as with `find_by`
This commit is contained in:
Ryuta Kamizono 2019-03-01 22:45:57 +09:00 committed by GitHub
parent 0c4bf982e8 dda5501e80
commit c82705b15f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/core.rb
View File

@ -161,7 +161,7 @@ module ActiveRecord
return super if block_given? ||
primary_key.nil? ||
scope_attributes? ||
columns_hash.include?(inheritance_column)
columns_hash.key?(inheritance_column) && !base_class?
id = ids.first

25
activerecord/test/cases/bind_parameter_test.rb
View File

@ -54,17 +54,36 @@ if ActiveRecord::Base.connection.prepared_statements
@connection.disable_query_cache!
end
def test_statement_cache_with_find
@connection.clear_cache!
assert_equal 1, Topic.find(1).id
assert_raises(RecordNotFound) { SillyReply.find(2) }
topic_sql = cached_statement(Topic, Topic.primary_key)
assert_includes statement_cache, to_sql_key(topic_sql)
e = assert_raise { cached_statement(SillyReply, SillyReply.primary_key) }
assert_equal "SillyReply has no cached statement by \"id\"", e.message
replies = SillyReply.where(id: 2).limit(1)
assert_includes statement_cache, to_sql_key(replies.arel)
end
def test_statement_cache_with_find_by
@connection.clear_cache!
assert_equal 1, Topic.find_by!(id: 1).id
assert_equal 2, Reply.find_by!(id: 2).id
assert_raises(RecordNotFound) { SillyReply.find_by!(id: 2) }
topic_sql = cached_statement(Topic, [:id])
assert_includes statement_cache, to_sql_key(topic_sql)
e = assert_raise { cached_statement(Reply, [:id]) }
assert_equal "Reply has no cached statement by [:id]", e.message
e = assert_raise { cached_statement(SillyReply, [:id]) }
assert_equal "SillyReply has no cached statement by [:id]", e.message
replies = SillyReply.where(id: 2).limit(1)
assert_includes statement_cache, to_sql_key(replies.arel)
end
def test_statement_cache_with_in_clause