aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAlex Rothenberg <alex@alexrothenberg.com>2010-11-23 06:10:19 +0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-11-23 06:43:18 +0800
commit66c09372f3ef3d4ca2b99d44cf1859d585b9dcb3 (patch)
treebb879e6314ea5bc05cfaff7062df76d0bd9d5f89 /activerecord/lib
parent21fd93cedda9d96a81b06b96c541120a5da7a71a (diff)
downloadrails-66c09372f3ef3d4ca2b99d44cf1859d585b9dcb3.tar.gz
rails-66c09372f3ef3d4ca2b99d44cf1859d585b9dcb3.tar.bz2
rails-66c09372f3ef3d4ca2b99d44cf1859d585b9dcb3.zip
Removed ids_in_list_limit in favor of in_clause_length defined in database_limits.rb
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/association_preload.rb4
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb5
2 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
index 9743b1b4a7..5eb1071ba2 100644
--- a/activerecord/lib/active_record/association_preload.rb
+++ b/activerecord/lib/active_record/association_preload.rb
@@ -391,9 +391,9 @@ module ActiveRecord
# Some databases impose a limit on the number of ids in a list (in Oracle its 1000)
# Make several smaller queries if necessary or make one query if the adapter supports it
def associated_records(ids)
- max_ids_in_a_list = connection.ids_in_list_limit || ids.size
+ in_clause_length = connection.in_clause_length || ids.size
records = []
- ids.each_slice(max_ids_in_a_list) do |some_ids|
+ ids.each_slice(in_clause_length) do |some_ids|
records += yield(some_ids)
end
records
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index ada1560ce2..f3fba9a3a9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -91,11 +91,6 @@ module ActiveRecord
false
end
- # Does this adapter restrict the number of ids you can use in a list. Oracle has a limit of 1000.
- def ids_in_list_limit
- nil
- end
-
# QUOTING ==================================================
# Override to return the quoted table name. Defaults to column quoting.