diff options
| author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2018-07-21 07:49:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 07:49:34 -0500 |
| commit | d162188dd662a7d9f62ba8431474f50bc35e3e93 (patch) | |
| tree | b47237a957f6021193fe7299b83bd27544e22165 /activerecord/lib | |
| parent | 3576782888c307e3e192c44e332b957cd1174128 (diff) | |
| parent | 06d506f0d001ef09120212e4a15cd3e6437ff876 (diff) | |
| download | rails-d162188dd662a7d9f62ba8431474f50bc35e3e93.tar.gz rails-d162188dd662a7d9f62ba8431474f50bc35e3e93.tar.bz2 rails-d162188dd662a7d9f62ba8431474f50bc35e3e93.zip | |
Merge pull request #24131 from brchristian/limit_and_primary_key
ActiveRecord: limit() and primary_key
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index c5562c1ff0..93f3b67686 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -550,7 +550,7 @@ module ActiveRecord end def ordered_relation - if order_values.empty? && primary_key + if order_values.empty? && primary_key && limit_value.blank? order(arel_attribute(primary_key).asc) else self |