aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/preloader
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2013-01-11 01:34:43 -0800
committerJon Leighton <j@jonathanleighton.com>2013-01-11 01:34:43 -0800
commit15b7482dfcf4285f6a0278671dcb67f2c6b0132d (patch)
treedb077eab5e9c2fd9ceca37eef847ffe0bf249b97 /activerecord/lib/active_record/associations/preloader
parent92fada9b8c10b75d88190938ea2fd5a92277697b (diff)
parent1a7567d2afd86e4213a9c682e1e2e9be0ff84786 (diff)
downloadrails-15b7482dfcf4285f6a0278671dcb67f2c6b0132d.tar.gz
rails-15b7482dfcf4285f6a0278671dcb67f2c6b0132d.tar.bz2
rails-15b7482dfcf4285f6a0278671dcb67f2c6b0132d.zip
Merge pull request #8568 from inossidabile/fix-in_clause_length
Correct source for in_clause_length for eager loading (Fix for #8474)
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader')
-rw-r--r--activerecord/lib/active_record/associations/preloader/association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index cbf5e734ea..82588905c6 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -76,7 +76,7 @@ module ActiveRecord
else
# Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
# Make several smaller queries if necessary or make one query if the adapter supports it
- sliced = owner_keys.each_slice(model.connection.in_clause_length || owner_keys.size)
+ sliced = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
records = sliced.map { |slice| records_for(slice).to_a }.flatten
end