aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-12-05 22:07:55 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-12-05 22:07:55 +0000
commit8dea60b0c3a965c169127e0f1f4777bfbbc5e16d (patch)
tree151acc004fc343443949a8729dbb78314c7e5def /activerecord/lib
parenteb300f842864358c1b3b2809e4bbbe5af0f2eb33 (diff)
downloadrails-8dea60b0c3a965c169127e0f1f4777bfbbc5e16d.tar.gz
rails-8dea60b0c3a965c169127e0f1f4777bfbbc5e16d.tar.bz2
rails-8dea60b0c3a965c169127e0f1f4777bfbbc5e16d.zip
find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using. Closes #6764.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5682 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 3a9ddc3f8d..5c1e796cfd 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1172,6 +1172,7 @@ module ActiveRecord
add_order!(sql, options[:order], scope)
add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
+ add_lock!(sql, options, scope)
return sanitize_sql(sql)
end