From 4ef35fa4bb42665067572418d04ad4215489872d Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 5 Sep 2017 17:36:15 +0800
Subject: [PATCH] =?UTF-8?q?Query=E7=B1=BBlock=E6=96=B9=E6=B3=95=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BC=A0=E5=85=A5=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Builder.php | 8 ++++++--
 library/think/db/Query.php   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index e80a2fb7..6c19ada0 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -660,12 +660,16 @@ abstract class Builder
     /**
      * 设置锁机制
      * @access protected
-     * @param bool $lock
+     * @param bool|string $lock
      * @return string
      */
     protected function parseLock($lock = false)
     {
-        return $lock ? ' FOR UPDATE ' : '';
+        if (is_bool($lock)) {
+            return $lock ? ' FOR UPDATE ' : '';
+        } elseif (is_string($lock)) {
+            return ' ' . trim($lock) . ' ';
+        }
     }
 
     /**
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index ceb3d500..e7f735ea 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1493,7 +1493,7 @@ class Query
     /**
      * 指定查询lock
      * @access public
-     * @param boolean $lock 是否lock
+     * @param bool|string $lock 是否lock
      * @return $this
      */
     public function lock($lock = false)