@@ -14,7 +14,16 @@ module ActiveRecord @finder_sql + " AND (#{sanitize_sql(options[:conditions])})" options[:include] ||= @reflection.options[:include] - @reflection.klass.count(column_name, options) + value = @reflection.klass.count(column_name, options) + + limit = @reflection.options[:limit] + offset = @reflection.options[:offset] + + if limit || offset + [ [value - offset.to_i, 0].max, limit.to_i ].min + else + value + end end end activerecord/lib/active_record/associations/has_many_association.rb @@ -48,6 +48,12 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal 2, Firm.find(:first).plain_clients.count(:name) end + def test_counting_with_association_limit + firm = companies(:first_firm) + assert_equal firm.limited_clients.length, firm.limited_clients.size + assert_equal firm.limited_clients.length, firm.limited_clients.count + end + def test_finding assert_equal 2, Firm.find(:first).clients.length end activerecord/test/cases/associations/has_many_associations_test.rb 13671cc565aad2327f81a29789154b829ceeda04 Tarmo Tänav tarmo@itech.ee http://github.com/rails/rails/commit/96c6fe084228d570dad80e3100830edb2bc0448d 96c6fe084228d570dad80e3100830edb2bc0448d 2008-08-27T23:32:21-07:00 2008-08-26T09:29:16-07:00 Implement count limit/offset support for has_many associations [#348 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> f573cc36df43094cb2b9f7a5cf6ba3406e5edb24 Jeremy Kemper jeremy@bitsweat.net