diff options
| author | Oscar Del Ben <oscar@oscardelben.com> | 2012-07-17 16:21:22 -0700 |
|---|---|---|
| committer | Oscar Del Ben <oscar@oscardelben.com> | 2012-07-17 16:21:22 -0700 |
| commit | 27014bbf513ebb2dde143ebd745283496e7db558 (patch) | |
| tree | 0f6640a4da9302c1ab84c204d8a0cee500de80d0 /activerecord/lib | |
| parent | 21123d3a7d4f87c9e61462248e3e5c7c7af1438f (diff) | |
| download | rails-27014bbf513ebb2dde143ebd745283496e7db558.tar.gz rails-27014bbf513ebb2dde143ebd745283496e7db558.tar.bz2 rails-27014bbf513ebb2dde143ebd745283496e7db558.zip | |
Add nodocs to delegation module and docs for merge!
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index 64dda4f35a..a1c7e5b549 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -1,7 +1,7 @@ require 'active_support/core_ext/module/delegation' module ActiveRecord - module Delegation + module Delegation # :nodoc: # Set up common delegations for performance (avoids method_missing) delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, :to => :to_a delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key, diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index 80d087a9ea..d21f02cd5f 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -34,6 +34,7 @@ module ActiveRecord end end + # Like #merge, but applies changes in place. def merge!(other) klass = other.is_a?(Hash) ? Relation::HashMerger : Relation::Merger klass.new(self, other).merge |