diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-07-16 20:26:10 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-07-16 20:26:10 +0000 |
| commit | 872c5f4380ca348ff9ed19963e827289fb831fdf (patch) | |
| tree | 47f486fb23a24dfaba9b16cf6c87d16d751c8f52 /activerecord/lib/active_record/associations | |
| parent | 4ef5af8d4ddad82295920cc7d83fba6cbb10ad71 (diff) | |
| download | rails-872c5f4380ca348ff9ed19963e827289fb831fdf.tar.gz rails-872c5f4380ca348ff9ed19963e827289fb831fdf.tar.bz2 rails-872c5f4380ca348ff9ed19963e827289fb831fdf.zip | |
Remove deprecated count(conditions=nil, joins=nil) usage. Closes #8993 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 1c96353863..393d59b084 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -27,7 +27,7 @@ module ActiveRecord elsif @reflection.options[:finder_sql] @reflection.klass.count_by_sql(@finder_sql) else - column_name, options = @reflection.klass.send(:construct_count_options_from_legacy_args, *args) + column_name, options = @reflection.klass.send(:construct_count_options_from_args, *args) options[:conditions] = options[:conditions].nil? ? @finder_sql : @finder_sql + " AND (#{sanitize_sql(options[:conditions])})" |