Merge branch 'aderyabin-fix7'

Closes #6007

1 files changed, 46 insertions, 0 deletions

diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index a279b0e77c..f748b897ee 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -420,6 +420,40 @@ class CalculationsTest < ActiveRecord::TestCase
         Account.where("credit_limit > 50").from('accounts').maximum(:credit_limit)
   end
 
+  def test_maximum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:PostgreSQLAdapter)
+      assert_equal "7", Company.includes(:contracts).maximum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).maximum(:developer_id)
+    end
+  end
+
+  def test_minimum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:PostgreSQLAdapter)
+      assert_equal "7", Company.includes(:contracts).minimum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).minimum(:developer_id)
+    end
+  end
+
+  def test_sum_with_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+
+    # TODO: Investigate why PG isn't being typecast
+    if current_adapter?(:MysqlAdapter) || current_adapter?(:PostgreSQLAdapter)
+      assert_equal "7", Company.includes(:contracts).sum(:developer_id)
+    else
+      assert_equal 7, Company.includes(:contracts).sum(:developer_id)
+    end
+  end
+
+
   def test_from_option_with_specified_index
     if Edge.connection.adapter_name == 'MySQL' or Edge.connection.adapter_name == 'Mysql2'
       assert_equal Edge.count(:all), Edge.from('edges USE INDEX(unique_edge_index)').count(:all)
@@ -477,6 +511,11 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal [c.id], Company.joins(:contracts).pluck(:id)
   end
 
+  def test_pluck_if_table_included
+    c = Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    assert_equal [c.id], Company.includes(:contracts).where("contracts.id" => c.contracts.first).pluck(:id)
+  end
+
   def test_pluck_not_auto_table_name_prefix_if_column_joined
     Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
     assert_equal [7], Company.joins(:contracts).pluck(:developer_id)
@@ -500,4 +539,11 @@ class CalculationsTest < ActiveRecord::TestCase
   def test_plucks_with_ids
     assert_equal Company.all.map(&:id).sort, Company.ids.sort
   end
+
+  def test_pluck_not_auto_table_name_prefix_if_column_included
+    Company.create!(:name => "test", :contracts => [Contract.new(:developer_id => 7)])
+    ids = Company.includes(:contracts).pluck(:developer_id)
+    assert_equal Company.count, ids.length
+    assert_equal [7], ids.compact
+  end
 end