aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-04 02:47:05 +0900
committerGitHub <noreply@github.com>2019-03-04 02:47:05 +0900
commit5ccf53056a44eda7379a2e74f88079582419c8e7 (patch)
tree520ab5bad11c4ba874ac6bf8518a10aaed56a7e7 /activerecord/lib
parentef25fbfc713d3dea833952599c921a389df0afa7 (diff)
parent82b0ff03b1d97c29472a65ef15103932d15ff75e (diff)
downloadrails-5ccf53056a44eda7379a2e74f88079582419c8e7.tar.gz
rails-5ccf53056a44eda7379a2e74f88079582419c8e7.tar.bz2
rails-5ccf53056a44eda7379a2e74f88079582419c8e7.zip
Merge pull request #35460 from abhaynikam/33611-follow-up-on-add-reselect
Fixed reselect throwing NoMethodError on ActiveRecord.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/querying.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index b3eeb60571..79af51bdba 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -11,7 +11,8 @@ module ActiveRecord
delegate :find_each, :find_in_batches, :in_batches, to: :all
delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :left_joins, :left_outer_joins, :or,
:where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending,
- :having, :create_with, :distinct, :references, :none, :unscope, :merge, to: :all
+ :having, :create_with, :distinct, :references, :none, :unscope, :merge,
+ :reselect, to: :all
delegate :count, :average, :minimum, :maximum, :sum, :calculate, to: :all
delegate :pluck, :pick, :ids, to: :all