Ticket #2597: counting_and_limiting_for_named_associations.patch

activerecord/test/base_test.rb

@@ -1051 +1051 @@
-                        "LEFT JOIN comments ON posts.id=comments.post_id")
-    end
-    assert_equal res, res2
+    
+    res3 = res + 1
+    assert_nothing_raised do
+      res3 = Post.count(:conditions => "posts.#{QUOTED_TYPE} = 'Post'",
+                        :joins => "LEFT JOIN comments ON posts.id=comments.post_id")
+    end
+    assert_equal res, res3
-  end
-  
-  def test_clear_association_cache_stored     

activerecord/test/associations_go_eager_test.rb

@@ -120 +120 @@
-  end
-
-  def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
-
-
-
+
+
+
+
+
-  end
-
-  def test_eager_with_has_many_and_limit_with_no_results
@@ -141 +143 @@
-  end
-
-  def test_eager_with_has_many_and_limit_and_conditions_on_the_eagers
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_eager_association_loading_with_habtm

activerecord/lib/active_record/associations.rb

@@ -776 +776 @@
-            end
-          end
-        end
+        
+        def count_with_associations(options = {})
+          reflections = reflect_on_included_associations(options[:include])
+          primary_key = "#{table_name}.#{self.primary_key}"
+          return count_by_sql(construct_counter_sql_with_included_associations(options, primary_key, reflections))
+        end
-
-        def find_with_associations(options = {})
-          reflections  = reflect_on_included_associations(options[:include])
@@ -988 +994 @@
-            "#{name} Load Including Associations"
-          )
-        end
+      
+        def construct_counter_sql_with_included_associations(options, primary_key, reflections)
+          sql = "SELECT COUNT(DISTINCT #{primary_key}) FROM #{table_name} "
+          sql << reflections.collect { |reflection| association_join(reflection) }.to_s
+          sql << "#{options[:joins]} " if options[:joins]
-
+          add_conditions!(sql, options[:conditions])
+          add_sti_conditions!(sql, reflections)
+          add_limited_ids_condition!(sql, options, reflections) if !using_limitable_reflections?(reflections) && options[:limit]
+
+          add_limit!(sql, options) if using_limitable_reflections?(reflections)
+
+          return sanitize_sql(sql)
+        end
+
-        def construct_finder_sql_with_included_associations(options, schema_abbreviations, reflections)
-          sql = "SELECT #{column_aliases(schema_abbreviations)} FROM #{table_name} "
-          sql << reflections.collect { |reflection| association_join(reflection) }.to_s
-          sql << "#{options[:joins]} " if options[:joins]
-
+
-          add_conditions!(sql, options[:conditions])
-          add_sti_conditions!(sql, reflections)
-
+, reflections
-
-          sql << "ORDER BY #{options[:order]} " if options[:order]
-
+
-          add_limit!(sql, options) if using_limitable_reflections?(reflections)
-
+
-          return sanitize_sql(sql)
-        end
-
-
-
+
+, reflections
+, reflections
-            sql << "#{condition_word(sql)} #{table_name}.#{primary_key} IN (#{id_list}) "
-          end
-        end
-
-
+
+, reflections
-          connection.select_values(
-
+, reflections
-            "#{name} Load IDs For Limited Eager Loading"
-          ).collect { |id| connection.quote(id) }.join(", ")
-        end
-
-
-
+
+
+
+
+
-          
-
+
+
+
+
+
-          add_conditions!(sql, options[:conditions])
-          sql << "ORDER BY #{options[:order]} " if options[:order]
-          add_limit!(sql, options)

activerecord/lib/active_record/base.rb

@@ -502 +502 @@
-        connection.delete(sql, "#{name} Delete all")
-      end
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        sql  = "SELECT COUNT(*) FROM #{table_name} "
-joins} " if joins
-conditions
-count_by_sql(sql)
+options[:joins]} " if options[:joins]
+options[:conditions]
+sql
-      end
-
-      # Returns the result of an SQL statement that should only include a COUNT(*) in the SELECT part.

actionpack/lib/action_controller/pagination.rb

@@ -163 +163 @@
-    # Returns the total number of items in the collection to be paginated for
-    # the +model+ and given +conditions+. Override this method to implement a
-    # custom counter.
-
-
+
+
+
-    end
-
+  
-    # Returns a collection of items for the given +model+ and +options[conditions]+,
-    # ordered by +options[order]+, for the current page in the given +paginator+.
-    # Override this method to implement a custom finder.
@@ -185 +186 @@
-    def paginator_and_collection_for(collection_id, options) #:nodoc:
-      klass = options[:class_name].constantize
-      page  = @params[options[:parameter]]
-
-
-
+
-      paginator = Paginator.new(self, count, options[:per_page], page)
-      collection = find_collection_for_pagination(klass, options, paginator)
-  
+
-      return paginator, collection 
-    end
-