diff options
author | Marcel Molina <marcel@vernix.org> | 2005-10-09 21:42:40 +0000 |
---|---|---|
committer | Marcel Molina <marcel@vernix.org> | 2005-10-09 21:42:40 +0000 |
commit | 89733eaecffef3c1ad55345677411c872b1c99e4 (patch) | |
tree | 05c79ea599afc091b2c57e3e5c56fb68ce392882 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | 68a322005d367981ba72c6a667c16dd171803869 (diff) | |
download | rails-89733eaecffef3c1ad55345677411c872b1c99e4.tar.gz rails-89733eaecffef3c1ad55345677411c872b1c99e4.tar.bz2 rails-89733eaecffef3c1ad55345677411c872b1c99e4.zip |
Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index d56e1f90da..886363bcbe 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -195,11 +195,11 @@ module ActiveRecord def add_limit_offset!(sql, options) #:nodoc - if options[:limit] - if options[:offset].blank? - sql << " LIMIT #{options[:limit]}" + if limit = options[:limit] + unless offset = options[:offset] + sql << " LIMIT #{limit}" else - sql << " LIMIT #{options[:offset]}, #{options[:limit]}" + sql << " LIMIT #{offset}, #{limit}" end end end |