From c927df2f4b4d6e3849115760d203aa4049876e10 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 6 Aug 2016 22:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Connection.php | 42 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
index c4e09e6d..6712e0d9 100644
--- a/library/think/db/Connection.php
+++ b/library/think/db/Connection.php
@@ -68,47 +68,45 @@ abstract class Connection
     // 数据库连接参数配置
     protected $config = [
         // 数据库类型
-        'type'              => '',
+        'type'           => '',
         // 服务器地址
-        'hostname'          => '',
+        'hostname'       => '',
         // 数据库名
-        'database'          => '',
+        'database'       => '',
         // 用户名
-        'username'          => '',
+        'username'       => '',
         // 密码
-        'password'          => '',
+        'password'       => '',
         // 端口
-        'hostport'          => '',
+        'hostport'       => '',
         // 连接dsn
-        'dsn'               => '',
+        'dsn'            => '',
         // 数据库连接参数
-        'params'            => [],
+        'params'         => [],
         // 数据库编码默认采用utf8
-        'charset'           => 'utf8',
+        'charset'        => 'utf8',
         // 数据库表前缀
-        'prefix'            => '',
+        'prefix'         => '',
         // 数据库调试模式
-        'debug'             => false,
+        'debug'          => false,
         // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-        'deploy'            => 0,
+        'deploy'         => 0,
         // 数据库读写是否分离 主从式有效
-        'rw_separate'       => false,
+        'rw_separate'    => false,
         // 读写分离后 主服务器数量
-        'master_num'        => 1,
+        'master_num'     => 1,
         // 指定从服务器序号
-        'slave_no'          => '',
+        'slave_no'       => '',
         // 是否严格检查字段是否存在
-        'fields_strict'     => true,
+        'fields_strict'  => true,
         // 数据集返回类型
-        'resultset_type'    => 'array',
+        'resultset_type' => 'array',
         // 自动写入时间戳字段
-        'auto_timestamp'    => false,
+        'auto_timestamp' => false,
         // 是否需要进行SQL性能分析
-        'sql_explain'       => false,
+        'sql_explain'    => false,
         // Builder类
-        'builder'           => '',
-        // 软删除字段
-        'soft_delete_field' => '',
+        'builder'        => '',
     ];
 
     // PDO连接参数