diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 19:20:40 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 19:20:40 +0530 |
commit | 22bfd8b09804db28e05e598e062d58fd2ab36485 (patch) | |
tree | f615bcd0fb1656367bfca03431386fc63e775e67 /activerecord/lib/active_record/relation.rb | |
parent | 8edfa8f82fecb23af506278d510ea900e6021e6b (diff) | |
download | rails-22bfd8b09804db28e05e598e062d58fd2ab36485.tar.gz rails-22bfd8b09804db28e05e598e062d58fd2ab36485.tar.bz2 rails-22bfd8b09804db28e05e598e062d58fd2ab36485.zip |
Rename a variable name for consistency
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r-- | activerecord/lib/active_record/relation.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index a4d11f813d..ec8ae21726 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -6,13 +6,13 @@ module ActiveRecord attr_reader :relation, :klass attr_writer :readonly, :table - attr_accessor :preload_associations, :eager_load_associations, :include_associations + attr_accessor :preload_associations, :eager_load_associations, :includes_associations def initialize(klass, relation) @klass, @relation = klass, relation @preload_associations = [] @eager_load_associations = [] - @include_associations = [] + @includes_associations = [] @loaded, @readonly = false end @@ -57,7 +57,7 @@ module ActiveRecord :offset => @relation.skipped, :from => (@relation.send(:from_clauses) if @relation.send(:sources).present?) }, - ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations + @include_associations, nil)) + ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations + @includes_associations, nil)) rescue ThrowResult [] end @@ -66,7 +66,7 @@ module ActiveRecord end preload = @preload_associations - preload += @include_associations unless find_with_associations + preload += @includes_associations unless find_with_associations preload.each {|associations| @klass.send(:preload_associations, @records, associations) } @records.each { |record| record.readonly! } if @readonly |