@@ -214,6 +214,7 @@ module ActiveRecord def include?(record) return false unless record.is_a?(@reflection.klass) + load_target if @reflection.options[:finder_sql] && !loaded? return @target.include?(record) if loaded? exists?(record) end activerecord/lib/active_record/associations/association_collection.rb @@ -832,6 +832,17 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert ! firm.clients.loaded? end + def test_include_loads_collection_if_target_uses_finder_sql + firm = companies(:first_firm) + client = firm.clients_using_sql.first + + firm.reload + assert ! firm.clients_using_sql.loaded? + assert firm.clients_using_sql.include?(client) + assert firm.clients_using_sql.loaded? + end + + def test_include_returns_false_for_non_matching_record_to_verify_scoping firm = companies(:first_firm) client = Client.create!(:name => 'Not Associated') activerecord/test/cases/associations/has_many_associations_test.rb ae51013c3f7b8a8579fcb99d889ed80e9dd75797 Joshua Bates joshuabates@gmail.com http://github.com/rails/rails/commit/b6aa0e13b4e590b82550a6464924f431e57229df b6aa0e13b4e590b82550a6464924f431e57229df 2008-04-23T01:18:09-07:00 2008-04-17T11:58:32-07:00 Fix include? on has_many collections with finder_sql to fall back to Array include? rather than try to use SQL. [#18 state:resolved] 48afd640a589e8d727ec52eda8daadc29a183356 Michael Koziarski michael@koziarski.com