aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/nodes
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-02-21 15:11:14 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-21 15:11:14 -0800
commit1c48bef21533039c81fdcaf868be518d5c16e383 (patch)
treea56c1d1c81fbc680c230b550458b3d1816252c04 /lib/arel/nodes
parenta4c10530e70fc42358cf7ea32440376f2c3c4c58 (diff)
parent6c65b0176223c90e08903ebc1a9a1075659f2c43 (diff)
downloadrails-1c48bef21533039c81fdcaf868be518d5c16e383.tar.gz
rails-1c48bef21533039c81fdcaf868be518d5c16e383.tar.bz2
rails-1c48bef21533039c81fdcaf868be518d5c16e383.zip
Merge remote branch 'jstorimer/master' into omg
* jstorimer/master: Allow database specific locking clauses to be used
Diffstat (limited to 'lib/arel/nodes')
-rw-r--r--lib/arel/nodes/lock.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/arel/nodes/lock.rb b/lib/arel/nodes/lock.rb
index e5fb258e26..f4eaf125e0 100644
--- a/lib/arel/nodes/lock.rb
+++ b/lib/arel/nodes/lock.rb
@@ -1,6 +1,10 @@
module Arel
module Nodes
class Lock < Arel::Nodes::Node
+ attr_reader :locking
+ def initialize locking = true
+ @locking = locking
+ end
end
end
end