Ticket #9487: parallel_calculations_with_tests.diff

activerecord/lib/active_record/calculations.rb

@@ -111 +111 @@
-      #   Person.average(:age) # SELECT AVG(age) FROM people...
-      #   Person.minimum(:age, :conditions => ['last_name != ?', 'Drake']) # Selects the minimum age for everyone with a last name other than 'Drake'
-      #   Person.minimum(:age, :having => 'min(age) > 17', :group => :last_name) # Selects the minimum age for any family without any minors
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        validate_calculation_options(operation, options)
-        column_name     = options[:select] if options[:select]
-        column_name     = '*' if column_name == :all
@@ -149 +163 @@
-        end
-
-        def construct_calculation_sql(operation, column_name, options) #:nodoc:
-
+ unless operation.is_a?(Hash)
-          options = options.symbolize_keys
-
-          scope           = scope(:find)
@@ -167 +181 @@
-            end
-          end
-
-
+
+
+
+
+
+
+
+
+
-
-          # A (slower) workaround if we're using a backend, like sqlite, that doesn't support COUNT DISTINCT.
-          sql = "SELECT COUNT(*) AS #{aggregate_alias}" if use_workaround
@@ -204 +226 @@
-          sql
-        end
-
+        def extract_query_information_from_operation(operation)
+          return nil unless operation.is_a?(Hash)
+          calculations = []
+          operation.each do |key, value|
+            value = value.to_s.to_a unless value.is_a?(Array)
+            calculations << {:alias => key.to_s, :distinct_alias => "#{key}_#{value[0]}_alias",
+                :operation => value[0].to_s.downcase, :column => value[1].to_s}
+          end
+          calculations
+        end
+
-        def execute_simple_calculation(operation, column_name, column, options) #:nodoc:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        end
-
-        def execute_grouped_calculation(operation, column_name, column, options) #:nodoc:

activerecord/test/cases/calculations_test.rb

@@ -248 +248 @@
-  def test_count_with_too_many_parameters_raises
-    assert_raise(ArgumentError) { Account.count(1, 2, 3) }
-  end
+
+  def test_parallel_calculations
+    account_calculations = Account.calculate(:how_many => :count, :total_credit => [:sum, :credit_limit], :max_limit => [:max, :credit_limit])
+    assert_equal 6, account_calculations[:how_many]
+    assert_equal 318, account_calculations[:total_credit]
+    assert_equal 60, account_calculations[:max_limit]
+  end
+
+  def test_parallel_calculations_with_conditions
+    account_calculations = Account.calculate({:how_many => [:count, '*'], :total_credit => [:sum, :credit_limit]}, :conditions => {:credit_limit => 50})
+    assert_equal 3, account_calculations[:how_many]
+    assert_equal 150, account_calculations[:total_credit]
+  end
+
+  def test_parallel_calculations_with_conditions_and_distinct
+    account_calculations = Account.calculate(
+        {:how_many => [:count, :credit_limit], :total_credit => [:sum, :credit_limit]},
+        :conditions => {:credit_limit => 50},
+        :distinct => true
+    )
+    assert_equal 1, account_calculations[:how_many]
+    assert_equal 50, account_calculations[:total_credit]
+  end
-end