diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 70004ec458..df42303905 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -706,14 +706,17 @@ module ActiveRecord #:nodoc: sql << "#{options[:joins]} " if options[:joins] add_conditions!(sql, options[:conditions]) sql << "ORDER BY #{options[:order]} " if options[:order] + add_limit!(sql, options) + + return sql + end + def add_limit!(sql, options) if options[:limit] && options[:offset] connection.add_limit_with_offset!(sql, options[:limit].to_i, options[:offset].to_i) elsif options[:limit] connection.add_limit_without_offset!(sql, options[:limit].to_i) end - - return sql end # Adds a sanitized version of +conditions+ to the +sql+ string. Note that it's the passed +sql+ string is changed. |