Permalink
Browse files

Doc fixes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3780 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Mar 5, 2006
1 parent 3c756f8 commit ccfcd9fe22c5fbffb154bce91c29f4f88603b80d
Showing with 4 additions and 3 deletions.
  1. +4 −3 activerecord/lib/active_record/base.rb
@@ -906,6 +906,7 @@ def with_scope(method_scoping = {}, action = :merge, &block)
end
end
+ # Works like with_scope, but discards any nested properties.
def with_exclusive_scope(method_scoping = {}, &block)
with_scope(method_scoping, :overwrite, &block)
end
@@ -916,12 +917,12 @@ def ===(object)
end
# Deprecated
- def threaded_connections
+ def threaded_connections #:nodoc:
allow_concurrency
end
# Deprecated
- def threaded_connections=(value)
+ def threaded_connections=(value) #:nodoc:
self.allow_concurrency = value
end
@@ -994,7 +995,7 @@ def add_joins!(sql, options)
end
# Adds a sanitized version of +conditions+ to the +sql+ string. Note that the passed-in +sql+ string is changed.
- def add_conditions!(sql, conditions)
+ def add_conditions!(sql, conditions)
segments = [sanitize_sql(scope(:find, :conditions))]
segments << sanitize_sql(conditions) unless conditions.nil?
segments << type_condition unless descends_from_active_record?

0 comments on commit ccfcd9f

Please sign in to comment.