diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-20 03:15:22 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-20 03:15:22 +0000 |
| commit | 377bdd02b9daba35113299262a98060763925959 (patch) | |
| tree | c5db590773c64d334b81a42291d01a6030c1fc84 /actionpack/lib/action_controller | |
| parent | 03acf48817d38e8ec4078d50f6ab48a2dfc035b3 (diff) | |
| download | rails-377bdd02b9daba35113299262a98060763925959.tar.gz rails-377bdd02b9daba35113299262a98060763925959.tar.bz2 rails-377bdd02b9daba35113299262a98060763925959.zip | |
Added :count option to pagination that'll make it possible for the ActiveRecord::Base.count call to using something else than * for the count. Especially important for count queries using DISTINCT #3839 [skaes]. Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT (closes #3839) [skaes].
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3620 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/pagination.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/pagination.rb b/actionpack/lib/action_controller/pagination.rb index 2f1a1d985c..630b244a0e 100644 --- a/actionpack/lib/action_controller/pagination.rb +++ b/actionpack/lib/action_controller/pagination.rb @@ -71,6 +71,7 @@ module ActionController :order => nil, :join => nil, :joins => nil, + :count => nil, :include => nil, :select => nil, :parameter => 'page' @@ -119,6 +120,10 @@ module ActionController # and Model.count # <tt>:include</tt>:: optional eager loading parameter passed to Model.find(:all, *params) # and Model.count + # <tt>:select</tt>:: :select parameter passed to Model.find(:all, *params) + # + # <tt>:count</tt>:: parameter passed as :select option to Model.count(*params) + # def paginate(collection_id, options={}) Pagination.validate_options!(collection_id, options, true) paginator_and_collection_for(collection_id, options) @@ -165,7 +170,9 @@ module ActionController # custom counter. def count_collection_for_pagination(model, options) model.count(:conditions => options[:conditions], - :joins => options[:join] || options[:joins], :include => options[:include]) + :joins => options[:join] || options[:joins], + :include => options[:include], + :select => options[:count]) end # Returns a collection of items for the given +model+ and +options[conditions]+, |