mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Query类lock方法支持传入字符串

Browse Source
This commit is contained in:
thinkphp
2017-09-05 17:36:15 +08:00
parent c5a826bcc1
commit 4ef35fa4bb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/db/Builder.php
View File

@@ -660,12 +660,16 @@ abstract class Builder
/** /**
* 设置锁机制 * 设置锁机制
* @access protected * @access protected
* @param bool $lock * @param bool|string $lock
* @return string * @return string
*/ */
protected function parseLock($lock = false) protected function parseLock($lock = false)
{ {
if (is_bool($lock)) {
return $lock ? ' FOR UPDATE ' : ''; return $lock ? ' FOR UPDATE ' : '';
} elseif (is_string($lock)) {
return ' ' . trim($lock) . ' ';
}
} }
/** /**

2
library/think/db/Query.php
View File

@@ -1493,7 +1493,7 @@ class Query
/** /**
* 指定查询lock * 指定查询lock
* @access public * @access public
* @param boolean $lock 是否lock * @param bool|string $lock 是否lock
* @return $this * @return $this
*/ */
public function lock($lock = false) public function lock($lock = false)