Rename Model.arel_table to Model.active_relation

2 files changed, 7 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/relation/calculation_methods.rb b/activerecord/lib/active_record/relation/calculation_methods.rb
index a925a99464..5246c7bc5d 100644
--- a/activerecord/lib/active_record/relation/calculation_methods.rb
+++ b/activerecord/lib/active_record/relation/calculation_methods.rb
@@ -53,7 +53,7 @@ module ActiveRecord
 
     def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
       column = if @klass.column_names.include?(column_name.to_s)
-        Arel::Attribute.new(@klass.arel_table, column_name)
+        Arel::Attribute.new(@klass.active_relation, column_name)
       else
         Arel::SqlLiteral.new(column_name == :all ? "*" : column_name.to_s)
       end
@@ -77,7 +77,7 @@ module ActiveRecord
       select_statement = if operation == 'count' && column_name == :all
         "COUNT(*) AS count_all"
       else
-        Arel::Attribute.new(@klass.arel_table, column_name).send(operation).as(aggregate_alias).to_sql
+        Arel::Attribute.new(@klass.active_relation, column_name).send(operation).as(aggregate_alias).to_sql
       end
 
       select_statement <<  ", #{group_field} AS #{group_alias}"
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index d5e0c90184..6b7d941350 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -7,20 +7,20 @@ module ActiveRecord
 
     def build_from_hash(attributes, default_table)
       predicates = attributes.map do |column, value|
-        arel_table = default_table
+        table = default_table
 
         if value.is_a?(Hash)
-          arel_table = Arel::Table.new(column, @engine)
-          build_from_hash(value, arel_table)
+          table = Arel::Table.new(column, :engine => @engine)
+          build_from_hash(value, table)
         else
           column = column.to_s
 
           if column.include?('.')
             table_name, column = column.split('.', 2)
-            arel_table = Arel::Table.new(table_name, @engine)
+            table = Arel::Table.new(table_name, :engine => @engine)
           end
 
-          attribute = arel_table[column] || Arel::Attribute.new(arel_table, column.to_sym)
+          attribute = table[column] || Arel::Attribute.new(table, column.to_sym)
 
           case value
           when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope