activerecord 2.3.18 → 3.0.0.beta

data/RUNNING_UNIT_TESTS

@@ -1,36 +0,0 @@
-== Creating the test database
-
-The default names for the test databases are "activerecord_unittest" and 
-"activerecord_unittest2". If you want to use another database name then be sure 
-to update the connection adapter setups you want to test with in 
-test/connections/<your database>/connection.rb. 
-When you have the database online, you can import the fixture tables with 
-the test/schema/*.sql files.
-
-Make sure that you create database objects with the same user that you specified in 
-connection.rb otherwise (on Postgres, at least) tests for default values will fail.
-
-== Running with Rake
-
-The easiest way to run the unit tests is through Rake. The default task runs
-the entire test suite for all the adapters. You can also run the suite on just
-one adapter by using the tasks test_mysql, test_sqlite, test_postgresql or any
-of the other test_ tasks. For more information, checkout the full array of rake
-tasks with "rake -T"
-
-Rake can be found at http://rake.rubyforge.org
-
-== Running by hand
-
-Unit tests are located in test/cases directory. If you only want to run a single test suite, 
-you can do so with:
-
-   rake test_mysql TEST=test/cases/base_test.rb
-   
-That'll run the base suite using the MySQL-Ruby adapter.  Some tests rely on the schema
-being initialized - you can initialize the schema with:
-
-  rake test_mysql TEST=test/cases/aaa_create_tables_test.rb
-
-
-

data/Rakefile

@@ -1,268 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-require 'rake/packagetask'
-require 'rubygems/package_task'
-
-require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
-require File.expand_path(File.dirname(__FILE__)) + "/test/config"
-
-PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-PKG_NAME      = 'activerecord'
-PKG_VERSION   = ActiveRecord::VERSION::STRING + PKG_BUILD
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-RELEASE_NAME  = "REL #{PKG_VERSION}"
-
-RUBY_FORGE_PROJECT = "activerecord"
-RUBY_FORGE_USER    = "webster132"
-
-MYSQL_DB_USER = 'rails'
-
-PKG_FILES = FileList[
-    "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "install.rb", "Rakefile"
-].exclude(/\bCVS\b|~$/)
-
-def run_without_aborting(*tasks)
-  errors = []
-
-  tasks.each do |task|
-    begin
-      Rake::Task[task].invoke
-    rescue Exception
-      errors << task
-    end
-  end
-
-  abort "Errors running #{errors.join(', ')}" if errors.any?
-end
-
-desc 'Run mysql, sqlite, and postgresql tests by default'
-task :default => :test
-
-desc 'Run mysql, sqlite, and postgresql tests'
-task :test do
-  tasks = defined?(JRUBY_VERSION) ?
-    %w(test_jdbcmysql test_jdbcsqlite3 test_jdbcpostgresql) :
-    %w(test_mysql test_sqlite3 test_postgresql)
-  run_without_aborting(*tasks)
-end
-
-for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb )
-  Rake::TestTask.new("test_#{adapter}") { |t|
-    if adapter =~ /jdbc/
-      t.libs << "test" << "test/connections/jdbc_#{adapter}"
-    else
-      t.libs << "test" << "test/connections/native_#{adapter}"
-    end
-    adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
-    t.test_files=Dir.glob( "test/cases/**/*_test{,_#{adapter_short}}.rb" ).sort
-    t.verbose = true
-  }
-
-  namespace adapter do
-    task :test => "test_#{adapter}"
-  end
-end
-
-namespace :mysql do
-  desc 'Build the MySQL test databases'
-  task :build_databases do
-    %x( echo "create DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{MYSQL_DB_USER})
-    %x( echo "create DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{MYSQL_DB_USER})
-  end
-
-  desc 'Drop the MySQL test databases'
-  task :drop_databases do
-    %x( mysqladmin --user=#{MYSQL_DB_USER} -f drop activerecord_unittest )
-    %x( mysqladmin --user=#{MYSQL_DB_USER} -f drop activerecord_unittest2 )
-  end
-
-  desc 'Rebuild the MySQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
-end
-
-task :build_mysql_databases => 'mysql:build_databases'
-task :drop_mysql_databases => 'mysql:drop_databases'
-task :rebuild_mysql_databases => 'mysql:rebuild_databases'
-
-
-namespace :postgresql do
-  desc 'Build the PostgreSQL test databases'
-  task :build_databases do
-    %x( createdb -E UTF8 activerecord_unittest )
-    %x( createdb -E UTF8 activerecord_unittest2 )
-  end
-
-  desc 'Drop the PostgreSQL test databases'
-  task :drop_databases do
-    %x( dropdb activerecord_unittest )
-    %x( dropdb activerecord_unittest2 )
-  end
-
-  desc 'Rebuild the PostgreSQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
-end
-
-task :build_postgresql_databases => 'postgresql:build_databases'
-task :drop_postgresql_databases => 'postgresql:drop_databases'
-task :rebuild_postgresql_databases => 'postgresql:rebuild_databases'
-
-
-namespace :frontbase do
-  desc 'Build the FrontBase test databases'
-  task :build_databases => :rebuild_frontbase_databases
-
-  desc 'Rebuild the FrontBase test databases'
-  task :rebuild_databases do
-    build_frontbase_database = Proc.new do |db_name, sql_definition_file|
-      %(
-        STOP DATABASE #{db_name};
-        DELETE DATABASE #{db_name};
-        CREATE DATABASE #{db_name};
-
-        CONNECT TO #{db_name} AS SESSION_NAME USER _SYSTEM;
-        SET COMMIT FALSE;
-
-        CREATE USER RAILS;
-        CREATE SCHEMA RAILS AUTHORIZATION RAILS;
-        COMMIT;
-
-        SET SESSION AUTHORIZATION RAILS;
-        SCRIPT '#{sql_definition_file}';
-
-        COMMIT;
-
-        DISCONNECT ALL;
-      )
-    end
-    create_activerecord_unittest  = build_frontbase_database['activerecord_unittest',  File.join(SCHEMA_ROOT, 'frontbase.sql')]
-    create_activerecord_unittest2 = build_frontbase_database['activerecord_unittest2', File.join(SCHEMA_ROOT, 'frontbase2.sql')]
-    execute_frontbase_sql = Proc.new do |sql|
-      system(<<-SHELL)
-      /Library/FrontBase/bin/sql92 <<-SQL
-      #{sql}
-      SQL
-      SHELL
-    end
-    execute_frontbase_sql[create_activerecord_unittest]
-    execute_frontbase_sql[create_activerecord_unittest2]
-  end
-end
-
-task :build_frontbase_databases => 'frontbase:build_databases'
-task :rebuild_frontbase_databases => 'frontbase:rebuild_databases'
-
-
-# Generate the RDoc documentation
-
-RDoc::Task.new { |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "Active Record -- Object-relation mapping put on rails"
-  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
-  rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
-  rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.exclude('lib/active_record/vendor/*')
-  rdoc.rdoc_files.include('dev-utils/*.rb')
-}
-
-# Enhance rdoc task to copy referenced images also
-task :rdoc do
-  FileUtils.mkdir_p "doc/files/examples/"
-  FileUtils.copy "examples/associations.png", "doc/files/examples/associations.png"
-end
-
-
-# Create compressed packages
-
-dist_dirs = [ "lib", "test", "examples" ]
-
-spec = Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "Implements the ActiveRecord pattern for ORM."
-  s.description = %q{Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.}
-
-  s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG" ]
-  dist_dirs.each do |dir|
-    s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
-  end
-
-  s.add_dependency('activesupport', '= 2.3.18' + PKG_BUILD)
-
-  s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
-  s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"
-  s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite3"
-  s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite3"
-  s.require_path = 'lib'
-
-  s.extra_rdoc_files = %w( README )
-  s.rdoc_options.concat ['--main',  'README']
-
-  s.author = "David Heinemeier Hansson"
-  s.email = "david@loudthinking.com"
-  s.homepage = "http://www.rubyonrails.org"
-  s.rubyforge_project = "activerecord"
-end
-
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
-
-task :lines do
-  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
-
-  for file_name in FileList["lib/active_record/**/*.rb"]
-    next if file_name =~ /vendor/
-    f = File.open(file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
-    end
-    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
-
-    total_lines     += lines
-    total_codelines += codelines
-
-    lines, codelines = 0, 0
-  end
-
-  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
-end
-
-
-# Publishing ------------------------------------------------------
-
-desc "Publish the beta gem"
-task :pgem => [:package] do
-  require 'rake/contrib/sshpublisher'
-  Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
-end
-
-desc "Publish the API documentation"
-task :pdoc => [:rdoc] do
-  require 'rake/contrib/sshpublisher'
-  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
-end
-
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  require 'rubyforge'
-  require 'rake/contrib/rubyforgepublisher'
-
-  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
-
-  rubyforge = RubyForge.new
-  rubyforge.login
-  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end

data/install.rb

@@ -1,30 +0,0 @@
-require 'rbconfig'
-require 'find'
-require 'ftools'
-
-include Config
-
-# this was adapted from rdoc's install.rb by ways of Log4r
-
-$sitedir = CONFIG["sitelibdir"]
-unless $sitedir
-  version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
-  $libdir = File.join(CONFIG["libdir"], "ruby", version)
-  $sitedir = $:.find {|x| x =~ /site_ruby/ }
-  if !$sitedir
-    $sitedir = File.join($libdir, "site_ruby")
-  elsif $sitedir !~ Regexp.quote(version)
-    $sitedir = File.join($sitedir, version)
-  end
-end
-
-# the actual gruntwork
-Dir.chdir("lib")
-
-Find.find("active_record", "active_record.rb") { |f|
-  if f[-3..-1] == ".rb"
-    File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)
-  else
-    File::makedirs(File.join($sitedir, *f.split(/\//)))
-  end
-}

data/lib/active_record/calculations.rb

@@ -1,321 +0,0 @@
-module ActiveRecord
-  module Calculations #:nodoc:
-    CALCULATIONS_OPTIONS = [:conditions, :joins, :order, :select, :group, :having, :distinct, :limit, :offset, :include, :from]
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      # 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 using column: By passing a column name to count, it will return a count of all the rows for the model with supplied column present
-      # * Count using options will find the row count matched by the options used.
-      #
-      # The third 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 to ActiveRecord::Base.
-      # * <tt>:joins</tt>: Either an SQL fragment for additional joins like "LEFT JOIN comments ON comments.post_id = id" (rarely needed)
-      #   or named associations in the same form used for the <tt>:include</tt> option, which will perform an INNER JOIN on the associated table(s).
-      #   If the value is a string, then the records will be returned read-only since they will have attributes that do not correspond to the table's columns.
-      #   Pass <tt>:readonly => false</tt> to override.
-      # * <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 of DISTINCT items for the model you're counting.
-      #   See eager loading under Associations.
-      # * <tt>:order</tt>: An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations).
-      # * <tt>:group</tt>: An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
-      # * <tt>:select</tt>: By default, this is * as in SELECT * FROM, but can be changed if you, for example, want to do a join but not
-      #   include the joined columns.
-      # * <tt>:distinct</tt>: Set this to true to make this a distinct calculation, such as SELECT COUNT(DISTINCT posts.id) ...
-      # * <tt>:from</tt> - By default, this is the table name of the class, but can be changed to an alternate table name (or even the name
-      #   of a database view).
-      #
-      # Examples for counting all:
-      #   Person.count         # returns the total count of all people
-      #
-      # Examples for counting by column:
-      #   Person.count(:age)  # returns the total count of all people whose age is present in database
-      #
-      # 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.
-      #   Person.count('id', :conditions => "age > 26") # Performs a COUNT(id)
-      #   Person.count(:all, :conditions => "age > 26") # Performs a COUNT(*) (:all is an alias for '*')
-      #
-      # Note: <tt>Person.count(:all)</tt> will not work because it will use <tt>:all</tt> as the condition.  Use Person.count instead.
-      def count(*args)
-        calculate(:count, *construct_count_options_from_args(*args))
-      end
-
-      # Calculates the average value on a given column. The value is returned as
-      # a float, or +nil+ if there's no row. See +calculate+ for examples with
-      # options.
-      #
-      #   Person.average('age') # => 35.8
-      def average(column_name, options = {})
-        calculate(:avg, column_name, options)
-      end
-
-      # Calculates the minimum value on a given column.  The value is returned
-      # with the same data type of the column, or +nil+ if there's no row. See
-      # +calculate+ for examples with options.
-      #
-      #   Person.minimum('age') # => 7
-      def minimum(column_name, options = {})
-        calculate(:min, column_name, options)
-      end
-
-      # Calculates the maximum value on a given column. The value is returned
-      # with the same data type of the column, or +nil+ if there's no row. See
-      # +calculate+ for examples with options.
-      #
-      #   Person.maximum('age') # => 93
-      def maximum(column_name, options = {})
-        calculate(:max, column_name, options)
-      end
-
-      # Calculates the sum of values on a given column. The value is returned
-      # with the same data type of the column, 0 if there's no row. See
-      # +calculate+ for examples with options.
-      #
-      #   Person.sum('age') # => 4562
-      def sum(column_name, options = {})
-        calculate(:sum, column_name, options)
-      end
-
-      # This calculates aggregate values in the given column.  Methods for count, sum, average, minimum, and maximum have been added as shortcuts.
-      # Options such as <tt>:conditions</tt>, <tt>:order</tt>, <tt>:group</tt>, <tt>:having</tt>, and <tt>:joins</tt> can be passed to customize the query.
-      #
-      # There are two basic forms of output:
-      #   * Single aggregate value: The single value is type cast to Fixnum for COUNT, Float for AVG, and the given column's type for everything else.
-      #   * Grouped values: This returns an ordered hash of the values and groups them by the <tt>:group</tt> option.  It takes either a column name, or the name
-      #     of a belongs_to association.
-      #
-      #       values = Person.maximum(:age, :group => 'last_name')
-      #       puts values["Drake"]
-      #       => 43
-      #
-      #       drake  = Family.find_by_last_name('Drake')
-      #       values = Person.maximum(:age, :group => :family) # Person belongs_to :family
-      #       puts values[drake]
-      #       => 43
-      #
-      #       values.each do |family, max_age|
-      #       ...
-      #       end
-      #
-      # Options:
-      # * <tt>:conditions</tt> - An SQL fragment like "administrator = 1" or [ "user_name = ?", username ]. See conditions in the intro to ActiveRecord::Base.
-      # * <tt>:include</tt>: Eager loading, see Associations for details.  Since calculations don't load anything, the purpose of this is to access fields on joined tables in your conditions, order, or group clauses.
-      # * <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>:order</tt> - An SQL fragment like "created_at DESC, name" (really only used with GROUP BY calculations).
-      # * <tt>:group</tt> - An attribute name by which the result should be grouped. Uses the GROUP BY SQL-clause.
-      # * <tt>:select</tt> - By default, this is * as in SELECT * FROM, but can be changed if you for example want to do a join, but not
-      #   include the joined columns.
-      # * <tt>:distinct</tt> - Set this to true to make this a distinct calculation, such as SELECT COUNT(DISTINCT posts.id) ...
-      #
-      # Examples:
-      #   Person.calculate(:count, :all) # The same as Person.count
-      #   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
-      #   Person.sum("2 * age")
-      def calculate(operation, column_name, options = {})
-        validate_calculation_options(operation, options)
-        column_name     = options[:select] if options[:select]
-        column_name     = '*' if column_name == :all
-        column          = column_for column_name
-        catch :invalid_query do
-          if options[:group]
-            return execute_grouped_calculation(operation, column_name, column, options)
-          else
-            return execute_simple_calculation(operation, column_name, column, options)
-          end
-        end
-        0
-      end
-
-      protected
-        def construct_count_options_from_args(*args)
-          options     = {}
-          column_name = :all
-          
-          # We need to handle
-          #   count()
-          #   count(:column_name=:all)
-          #   count(options={})
-          #   count(column_name=:all, options={})
-          case args.size
-          when 1
-            args[0].is_a?(Hash) ? options = args[0] : column_name = args[0]
-          when 2
-            column_name, options = args
-          else
-            raise ArgumentError, "Unexpected parameters passed to count(): #{args.inspect}"
-          end if args.size > 0
-          
-          [column_name, options]
-        end
-
-        def construct_calculation_sql(operation, column_name, options) #:nodoc:
-          operation = operation.to_s.downcase
-          options = options.symbolize_keys
-
-          scope           = scope(:find)
-          merged_includes = merge_includes(scope ? scope[:include] : [], options[:include])
-          aggregate_alias = column_alias_for(operation, column_name)
-          column_name     = "#{connection.quote_table_name(table_name)}.#{column_name}" if column_names.include?(column_name.to_s)
-
-          if operation == 'count'
-            if merged_includes.any?
-              options[:distinct] = true
-              column_name = options[:select] || [connection.quote_table_name(table_name), primary_key] * '.'
-            end
-
-            if options[:distinct]
-              use_workaround = !connection.supports_count_distinct?
-            end
-          end
-
-          if options[:distinct] && column_name.to_s !~ /\s*DISTINCT\s+/i
-            distinct = 'DISTINCT ' 
-          end
-          sql = "SELECT #{operation}(#{distinct}#{column_name}) AS #{aggregate_alias}"
-
-          # 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
-
-          options[:group_fields].each_index{|i| sql << ", #{options[:group_fields][i]} AS #{options[:group_aliases][i]}" } if options[:group]
-          if options[:from]
-            sql << " FROM #{options[:from]} "
-          elsif scope && scope[:from] && !use_workaround
-            sql << " FROM #{scope[:from]} "
-          else
-            sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
-            sql << " FROM #{connection.quote_table_name(table_name)} "
-          end
-
-          joins = ""
-          add_joins!(joins, options[:joins], scope)
-
-          if merged_includes.any?
-            join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, joins)
-            sql << join_dependency.join_associations.collect{|join| join.association_join }.join
-          end
-
-          sql << joins unless joins.blank?
-
-          add_conditions!(sql, options[:conditions], scope)
-          add_limited_ids_condition!(sql, options, join_dependency) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
-
-          if options[:group]
-            group_key = connection.adapter_name == 'FrontBase' ?  :group_aliases : :group_fields
-            sql << " GROUP BY #{options[group_key].join(',')} "
-          end
-
-          if options[:group] && options[:having]
-            having = sanitize_sql_for_conditions(options[:having])
-
-            # FrontBase requires identifiers in the HAVING clause and chokes on function calls
-            if connection.adapter_name == 'FrontBase'
-              having.downcase!
-              having.gsub!(/#{operation}\s*\(\s*#{column_name}\s*\)/, aggregate_alias)
-            end
-
-            sql << " HAVING #{having} "
-          end
-
-          sql << " ORDER BY #{options[:order]} "       if options[:order]
-          add_limit!(sql, options, scope)
-          sql << ") #{aggregate_alias}_subquery" if use_workaround
-          sql
-        end
-
-        def execute_simple_calculation(operation, column_name, column, options) #:nodoc:
-          value = connection.select_value(construct_calculation_sql(operation, column_name, options))
-          type_cast_calculated_value(value, column, operation)
-        end
-
-        def execute_grouped_calculation(operation, column_name, column, options) #:nodoc:
-          group_attr    = options[:group]
-          association   = reflect_on_association(group_attr.to_s.to_sym)
-          associated    = association && association.macro == :belongs_to # only count belongs_to associations
-          group_fields  = Array(associated ? association.primary_key_name : group_attr)
-          group_aliases = []
-          group_columns = {}
-          
-          group_fields.each do |field|
-            group_aliases << column_alias_for(field)
-            group_columns[column_alias_for(field)] = column_for(field)
-          end
-
-          sql             = construct_calculation_sql(operation, column_name, options.merge(:group_fields => group_fields, :group_aliases => group_aliases))
-          calculated_data = connection.select_all(sql)
-          aggregate_alias = column_alias_for(operation, column_name)
-
-          if association
-            key_ids     = calculated_data.collect { |row| row[group_aliases.first] }
-            key_records = association.klass.base_class.find(key_ids)
-            key_records = key_records.inject({}) { |hsh, r| hsh.merge(r.id => r) }
-          end
-
-          calculated_data.inject(ActiveSupport::OrderedHash.new) do |all, row|
-            key   = group_aliases.map{|group_alias| type_cast_calculated_value(row[group_alias], group_columns[group_alias])}
-            key   = key.first if key.size == 1
-            key   = key_records[key] if associated
-            value = row[aggregate_alias]
-            all[key] = type_cast_calculated_value(value, column, operation)
-            all
-          end
-        end
-
-      private
-        def validate_calculation_options(operation, options = {})
-          options.assert_valid_keys(CALCULATIONS_OPTIONS)
-        end
-
-        # Converts the given keys to the value that the database adapter returns as
-        # a usable column name:
-        #
-        #   column_alias_for("users.id")                 # => "users_id"
-        #   column_alias_for("sum(id)")                  # => "sum_id"
-        #   column_alias_for("count(distinct users.id)") # => "count_distinct_users_id"
-        #   column_alias_for("count(*)")                 # => "count_all"
-        #   column_alias_for("count", "id")              # => "count_id"
-        def column_alias_for(*keys)
-          table_name = keys.join(' ')
-          table_name.downcase!
-          table_name.gsub!(/\*/, 'all')
-          table_name.gsub!(/\W+/, ' ')
-          table_name.strip!
-          table_name.gsub!(/ +/, '_')
-
-          connection.table_alias_for(table_name)
-        end
-
-        def column_for(field)
-          field_name = field.to_s.split('.').last
-          columns.detect { |c| c.name.to_s == field_name }
-        end
-
-        def type_cast_calculated_value(value, column, operation = nil)
-          if value.is_a?(String) || value.nil?
-            case operation.to_s.downcase
-            when 'count' then value.to_i
-            when 'sum'   then type_cast_using_column(value || '0', column)
-            when 'avg' then value.try(:to_d)
-            else type_cast_using_column(value, column)
-            end
-          else
-            value
-          end
-        end
-
-        def type_cast_using_column(value, column)
-          column ? column.type_cast(value) : value
-        end
-    end
-  end
-end