diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-08-31 15:49:47 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 15:49:47 +0930 |
| commit | 7721f23e86782baa758c70dd81de80aa0857ca2c (patch) | |
| tree | 4a04298847c4c94bcb353080c977691e5bff7840 | |
| parent | d81a2ede5916e1d1c0459b5981ba760d423327a2 (diff) | |
| parent | 39805720361f080a63c1febdbc62fe8246e39ec1 (diff) | |
| download | rails-7721f23e86782baa758c70dd81de80aa0857ca2c.tar.gz rails-7721f23e86782baa758c70dd81de80aa0857ca2c.tar.bz2 rails-7721f23e86782baa758c70dd81de80aa0857ca2c.zip | |
Merge pull request #30377 from keepcosmos/delegate-missing-methods
Delegate :rindex, :slice, :rotate(missing) to 'records'
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/relation/delegation_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index 1aa85993ca..c5354bf4e9 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -39,9 +39,9 @@ module ActiveRecord # for each different klass, and the delegations are compiled into that subclass only. delegate :to_xml, :encode_with, :length, :each, :uniq, :to_ary, :join, - :[], :&, :|, :+, :-, :sample, :reverse, :compact, :in_groups, :in_groups_of, + :[], :&, :|, :+, :-, :sample, :reverse, :rotate, :compact, :in_groups, :in_groups_of, :to_sentence, :to_formatted_s, :as_json, - :shuffle, :split, :index, to: :records + :shuffle, :split, :slice, :index, :rindex, to: :records delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, :connection, :columns_hash, to: :klass diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb index 04d688ac53..2696d1bb00 100644 --- a/activerecord/test/cases/relation/delegation_test.rb +++ b/activerecord/test/cases/relation/delegation_test.rb @@ -10,8 +10,8 @@ module ActiveRecord :+, :-, :|, :&, :[], :shuffle, :all?, :collect, :compact, :detect, :each, :each_cons, :each_with_index, :exclude?, :find_all, :flat_map, :group_by, :include?, :length, - :map, :none?, :one?, :partition, :reject, :reverse, - :sample, :second, :sort, :sort_by, :third, + :map, :none?, :one?, :partition, :reject, :reverse, :rotate, + :sample, :second, :sort, :sort_by, :slice, :third, :index, :rindex, :to_ary, :to_set, :to_xml, :to_yaml, :join, :in_groups, :in_groups_of, :to_sentence, :to_formatted_s, :as_json ] |