diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-13 15:30:51 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-13 15:30:51 -0800 |
commit | 7b3d85db4c58e2f719981efd6ef5a6b870f6ab49 (patch) | |
tree | 571b86ca825c9fb09118c43449cf3f4fb50d2f32 /activerecord/lib/active_record/calculations.rb | |
parent | 3f54f3100b6c262776ad324bd649ff268600e280 (diff) | |
download | rails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.tar.gz rails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.tar.bz2 rails-7b3d85db4c58e2f719981efd6ef5a6b870f6ab49.zip |
Revert "Split arel_table into method to get a relation and another to memoize the default relation."
This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068.
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
-rw-r--r-- | activerecord/lib/active_record/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 46545d96a3..40242333e5 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -146,7 +146,7 @@ module ActiveRecord join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, construct_join(options[:joins], scope)) construct_finder_arel_with_included_associations(options, join_dependency) else - relation = arel_table_for(options[:from]). + relation = arel_table(options[:from]). joins(construct_join(options[:joins], scope)). conditions(construct_conditions(options[:conditions], scope)). order(options[:order]). @@ -164,7 +164,7 @@ module ActiveRecord def execute_simple_calculation(operation, column_name, options, relation) #:nodoc: column = if column_names.include?(column_name.to_s) - Arel::Attribute.new(arel_table_for(options[:from] || table_name), + Arel::Attribute.new(arel_table(options[:from] || table_name), options[:select] || column_name) else Arel::SqlLiteral.new(options[:select] || |