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

改进

Browse Source
This commit is contained in:
thinkphp
2015-12-11 08:32:17 +08:00
parent 01cc676a7a
commit ea9041b858
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/db.php
View File

@@ -36,7 +36,7 @@ class Db
// 解析连接参数 支持数组和字符串 // 解析连接参数 支持数组和字符串
$options = self::parseConfig($config); $options = self::parseConfig($config);
// 如果采用lite方式 仅支持原生SQL 包括query和execute方法 // 如果采用lite方式 仅支持原生SQL 包括query和execute方法
$class = $lite ? 'think\\db\\lite' : 'think\\db\\driver\\' . strtolower($options['type']); $class = $lite ? '\\think\\db\\Lite' : '\\think\\db\\driver\\' . ucwords($options['type']);
self::$instance[$md5] = new $class($options); self::$instance[$md5] = new $class($options);
} }
self::$_instance = self::$instance[$md5]; self::$_instance = self::$instance[$md5];

6
library/think/db/lite.php
View File

@@ -437,13 +437,11 @@ class Lite
*/ */
protected function initConnect($master = true) protected function initConnect($master = true)
{ {
if (!empty($this->config['deploy'])) if (!empty($this->config['deploy'])) {
// 采用分布式数据库 // 采用分布式数据库
{
$this->_linkID = $this->multiConnect($master); $this->_linkID = $this->multiConnect($master);
} else } elseif (!$this->_linkID) {
// 默认单数据库 // 默认单数据库
if (!$this->_linkID) {
$this->_linkID = $this->connect(); $this->_linkID = $this->connect();
} }