diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-18 12:10:37 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-18 12:10:48 -0700 |
| commit | e4f424d577df58225c0dbedb5ff4869d66a62e8f (patch) | |
| tree | 772c77cdf230d445aa8f2b9e9d81e2cc929dd0fe /activerecord/lib | |
| parent | 93f335b6fbfe7745678103f8f371d22a4d1ad7ab (diff) | |
| download | rails-e4f424d577df58225c0dbedb5ff4869d66a62e8f.tar.gz rails-e4f424d577df58225c0dbedb5ff4869d66a62e8f.tar.bz2 rails-e4f424d577df58225c0dbedb5ff4869d66a62e8f.zip | |
refactoring to remove duplicate logic
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 91c1e14028..7cf73f7eb3 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -163,6 +163,8 @@ module ActiveRecord def perform_calculation(operation, column_name, options = {}) operation = operation.to_s.downcase + distinct = nil + if operation == "count" column_name ||= (select_for_count || :all) @@ -171,10 +173,7 @@ module ActiveRecord column_name = @klass.primary_key if column_name == :all end - distinct = nil if column_name.to_s =~ /\s*DISTINCT\s+/i - distinct ||= options[:distinct] - else - distinct = nil + distinct = nil if column_name =~ /\s*DISTINCT\s+/i end distinct = options[:distinct] || distinct |