aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-03 19:20:40 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-03 19:20:40 +0530
commit22bfd8b09804db28e05e598e062d58fd2ab36485 (patch)
treef615bcd0fb1656367bfca03431386fc63e775e67 /activerecord/lib/active_record/relation
parent8edfa8f82fecb23af506278d510ea900e6021e6b (diff)
downloadrails-22bfd8b09804db28e05e598e062d58fd2ab36485.tar.gz
rails-22bfd8b09804db28e05e598e062d58fd2ab36485.tar.bz2
rails-22bfd8b09804db28e05e598e062d58fd2ab36485.zip
Rename a variable name for consistency
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
-rw-r--r--activerecord/lib/active_record/relation/spawn_methods.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index cf2cc7ba70..525a9cb365 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -6,7 +6,7 @@ module ActiveRecord
end
def includes(*associations)
- spawn.tap {|r| r.include_associations += Array.wrap(associations) }
+ spawn.tap {|r| r.includes_associations += Array.wrap(associations) }
end
def eager_load(*associations)
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index 4a64f0c6a9..7b15279253 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -5,7 +5,7 @@ module ActiveRecord
relation.readonly = @readonly
relation.preload_associations = @preload_associations
relation.eager_load_associations = @eager_load_associations
- relation.include_associations = @include_associations
+ relation.includes_associations = @includes_associations
relation.table = table
relation
end
@@ -13,7 +13,7 @@ module ActiveRecord
def merge(r)
raise ArgumentError, "Cannot merge a #{r.klass.name} relation with #{@klass.name} relation" if r.klass != @klass
- merged_relation = spawn(table).eager_load(r.eager_load_associations).preload(r.preload_associations).includes(r.include_associations)
+ merged_relation = spawn(table).eager_load(r.eager_load_associations).preload(r.preload_associations).includes(r.includes_associations)
merged_relation.readonly = r.readonly
[self.relation, r.relation].each do |arel|