diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-13 12:56:47 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-13 12:56:47 -0700 |
| commit | dcff027a5242b20c0c90eb062dddb22ccf51aed9 (patch) | |
| tree | 4f48cbb994b67e07b1842f5e0efa0e875325b4ae /activerecord/lib/active_record/associations/collection_proxy.rb | |
| parent | 3a2093984ff49d86db1efeff0c7581e788ecfb9f (diff) | |
| parent | 42d3d3c217d158873409c50c429ae711a0306d99 (diff) | |
| download | rails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.tar.gz rails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.tar.bz2 rails-dcff027a5242b20c0c90eb062dddb22ccf51aed9.zip | |
Merge pull request #12518 from vipulnsward/remove_count_options
`Relation#count` doesn't use options anymore.
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index ea7f768a68..0b6cdf5217 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -669,8 +669,8 @@ module ActiveRecord # # #<Pet id: 2, name: "Spook", person_id: 1>, # # #<Pet id: 3, name: "Choo-Choo", person_id: 1> # # ] - def count(column_name = nil, options = {}) - @association.count(column_name, options) + def count(column_name = nil) + @association.count(column_name) end # Returns the size of the collection. If the collection hasn't been loaded, |