From fddcbac7ae5a1996b62d3060e828c578faae980b Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 17 Jun 2016 17:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helper.php | 2 +- library/think/db/Query.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helper.php b/helper.php index 51458c23..892fac8c 100644 --- a/helper.php +++ b/helper.php @@ -168,7 +168,7 @@ function validate($name = '', $layer = 'validate', $appendSuffix = false) * 实例化数据库类 * @param string $name 操作的数据表名称(不含前缀) * @param array|string $config 数据库配置参数 - * @return \think\db\Connection + * @return \think\db\Query */ function db($name = '', $config = []) { diff --git a/library/think/db/Query.php b/library/think/db/Query.php index 7610c9c7..fa191827 100644 --- a/library/think/db/Query.php +++ b/library/think/db/Query.php @@ -18,8 +18,8 @@ use think\Config; use think\Db; use think\db\Builder; use think\db\Connection; -use think\db\DbException; use think\Exception; +use think\exception\DbException; use think\exception\PDOException; use think\db\exception\BindParamException; use think\db\exception\ModelNotFoundException;