mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
3f1f4c7d0c
https://github.com/rails/rails/pull/31250 optimised rendering a collection with `cached: true`, but also with `cached: proc {}`. The problem is the proc may reference associations that should be preloaded to avoid n+1s in generating the cache key. For example: ```ruby @posts = Post.preload(:author) @view.render partial: "test/partial", collection: @post, cached: proc { |post| [post, post.author] } ``` This will n+1 on `post.author`. To fix this, this PR will always preload the collection if there's a proc given for `cached`. `cached: true` will still not preload unless it renders, as it did in https://github.com/rails/rails/pull/31250.
140 lines
3.8 KiB
Ruby
140 lines
3.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "abstract_unit"
|
|
|
|
# Define the essentials
|
|
class ActiveRecordTestConnector
|
|
cattr_accessor :able_to_connect
|
|
cattr_accessor :connected
|
|
|
|
# Set our defaults
|
|
self.connected = false
|
|
self.able_to_connect = true
|
|
end
|
|
|
|
# Try to grab AR
|
|
unless defined?(ActiveRecord) && defined?(FixtureSet)
|
|
begin
|
|
PATH_TO_AR = File.expand_path("../../activerecord/lib", __dir__)
|
|
raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
|
|
$LOAD_PATH.unshift PATH_TO_AR
|
|
require "active_record"
|
|
rescue LoadError => e
|
|
$stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
|
|
ActiveRecordTestConnector.able_to_connect = false
|
|
end
|
|
end
|
|
$stderr.flush
|
|
|
|
# Define the rest of the connector
|
|
class ActiveRecordTestConnector
|
|
class << self
|
|
def setup
|
|
unless connected || !able_to_connect
|
|
setup_connection
|
|
load_schema
|
|
require_fixture_models
|
|
self.connected = true
|
|
end
|
|
rescue Exception => e # errors from ActiveRecord setup
|
|
$stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
|
|
# $stderr.puts " #{e.backtrace.join("\n ")}\n"
|
|
self.able_to_connect = false
|
|
end
|
|
|
|
def reconnect
|
|
return unless able_to_connect
|
|
ActiveRecord::Base.connection.reconnect!
|
|
load_schema
|
|
end
|
|
|
|
private
|
|
def setup_connection
|
|
if Object.const_defined?(:ActiveRecord)
|
|
defaults = { database: ":memory:" }
|
|
adapter = defined?(JRUBY_VERSION) ? "jdbcsqlite3" : "sqlite3"
|
|
options = defaults.merge adapter: adapter, timeout: 500
|
|
ActiveRecord::Base.establish_connection(options)
|
|
ActiveRecord::Base.configurations = { "sqlite3_ar_integration" => options }
|
|
ActiveRecord::Base.connection
|
|
|
|
Object.const_set :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name("type") unless Object.const_defined?(:QUOTED_TYPE)
|
|
else
|
|
raise "Can't setup connection since ActiveRecord isn't loaded."
|
|
end
|
|
end
|
|
|
|
# Load actionpack sqlite3 tables
|
|
def load_schema
|
|
File.read(File.expand_path("fixtures/db_definitions/sqlite.sql", __dir__)).split(";").each do |sql|
|
|
ActiveRecord::Base.connection.execute(sql) unless sql.blank?
|
|
end
|
|
end
|
|
|
|
def require_fixture_models
|
|
Dir.glob(File.expand_path("fixtures/*.rb", __dir__)).each { |f| require f }
|
|
end
|
|
end
|
|
end
|
|
|
|
class ActiveRecordTestCase < ActionController::TestCase
|
|
include ActiveRecord::TestFixtures
|
|
|
|
def self.tests(controller)
|
|
super
|
|
if defined? controller::ROUTES
|
|
include Module.new {
|
|
define_method(:setup) do
|
|
super()
|
|
@routes = controller::ROUTES
|
|
end
|
|
}
|
|
end
|
|
end
|
|
|
|
# Set our fixture path
|
|
if ActiveRecordTestConnector.able_to_connect
|
|
self.fixture_path = [FIXTURE_LOAD_PATH]
|
|
self.use_transactional_tests = false
|
|
end
|
|
|
|
def self.fixtures(*args)
|
|
super if ActiveRecordTestConnector.connected
|
|
end
|
|
|
|
def run(*args)
|
|
super if ActiveRecordTestConnector.connected
|
|
end
|
|
|
|
def capture_sql
|
|
ActiveRecord::Base.connection.materialize_transactions
|
|
SQLCounter.clear_log
|
|
yield
|
|
SQLCounter.log.dup
|
|
end
|
|
|
|
class SQLCounter
|
|
class << self
|
|
attr_accessor :log, :log_all
|
|
def clear_log; self.log = []; self.log_all = []; end
|
|
end
|
|
|
|
clear_log
|
|
|
|
def call(name, start, finish, message_id, values)
|
|
return if values[:cached]
|
|
|
|
sql = values[:sql]
|
|
self.class.log_all << sql
|
|
self.class.log << sql unless ["SCHEMA", "TRANSACTION"].include? values[:name]
|
|
end
|
|
end
|
|
|
|
ActiveSupport::Notifications.subscribe("sql.active_record", SQLCounter.new)
|
|
end
|
|
|
|
ActiveRecordTestConnector.setup
|
|
|
|
ActiveSupport::Testing::Parallelization.after_fork_hook do
|
|
ActiveRecordTestConnector.reconnect
|
|
end
|