Skip to content
Browse files

Use unscoped instead of with_exclusive_scope for preloading

  • Loading branch information...
1 parent 5502780 commit 8a1be228491f433fa8d20be4f485e2159f5ebe59 @lifo lifo committed Jan 20, 2010
Showing with 13 additions and 14 deletions.
  1. +13 −14 activerecord/lib/active_record/association_preload.rb
View
27 activerecord/lib/active_record/association_preload.rb
@@ -187,13 +187,12 @@ def preload_has_and_belongs_to_many_association(records, reflection, preload_opt
conditions = "t0.#{reflection.primary_key_name} #{in_or_equals_for_ids(ids)}"
conditions << append_conditions(reflection, preload_options)
- associated_records = reflection.klass.with_exclusive_scope do
- reflection.klass.where([conditions, ids]).
+ associated_records = reflection.klass.unscoped.where([conditions, ids]).
includes(options[:include]).
joins("INNER JOIN #{connection.quote_table_name options[:join_table]} t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}").
select("#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id").
order(options[:order]).to_a
- end
+
set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'the_parent_record_id')
end
@@ -341,9 +340,7 @@ def preload_belongs_to_association(records, reflection, preload_options={})
conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} #{in_or_equals_for_ids(ids)}"
conditions << append_conditions(reflection, preload_options)
- associated_records = klass.with_exclusive_scope do
- klass.where([conditions, ids]).apply_finder_options(options.slice(:include, :select, :joins, :order)).to_a
- end
+ associated_records = klass.unscoped.where([conditions, ids]).apply_finder_options(options.slice(:include, :select, :joins, :order)).to_a
set_association_single_records(id_map, reflection.name, associated_records, primary_key)
end
@@ -362,14 +359,16 @@ def find_associated_records(ids, reflection, preload_options)
conditions << append_conditions(reflection, preload_options)
- reflection.klass.with_exclusive_scope do
- reflection.klass.select(preload_options[:select] || options[:select] || "#{table_name}.*").
- includes(preload_options[:include] || options[:include]).
- where([conditions, ids]).
- joins(options[:joins]).
- group(preload_options[:group] || options[:group]).
- order(preload_options[:order] || options[:order])
- end
+ find_options = {
+ :select => preload_options[:select] || options[:select] || "#{table_name}.*",
+ :include => preload_options[:include] || options[:include],
+ :conditions => [conditions, ids],
+ :joins => options[:joins],
+ :group => preload_options[:group] || options[:group],
+ :order => preload_options[:order] || options[:order]
+ }
+
+ reflection.klass.unscoped.apply_finder_options(find_options).to_a
end

0 comments on commit 8a1be22

Please sign in to comment.
Something went wrong with that request. Please try again.