From 3b3798506b403911665c3c24fd055b75d6f6a44f Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Sat, 8 Aug 2009 20:10:01 -0400
Subject: [PATCH] Adding :from scoping to ActiveRecord calculations

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1229 state:committed]
---
 activerecord/lib/active_record/calculations.rb | 2 ++
 activerecord/test/cases/calculations_test.rb   | 6 ++++++
 activerecord/test/models/organization.rb       | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb
index 727f4c1dc620a..4a88c43dfff64 100644
--- a/activerecord/lib/active_record/calculations.rb
+++ b/activerecord/lib/active_record/calculations.rb
@@ -197,6 +197,8 @@ def construct_calculation_sql(operation, column_name, options) #:nodoc:
           sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group]
           if options[:from]
             sql << " FROM #{options[:from]} "
+          elsif scope && scope[:from]
+            sql << " FROM #{scope[:from]} "
           else
             sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
             sql << " FROM #{connection.quote_table_name(table_name)} "
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 24bc4f71ce412..c2e02763f617f 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -2,6 +2,8 @@
 require 'models/company'
 require 'models/topic'
 require 'models/edge'
+require 'models/club'
+require 'models/organization'
 
 Company.has_many :accounts
 
@@ -223,6 +225,10 @@ def test_should_sum_scoped_field
     assert_equal 15, companies(:rails_core).companies.sum(:id)
   end
 
+  def test_should_sum_scoped_field_with_from
+    assert_equal Club.count, Organization.clubs.count
+  end
+
   def test_should_sum_scoped_field_with_conditions
     assert_equal 8,  companies(:rails_core).companies.sum(:id, :conditions => 'id > 7')
   end
diff --git a/activerecord/test/models/organization.rb b/activerecord/test/models/organization.rb
index d79d5037c8053..c85726169eeab 100644
--- a/activerecord/test/models/organization.rb
+++ b/activerecord/test/models/organization.rb
@@ -1,4 +1,6 @@
 class Organization < ActiveRecord::Base
   has_many :member_details
   has_many :members, :through => :member_details
+
+  named_scope :clubs, { :from => 'clubs' }
 end
\ No newline at end of file