From 0b92d38c0083c2077d0533014678ed017026fac1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 26 Oct 2005 13:20:02 +0000 Subject: Added :offset and :limit to the kinds of options that Base.constrain can use (closes #2466) [duane.johnson@gmail.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2748 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 3ded347178..febb35dd5b 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -809,7 +809,8 @@ module ActiveRecord #:nodoc: end # Add constraints to all queries to the same model in the given block. - # Currently supported constraints are :conditions and :joins + # Currently supported constraints are :conditions, :joins, + # :offset, and :limit # # Article.constrain(:conditions => "blog_id = 1") do # Article.find(1) # => SELECT * from articles WHERE blog_id = 1 AND id = 1 @@ -883,6 +884,8 @@ module ActiveRecord #:nodoc: end def add_limit!(sql, options) + options[:limit] ||= scope_constraints[:limit] if scope_constraints[:limit] + options[:offset] ||= scope_constraints[:offset] if scope_constraints[:offset] connection.add_limit_offset!(sql, options) end -- cgit v1.2.3