aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 20:00:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 20:00:04 +0000
commitccfcd9fe22c5fbffb154bce91c29f4f88603b80d (patch)
tree710487d251af6458a9f8d81f899d5daa360cb367 /activerecord/lib
parent3c756f85be3238d99194bcbc69089ef37b13a220 (diff)
downloadrails-ccfcd9fe22c5fbffb154bce91c29f4f88603b80d.tar.gz
rails-ccfcd9fe22c5fbffb154bce91c29f4f88603b80d.tar.bz2
rails-ccfcd9fe22c5fbffb154bce91c29f4f88603b80d.zip
Doc fixes
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3780 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/base.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 4e1d308285..6778811f60 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -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?