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

改进Handle类支持异常的多语言 Lang类增加has方法 增加核心中文语言包

Browse Source
This commit is contained in:
thinkphp
2016-06-16 16:07:44 +08:00
parent d8fc0bf7aa
commit 50d1798e92
35 changed files with 151 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ abstract class Builder
foreach ($data as $key => $val) {
if (!in_array($key, $fields, true)) {
if ($options['strict']) {
throw new Exception(' fields not exists :[' . $key . ']');
throw new Exception('fields not exists:[' . $key . ']');
}
} else {
$item = $this->parseKey($key);
@@ -611,7 +611,7 @@ abstract class Builder
foreach ($data as $key => $val) {
if (!in_array($key, $fields, true)) {
if ($options['strict']) {
throw new Exception(' fields not exists :[' . $key . ']');
throw new Exception('fields not exists:[' . $key . ']');
}
unset($data[$key]);
} elseif (is_scalar($val)) {

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

@@ -84,7 +84,7 @@ class Query
$where[$name] = $args[0];
return $this->where($where)->value($args[1]);
} else {
throw new Exception(__CLASS__ . ':' . $method . ' method not exist');
throw new Exception('method not exist:' . __CLASS__ . '->' . $method);
}
}
@@ -1672,7 +1672,7 @@ class Query
$where[$field] = $data[$field];
} else {
// 如果缺少复合主键数据则不执行
throw new Exception('miss pk data');
throw new Exception('miss complex primary data');
}
unset($data[$field]);
}
@@ -1775,10 +1775,10 @@ class Query
}
} elseif (!empty($options['fail'])) {
if(!empty($this->model)){
throw new ModelNotFoundException('Data not Found', $this->model, $options);
throw new ModelNotFoundException('model data Not Found:' . $this->model , $this->model, $options);
}else{
throw new DataNotFoundException('Data not Found', $options['table'], $options);
}
throw new DataNotFoundException('table data not Found:' . $options['table'], $options['table'], $options);
}
}
return $resultSet;
}
@@ -1856,10 +1856,10 @@ class Query
}
} elseif (!empty($options['fail'])) {
if(!empty($this->model)){
throw new ModelNotFoundException('Data not Found', $this->model, $options);
throw new ModelNotFoundException('model data Not Found:' . $this->model , $this->model, $options);
}else{
throw new DataNotFoundException('Data not Found', $options['table'], $options);
}
throw new DataNotFoundException('table data not Found:' . $options['table'], $options['table'], $options);
}
} else {
$data = false;
}
@@ -1969,7 +1969,7 @@ class Query
if (empty($options['where'])) {
// 如果条件为空 不进行删除操作 除非设置 1=1
throw new Exception('no data to delete without where');
throw new Exception('delete without condition');
}
// 生成删除SQL语句
$sql = $this->builder()->delete($options);