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

改进Query类delete方法参数默认值为null 当参数为true的时候 表示强制删除数据

Browse Source
This commit is contained in:
thinkphp
2016-06-28 19:07:33 +08:00
parent 4905a84a4c
commit 438330a4b2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1871,7 +1871,7 @@ class Query
* @throws Exception * @throws Exception
* @throws PDOException * @throws PDOException
*/ */
public function selectOrFail($data = []) public function selectOrFail($data = null)
{ {
return $this->failException(true)->select($data); return $this->failException(true)->select($data);
} }
@@ -1885,7 +1885,7 @@ class Query
* @throws Exception * @throws Exception
* @throws PDOException * @throws PDOException
*/ */
public function findOrFail($data = []) public function findOrFail($data = null)
{ {
return $this->failException(true)->find($data); return $this->failException(true)->find($data);
} }
@@ -1948,22 +1948,22 @@ class Query
/** /**
* 删除记录 * 删除记录
* @access public * @access public
* @param array $data 表达式 * @param mixed $data 表达式 true 表示强制删除
* @return int * @return int
* @throws Exception * @throws Exception
* @throws PDOException * @throws PDOException
*/ */
public function delete($data = []) public function delete($data = null)
{ {
// 分析查询表达式 // 分析查询表达式
$options = $this->parseExpress(); $options = $this->parseExpress();
if (!empty($data)) { if (!is_null($data) && true !== $data) {
// AR模式分析主键条件 // AR模式分析主键条件
$this->parsePkWhere($data, $options); $this->parsePkWhere($data, $options);
} }
if (empty($options['where'])) { if (true !== $data && empty($options['where'])) {
// 如果条件为空 不进行删除操作 除非设置 1=1 // 如果条件为空 不进行删除操作 除非设置 1=1
throw new Exception('delete without condition'); throw new Exception('delete without condition');
} }