Correctly quote id list for limited eager loading. Closes #7482.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7588 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index a508a9c94d..cb821ba7f0 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1256,12 +1256,14 @@ module ActiveRecord
             throw :invalid_query
           end
         end
- 
+
         def select_limited_ids_list(options, join_dependency)
+          pk = columns_hash[primary_key]
+
           connection.select_all(
             construct_finder_sql_for_association_limiting(options, join_dependency),
             "#{name} Load IDs For Limited Eager Loading"
-          ).collect { |row| connection.quote(row[primary_key]) }.join(", ")
+          ).collect { |row| connection.quote(row[primary_key], pk) }.join(", ")
         end
 
         def construct_finder_sql_for_association_limiting(options, join_dependency)