diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-16 23:27:19 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-16 23:31:35 -0300 |
| commit | 8432d03460b8fde30f203fdff2431a091f8347dd (patch) | |
| tree | ec41784435ef6aef1b1a08431aaeb56af0df7299 /activerecord/lib/active_record/associations/collection_association.rb | |
| parent | 6abe0e7b4e10b8626d1a294eaa5fcaa28ec9f27d (diff) | |
| download | rails-8432d03460b8fde30f203fdff2431a091f8347dd.tar.gz rails-8432d03460b8fde30f203fdff2431a091f8347dd.tar.bz2 rails-8432d03460b8fde30f203fdff2431a091f8347dd.zip | |
Merge pull request #7651 from steveklabnik/issue_3956
Don't preserve SELECT columns on COUNT
Closes #7651
Conflicts:
activerecord/test/cases/associations/has_many_associations_test.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index d929a45c92..3604d98015 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -362,7 +362,7 @@ module ActiveRecord # replace the SELECT clause with COUNT(SELECTS), preserving any hints within /* ... */ interpolate(options[:finder_sql]).sub(/SELECT\b(\/\*.*?\*\/ )?(.*)\bFROM\b/im) do count_with = $2.to_s - count_with = '*' if count_with.blank? || count_with =~ /,/ + count_with = '*' if count_with.blank? || count_with =~ /,/ || count_with =~ /\.\*/ "SELECT #{$1}COUNT(#{count_with}) FROM" end end |