diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-07 14:49:24 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-07 14:49:24 +0900 |
| commit | 01c54e29bd288bf250b6e277046594f06b211a6f (patch) | |
| tree | cf5a0c2973810c7f4372d578fc31a1b851a667f1 /activerecord | |
| parent | 487a1061cc496455dfe5ee84d1e49d509c1675b5 (diff) | |
| download | rails-01c54e29bd288bf250b6e277046594f06b211a6f.tar.gz rails-01c54e29bd288bf250b6e277046594f06b211a6f.tar.bz2 rails-01c54e29bd288bf250b6e277046594f06b211a6f.zip | |
Revert "✂️"
This reverts commit 487a1061cc496455dfe5ee84d1e49d509c1675b5.
This `#--` is necessary for the doc of `distinct`.
[ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index cff30cb027..9a30198b95 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -747,7 +747,8 @@ module ActiveRecord # # #<Pet name: "Fancy-Fancy">, # # #<Pet name: "Fancy-Fancy"> # # ] - # + + #-- def calculate(operation, column_name) null_scope? ? scope.calculate(operation, column_name) : super end |