From b9ce3419e5a9bdc4ade20f21a6c93e76a3b69caf Mon Sep 17 00:00:00 2001
From: "Robert Pankowecki (Gavdi)" <rpa@gavdi.com>
Date: Fri, 31 Dec 2010 21:17:07 +0800
Subject: User id instead of quoted_id to prevent double quoting. Fixes failing
 test for bug #6036.

---
 activerecord/lib/active_record/relation/predicate_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index b3f1b9e36a..61d9974570 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -20,7 +20,7 @@ module ActiveRecord
           case value
           when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
             values = value.to_a.map { |x|
-              x.respond_to?(:quoted_id) ? x.quoted_id : x
+              x.is_a?(ActiveRecord::Base) ? x.id : x
             }
             attribute.in(values)
           when Range, Arel::Relation
-- 
cgit v1.2.3