diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-12 17:00:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-12 17:00:04 +0000 |
| commit | fa9b4c4e43b83266876b0a86978be232fc74ec3a (patch) | |
| tree | 05358cd5b3571c970966df63cd67b8677976b7dd /activerecord | |
| parent | 21a44916ae39cb622c11c3e206a74925d114cfa8 (diff) | |
| parent | 4368dba5eea2fe5e06dabf26b62e20ccee274644 (diff) | |
| download | rails-fa9b4c4e43b83266876b0a86978be232fc74ec3a.tar.gz rails-fa9b4c4e43b83266876b0a86978be232fc74ec3a.tar.bz2 rails-fa9b4c4e43b83266876b0a86978be232fc74ec3a.zip | |
Merge pull request #28372 from kamipo/delegate_as_json
Simply delegate `as_json` to `records`
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/relation/delegation_test.rb | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 61ee09bcc8..2d6b21bec5 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -261,10 +261,6 @@ module ActiveRecord coder.represent_seq(nil, records) end - def as_json(options = nil) #:nodoc: - records.as_json(options) - end - # Returns size of the records. def size loaded? ? @records.length : count(:all) diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index d3ba724507..0612151584 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -38,7 +38,7 @@ module ActiveRecord delegate :to_xml, :encode_with, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join, :[], :&, :|, :+, :-, :sample, :reverse, :compact, :in_groups, :in_groups_of, - :to_sentence, :to_formatted_s, + :to_sentence, :to_formatted_s, :as_json, :shuffle, :split, :index, to: :records delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb index 49d4aeafc9..8cb7b82015 100644 --- a/activerecord/test/cases/relation/delegation_test.rb +++ b/activerecord/test/cases/relation/delegation_test.rb @@ -33,7 +33,7 @@ module ActiveRecord :map, :none?, :one?, :partition, :reject, :reverse, :sample, :second, :sort, :sort_by, :third, :to_ary, :to_set, :to_xml, :to_yaml, :join, - :in_groups, :in_groups_of, :to_sentence, :to_formatted_s + :in_groups, :in_groups_of, :to_sentence, :to_formatted_s, :as_json ] ARRAY_DELEGATES.each do |method| |