diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-21 15:14:29 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-21 15:14:29 -0800 |
commit | 8ed3ab00f1ba8cdf48dea4ca28d2d3a7e73396ab (patch) | |
tree | 1747542bbe74522a53608599e0875bd37fea80b5 /lib | |
parent | 1c48bef21533039c81fdcaf868be518d5c16e383 (diff) | |
download | rails-8ed3ab00f1ba8cdf48dea4ca28d2d3a7e73396ab.tar.gz rails-8ed3ab00f1ba8cdf48dea4ca28d2d3a7e73396ab.tar.bz2 rails-8ed3ab00f1ba8cdf48dea4ca28d2d3a7e73396ab.zip |
Lock should be a unary node
Diffstat (limited to 'lib')
-rw-r--r-- | lib/arel/nodes.rb | 1 | ||||
-rw-r--r-- | lib/arel/nodes/lock.rb | 10 | ||||
-rw-r--r-- | lib/arel/nodes/unary.rb | 1 | ||||
-rw-r--r-- | lib/arel/visitors/mysql.rb | 4 | ||||
-rw-r--r-- | lib/arel/visitors/postgresql.rb | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index cbd10c31e0..442b313593 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -1,6 +1,5 @@ # node require 'arel/nodes/node' -require 'arel/nodes/lock' require 'arel/nodes/select_statement' require 'arel/nodes/select_core' require 'arel/nodes/insert_statement' diff --git a/lib/arel/nodes/lock.rb b/lib/arel/nodes/lock.rb deleted file mode 100644 index f4eaf125e0..0000000000 --- a/lib/arel/nodes/lock.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Arel - module Nodes - class Lock < Arel::Nodes::Node - attr_reader :locking - def initialize locking = true - @locking = locking - end - end - end -end diff --git a/lib/arel/nodes/unary.rb b/lib/arel/nodes/unary.rb index e1576b9c99..1b1dcb1053 100644 --- a/lib/arel/nodes/unary.rb +++ b/lib/arel/nodes/unary.rb @@ -18,6 +18,7 @@ module Arel Offset On Top + Lock }.each do |name| const_set(name, Class.new(Unary)) end diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb index 8f9c3cc809..dad4d5e3b2 100644 --- a/lib/arel/visitors/mysql.rb +++ b/lib/arel/visitors/mysql.rb @@ -3,8 +3,8 @@ module Arel class MySQL < Arel::Visitors::ToSql private def visit_Arel_Nodes_Lock o - if o.locking.is_a?(String) - o.locking + if o.expr.is_a?(String) + o.expr else "FOR UPDATE" end diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb index 45e7349fd3..68b483910e 100644 --- a/lib/arel/visitors/postgresql.rb +++ b/lib/arel/visitors/postgresql.rb @@ -3,8 +3,8 @@ module Arel class PostgreSQL < Arel::Visitors::ToSql private def visit_Arel_Nodes_Lock o - if o.locking.is_a?(String) - o.locking + if o.expr.is_a?(String) + o.expr else "FOR UPDATE" end |