@@ -1722,7 +1722,7 @@ module ActiveRecord #:nodoc: def attribute_condition(argument) case argument when nil then "IS ?" - when Array, ActiveRecord::Associations::AssociationCollection then "IN (?)" + when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope then "IN (?)" when Range then "BETWEEN ? AND ?" else "= ?" end activerecord/lib/active_record/base.rb @@ -4,6 +4,7 @@ require 'models/topic' require 'models/comment' require 'models/reply' require 'models/author' +require 'models/developer' class NamedScopeTest < ActiveRecord::TestCase fixtures :posts, :authors, :topics, :comments, :author_addresses @@ -189,4 +190,8 @@ class NamedScopeTest < ActiveRecord::TestCase def test_find_all_should_behave_like_select assert_equal Topic.base.select(&:approved), Topic.base.find_all(&:approved) end + + def test_should_use_where_in_query_for_named_scope + assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises) + end end activerecord/test/cases/named_scope_test.rb @@ -43,6 +43,8 @@ class Developer < ActiveRecord::Base has_many :audit_logs + named_scope :jamises, :conditions => {:name => 'Jamis'} + validates_inclusion_of :salary, :in => 50000..200000 validates_length_of :name, :within => 3..20 activerecord/test/models/developer.rb 0048f558e69cfc2675552dd31ea773b2b8271e9b Philip Hallstrom philip@pjkh.com http://github.com/rails/rails/commit/2092f26edbd6de6d542a7bbd5b4dd30d5fd66ef4 2092f26edbd6de6d542a7bbd5b4dd30d5fd66ef4 2008-08-24T09:41:51-07:00 2008-08-21T08:08:42-07:00 Fix generated WHERE IN query for named scopes. [#583 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> af118cd48cff4ee71b9e3440243201ecf5c3b092 Tarmo Tänav tarmo@itech.ee