diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-28 00:12:15 +0200 |
| commit | 4329f8133fee8e4f3e558787f67de59f0c4a4dd1 (patch) | |
| tree | 346ef7340d8348e50d119ca749a16c1654c20a08 /activerecord/lib/active_record/relation.rb | |
| parent | c37f7d66e49ffe5ac2115cc30e5529fd1c2924a8 (diff) | |
| parent | ebee77a28a7267d5f23a28ba23c1eb88a2d7d527 (diff) | |
| download | rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.gz rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.tar.bz2 rails-4329f8133fee8e4f3e558787f67de59f0c4a4dd1.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 66970a5ea1..fd0660a138 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 :length, :collect, :map, :each, :all?, :include?, :to => :to_a + delegate :to_xml, :to_json, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a delegate :insert, :to => :arel attr_reader :table, :klass @@ -328,6 +328,15 @@ module ActiveRecord to_a.inspect end + def extend(*args, &block) + if block_given? + apply_modules Module.new(&block) + self + else + super + end + end + protected def method_missing(method, *args, &block) |