修正

Author: liu21st

README.md

@@ -14,7 +14,7 @@ Db类用法：
 ~~~
 use think\Db;
 // 数据库配置信息设置
-Db::config(['数据库配置参数（数组）']);
+Db::setConfig(['数据库配置参数（数组）']);
 // 进行CURD操作
 Db::table('user')->find();
 ~~~

src/Model.php

@@ -87,7 +87,7 @@ public function __construct($data = [])
             // 当前模型名
             $name       = str_replace('\\', '/', static::class);
             $this->name = basename($name);
-            if ($config['class_suffix']) {
+            if (!empty($config['class_suffix'])) {
                 $suffix     = basename(dirname($name));
                 $this->name = substr($this->name, 0, -strlen($suffix));
             }

src/db/Connection.php

@@ -16,8 +16,8 @@
 use PDOStatement;
 use think\Db;
 use think\db\exception\BindParamException;
+use think\db\exception\PDOException;
 use think\Exception;
-use think\exception\PDOException;
 
 abstract class Connection
 {
@@ -54,7 +54,7 @@ abstract class Connection
     protected static $info = [];
 
     // 数据库日志
-    protected $log = [];
+    protected static $log = [];
 
     // 使用Builder类
     protected $builderClassName;
@@ -108,6 +108,10 @@ abstract class Connection
         'query'           => '\\think\\db\\Query',
         // 是否需要断线重连
         'break_reconnect' => false,
+        // 数据字段缓存路径
+        'schema_path'     => '',
+        // 模型类后缀
+        'class_suffix'    => false,
     ];
 
     // PDO连接参数
@@ -174,7 +178,7 @@ public static function instance($config = [], $name = false)
 
             $class = false !== strpos($options['type'], '\\') ? $options['type'] : '\\think\\db\\connector\\' . ucwords($options['type']);
             // 记录初始化信息
-            $this->log[] = '[ DB ] INIT ' . $options['type'];
+            self::$log[] = '[ DB ] INIT ' . $options['type'];
 
             if (true === $name) {
                 $name = md5(serialize($config));
@@ -1777,7 +1781,7 @@ protected function debug($start, $sql = '')
             if ($start) {
                 $this->queryStartTime = microtime(true);
             } else {
-                $runtime = number_format((microtime(true) - $this->queryEndTime), 6);
+                $runtime = number_format((microtime(true) - $this->queryStartTime), 6);
                 $sql     = $sql ?: $this->getLastsql();
                 $result  = [];
 
@@ -1831,7 +1835,7 @@ protected function triggerSql($sql, $runtime, $explain = [])
 
     public function log($log)
     {
-        $this->config['debug'] && $this->log[] = $log;
+        $this->config['debug'] && self::$log[] = $log;
     }
 
     public function getSqlLog()

src/db/Query.php

@@ -16,10 +16,10 @@
 use think\Db;
 use think\db\exception\BindParamException;
 use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
+use think\db\exception\PDOException;
 use think\Exception;
-use think\exception\DbException;
-use think\exception\PDOException;
 use think\Model;
 use think\model\Relation;
 use think\model\relation\OneToOne;

src/db/exception/BindParamException.php

@@ -11,8 +11,6 @@
 
 namespace think\db\exception;
 
-use think\exception\DbException;
-
 /**
  * PDO参数绑定异常
  */

src/db/exception/ClassNotFoundException.php

@@ -0,0 +1,32 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+class ClassNotFoundException extends \RuntimeException
+{
+    protected $class;
+    public function __construct($message, $class = '')
+    {
+        $this->message = $message;
+        $this->class   = $class;
+    }
+
+    /**
+     * 获取类名
+     * @access public
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
+}

src/db/exception/DbException.php

@@ -0,0 +1,43 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+use think\Exception;
+
+/**
+ * Database相关异常处理类
+ */
+class DbException extends Exception
+{
+    /**
+     * DbException constructor.
+     * @param string    $message
+     * @param array     $config
+     * @param string    $sql
+     * @param int       $code
+     */
+    public function __construct($message, array $config, $sql, $code = 10500)
+    {
+        $this->message = $message;
+        $this->code    = $code;
+
+        $this->setData('Database Status', [
+            'Error Code'    => $code,
+            'Error Message' => $message,
+            'Error SQL'     => $sql,
+        ]);
+
+        unset($config['username'], $config['password']);
+        $this->setData('Database Config', $config);
+    }
+
+}

src/db/exception/ModelNotFoundException.php

@@ -11,8 +11,6 @@
 
 namespace think\db\exception;
 
-use think\exception\DbException;
-
 class ModelNotFoundException extends DbException
 {
     protected $model;

src/db/exception/PDOException.php

@@ -0,0 +1,39 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+/**
+ * PDO异常处理类
+ * 重新封装了系统的\PDOException类
+ */
+class PDOException extends DbException
+{
+    /**
+     * PDOException constructor.
+     * @param \PDOException $exception
+     * @param array         $config
+     * @param string        $sql
+     * @param int           $code
+     */
+    public function __construct(\PDOException $exception, array $config, $sql, $code = 10501)
+    {
+        $error = $exception->errorInfo;
+
+        $this->setData('PDO Error Info', [
+            'SQLSTATE'             => $error[0],
+            'Driver Error Code'    => isset($error[1]) ? $error[1] : 0,
+            'Driver Error Message' => isset($error[2]) ? $error[2] : '',
+        ]);
+
+        parent::__construct($exception->getMessage(), $config, $sql, $code);
+    }
+}