Changeset 3646

Timestamp:

02/25/06 23:06:04 (3 years ago)

Author:

david

Message:

Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/calculations.rb (added)
• trunk/activerecord/test/calculations_test.rb (added)
• trunk/activerecord/test/fixtures/accounts.yml (modified) (1 diff)
• trunk/activesupport/lib/active_support/ordered_options.rb (modified) (3 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
+
+    Person.average :age
+    Person.minimum :age
+    Person.maximum :age
+    Person.sum :salary, :group => :last_name
-
-* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [contact@lukeredpath.co.uk]

trunk/activerecord/lib/active_record.rb

@@ -50 +50 @@
-require 'active_record/migration'
-require 'active_record/schema'
+require 'active_record/calculations'
-
-ActiveRecord::Base.class_eval do
@@ -64 +65 @@
-  include ActiveRecord::Acts::List
-  include ActiveRecord::Acts::NestedSet
+  include ActiveRecord::Calculations
-end
-

trunk/activerecord/lib/active_record/base.rb

@@ -496 +496 @@
-      end
-
-      # Count operates using three different approaches. 
-      #
-      # * Count all: By not passing any parameters to count, it will return a count of all the rows for the model.
-      # * Count by conditions or joins: For backwards compatibility, you can pass in +conditions+ and +joins+ as individual parameters.
-      # * Count using options will find the row count matched by the options used.
-      #
-      # The last approach, count using options, accepts an option hash as the only parameter. The options are:
-      #
-      # * <tt>:conditions</tt>: An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro.
-      # * <tt>:joins</tt>: An SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id". (Rarely needed).
-      #   The records will be returned read-only since they will have attributes that do not correspond to the table's columns.
-      # * <tt>:include</tt>: Named associations that should be loaded alongside using LEFT OUTER JOINs. The symbols named refer
-      #   to already defined associations. When using named associations count returns the number DISTINCT items for the model you're counting.
-      #   See eager loading under Associations.
-      #
-      # Examples for counting all:
-      #   Person.count         # returns the total count of all people
-      #
-      # Examples for count by +conditions+ and +joins+ (for backwards compatibility):
-      #   Person.count("age > 26")  # returns the number of people older than 26
-      #   Person.find("age > 26 AND job.salary > 60000", "LEFT JOIN jobs on jobs.person_id = person.id") # returns the total number of rows matching the conditions and joins fetched by SELECT COUNT(*).
-      #
-      # Examples for count with options:
-      #   Person.count(:conditions => "age > 26")
-      #   Person.count(:conditions => "age > 26 AND job.salary > 60000", :include => :job) # because of the named association, it finds the DISTINCT count using LEFT OUTER JOIN.
-      #   Person.count(:conditions => "age > 26 AND job.salary > 60000", :joins => "LEFT JOIN jobs on jobs.person_id = person.id") # finds the number of rows matching the conditions and joins. 
-      def count(*args) 
-        options = {}
-        
-        #For backwards compatibility, we need to handle both count(conditions=nil, joins=nil) or count(options={}).
-        if args.size >= 0 and args.size <= 2
-          if args.first.is_a?(Hash)
-            options = args.first
-            #should we verify the options hash???
-          else
-            #Handle legacy paramter options: def count(conditions=nil, joins=nil) 
-            options.merge!(:conditions => args[0]) if args.length > 0
-            options.merge!(:joins => args[1]) if args.length > 1
-          end
-        else
-          raise(ArgumentError, "Unexpected parameters passed to count(*args): expected either count(conditions=nil, joins=nil) or count(options={})")
-        end
-        
-        options[:include] ? count_with_associations(options) : count_by_sql(construct_counter_sql(options))
-      end
-      
-      def construct_counter_sql(options)
-        sql  = "SELECT COUNT(" 
-        sql << "DISTINCT " if options[:distinct]
-        sql << "#{options[:select] || "#{table_name}.#{primary_key}"}) FROM #{table_name} "
-        sql << " #{options[:joins]} " if options[:joins]
-        add_conditions!(sql, options[:conditions])
-        sql
-      end
-
-      # Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part.
-      #   Product.count_by_sql "SELECT COUNT(*) FROM sales s, customers c WHERE s.customer_id = c.id"

trunk/activerecord/test/fixtures/accounts.yml

@@ -17 +17 @@
-  firm_id: 2
-  credit_limit: 60
+
+rails_core_account_2:
+  id: 5
+  firm_id: 6
+  credit_limit: 55

trunk/activesupport/lib/active_support/ordered_options.rb

@@ -1 @@
-
-
-
-
+
+
-    if pair = find_pair(key)
-      pair.pop
@@ -12 +10 @@
-  
-  def [](key)
-.to_sym
+
-    pair ? pair.last : nil
+  end
+
+  def keys
+    self.collect { |i| i.first }
+  end
+
+  private
+    def find_pair(key)
+      self.each { |i| return i if i.first == key }
+      return false
+    end
+end
+
+class OrderedOptions < OrderedHash #:nodoc:
+  def []=(key, value)
+    super(key.to_sym, value)
+  end
+  
+  def [](key)
+    super(key.to_sym)
-  end
-
@@ -23 +41 @@
-    end
-  end
-
-  private
-    def find_pair(key)
-      self.each { |i| return i if i.first == key }
-      return false
-    end
-end