aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/through_association_scope.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association_scope.rb')
-rw-r--r--activerecord/lib/active_record/associations/through_association_scope.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb
index 51ab8869ed..261b4037a3 100644
--- a/activerecord/lib/active_record/associations/through_association_scope.rb
+++ b/activerecord/lib/active_record/associations/through_association_scope.rb
@@ -7,9 +7,8 @@ module ActiveRecord
protected
- def construct_scope
- scope = {}
- scope[:find] = {
+ def construct_find_scope
+ {
:conditions => construct_conditions,
:joins => construct_joins,
:include => @reflection.options[:include] || @reflection.source_reflection.options[:include],
@@ -18,8 +17,10 @@ module ActiveRecord
:limit => @reflection.options[:limit],
:readonly => @reflection.options[:readonly]
}
- scope[:create] = construct_owner_attributes(@reflection) unless @reflection.nested?
- scope
+ end
+
+ def construct_create_scope
+ @reflection.nested? ? {} : construct_owner_attributes(@reflection)
end
# Build SQL conditions from attributes, qualified by table name.