aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorPaul <paul@odysseus.(none)>2008-11-26 15:21:12 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-11-26 15:25:39 +0100
commit9a4d557713acb0fc8e80f61af18094034aca029a (patch)
tree4fb39be87214bdb8fea3e263cae1484823562b97 /activerecord/lib/active_record/associations.rb
parent17940a82e8cb0ed278e1552b943dd033763978a1 (diff)
downloadrails-9a4d557713acb0fc8e80f61af18094034aca029a.tar.gz
rails-9a4d557713acb0fc8e80f61af18094034aca029a.tar.bz2
rails-9a4d557713acb0fc8e80f61af18094034aca029a.zip
Ensure hash conditions on referenced tables are considered when eager loading with limit/offset. [#1404 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 63e28a43ab..0546b76c63 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1733,6 +1733,7 @@ module ActiveRecord
case cond
when nil then all
when Array then all << cond.first
+ when Hash then all << cond.keys
else all << cond
end
end