Allow database specific locking clauses to be used

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

lib/arel/select_manager.rb

@@ -40,7 +40,7 @@ module Arel
     def lock locking = true
       # FIXME: do we even need to store this?  If locking is +false+ shouldn't
       # we just remove the node from the AST?
-      @ast.lock = Nodes::Lock.new
+      @ast.lock = Nodes::Lock.new(locking)
       self
     end
 

lib/arel/visitors/mysql.rb

@@ -3,8 +3,12 @@ module Arel
     class MySQL < Arel::Visitors::ToSql
       private
       def visit_Arel_Nodes_Lock o
+        if o.locking.is_a?(String)
+          o.locking
+        else
           "FOR UPDATE"
         end
+      end
 
       ###
       # :'(

lib/arel/visitors/postgresql.rb

@@ -3,8 +3,12 @@ module Arel
     class PostgreSQL < Arel::Visitors::ToSql
       private
       def visit_Arel_Nodes_Lock o
+        if o.locking.is_a?(String)
+          o.locking
+        else
           "FOR UPDATE"
         end
+      end
 
       def visit_Arel_Nodes_SelectStatement o
         if !o.orders.empty? && using_distinct_on?(o)

test/visitors/test_mysql.rb

@@ -29,11 +29,16 @@ module Arel
         sql.must_be_like "SELECT FROM DUAL"
       end
 
-      it 'uses FOR UPDATE when locking' do
+      describe 'locking' do
-        stmt = Nodes::SelectStatement.new
+        it 'defaults to FOR UPDATE when locking' do
-        stmt.lock = Nodes::Lock.new
+          node = Nodes::Lock.new
-        sql = @visitor.accept(stmt)
+          @visitor.accept(node).must_be_like "FOR UPDATE"
-        sql.must_be_like "SELECT FROM DUAL FOR UPDATE"
+        end
+
+        it 'allows a custom string to be used as a lock' do
+          node = Nodes::Lock.new('LOCK IN SHARE MODE')
+          @visitor.accept(node).must_be_like "LOCK IN SHARE MODE"
+        end
       end
     end
   end

test/visitors/test_postgres.rb

@@ -7,12 +7,21 @@ module Arel
         @visitor = PostgreSQL.new Table.engine
       end
 
-      it 'should produce a lock value' do
+      describe 'locking' do
+        it 'defaults to FOR UPDATE' do
           @visitor.accept(Nodes::Lock.new).must_be_like %{
             FOR UPDATE
           }
         end
 
+        it 'allows a custom string to be used as a lock' do
+          node = Nodes::Lock.new('FOR SHARE')
+          @visitor.accept(node).must_be_like %{
+            FOR SHARE
+          }
+        end
+      end
+
       it "should escape LIMIT" do
         sc = Arel::Nodes::SelectStatement.new
         sc.limit = Nodes::Limit.new("omg")