diff options
| author | Mark Thomson <nzl216@gmail.com> | 2012-03-17 22:29:46 -0500 |
|---|---|---|
| committer | Mark Thomson <nzl216@gmail.com> | 2012-03-17 22:29:46 -0500 |
| commit | f2bc404ba82431d32a35b4de15cb21f179bc24c7 (patch) | |
| tree | ca58ce1118eeda244ced0ef0a1d94ed7ca38e5e0 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 98b4ef730696062b624c508d22ca76d9caa018cc (diff) | |
| parent | 6ce54d4ba8c220a84e55e7dd798d364c3f48d9f7 (diff) | |
| download | rails-f2bc404ba82431d32a35b4de15cb21f179bc24c7.tar.gz rails-f2bc404ba82431d32a35b4de15cb21f179bc24c7.tar.bz2 rails-f2bc404ba82431d32a35b4de15cb21f179bc24c7.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 87dd513880..d737b34115 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -329,7 +329,7 @@ module ActiveRecord arel.having(*@having_values.uniq.reject{|h| h.blank?}) unless @having_values.empty? arel.take(connection.sanitize_limit(@limit_value)) if @limit_value - arel.skip(@offset_value) if @offset_value + arel.skip(@offset_value.to_i) if @offset_value arel.group(*@group_values.uniq.reject{|g| g.blank?}) unless @group_values.empty? |