kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Doc fixes

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3780 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-03-05 20:00:04 +00:00
parent 3c756f85be
commit ccfcd9fe22
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
activerecord/lib/active_record/base.rb
View file

@ -906,6 +906,7 @@ module ActiveRecord #:nodoc:
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 @@ module ActiveRecord #:nodoc:
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 @@ module ActiveRecord #:nodoc:
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?