From 78253acb599102528498d2257a37361a39f850f7 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 3 Feb 2008 01:09:58 +0000 Subject: Revert r8742: remove has_many with :group option since it has sketchy sql support. Closes #10480. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8790 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 6 ------ .../active_record/associations/has_many_through_association.rb | 9 --------- 2 files changed, 15 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index a1c8bd6e50..cb17b6e483 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -55,12 +55,6 @@ module ActiveRecord end end - class HasManyThroughCantCountOnColumnForGroupedAssociation < ActiveRecordError #:nodoc: - def initialize(owner, reflection, column_name) - super("Cannot count on column '#{column_name}' for association '#{owner.class.name}##{reflection.name}' grouped by '#{reflection.options[:group]}'.") - end - end - class EagerLoadPolymorphicError < ActiveRecordError #:nodoc: def initialize(reflection) super("Can not eagerly load the polymorphic association #{reflection.name.inspect}") diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 06ea5d1d1c..94842f424d 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -124,15 +124,6 @@ module ActiveRecord column_name = "#{@reflection.quoted_table_name}.#{@reflection.klass.primary_key}" if column_name == :all options.merge!(:distinct => true) end - - if @reflection.options[:group] - unless column_name == :all - raise HasManyThroughCantCountOnColumnForGroupedAssociation.new(@owner, @reflection, column_name) - end - column_name = @reflection.options[:group] - options.merge!(:distinct => true) - end - @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.count(column_name, options) } end -- cgit v1.2.3