diff options
| author | Mislav Marohnić <mislav.marohnic@gmail.com> | 2010-07-08 22:17:21 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-13 08:09:28 +0200 |
| commit | 571cb1ddc6692ed96e04a14e670beb01ba8c93ca (patch) | |
| tree | 0fddb6ca18f36398a3087d2e3bcf311d7720234a /activerecord/lib/active_record | |
| parent | 34013115626b2632ffe8ec357e2c5f47cfa059b2 (diff) | |
| download | rails-571cb1ddc6692ed96e04a14e670beb01ba8c93ca.tar.gz rails-571cb1ddc6692ed96e04a14e670beb01ba8c93ca.tar.bz2 rails-571cb1ddc6692ed96e04a14e670beb01ba8c93ca.zip | |
enable AS::JSON.encode to encode AR::Relation by providing `as_json` method
[#5073 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index d9fc1b4940..7499100f55 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -10,7 +10,7 @@ module ActiveRecord include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches - delegate :to_xml, :to_json, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a + delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a delegate :insert, :to => :arel attr_reader :table, :klass @@ -74,6 +74,8 @@ module ActiveRecord @records end + def as_json(options = nil) to_a end #:nodoc: + # Returns size of the records. def size loaded? ? @records.length : count |