From 66e533f9b13f2ea1f56a19246af55621cc368489 Mon Sep 17 00:00:00 2001
From: Mauricio Linhares <mauricio.linhares@gmail.com>
Date: Wed, 29 Jan 2014 01:56:20 -0300
Subject: Correctly send the string given to lock! and reload(:lock) to the
 lock scope - fixes #13788

As per the documentation at lock!, if the :lock option is a string it should use the given SQL to generate the lock statement.
---
 activerecord/lib/active_record/persistence.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/persistence.rb')

diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 460fbdb3f8..b1b35ed940 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -389,7 +389,7 @@ module ActiveRecord
 
       fresh_object =
         if options && options[:lock]
-          self.class.unscoped { self.class.lock.find(id) }
+          self.class.unscoped { self.class.lock(options[:lock]).find(id) }
         else
           self.class.unscoped { self.class.find(id) }
         end
-- 
cgit v1.2.3