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

模型类的connection属性和数据库默认配置合并

Browse Source
This commit is contained in:
thinkphp
2016-11-22 15:54:29 +08:00
parent 72cdb44de8
commit 8ee455f96f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -156,8 +156,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{
$model = $this->class;
if (!isset(self::$links[$model])) {
// 合并数据库配置
if (is_array($this->connection)) {
$connection = array_merge(Config::get('database'), $this->connection);
} else {
$connection = $this->connection;
}
// 设置当前模型 确保查询返回模型对象
$query = Db::connect($this->connection)->model($model, $this->query);
$query = Db::connect($connection)->model($model, $this->query);
// 设置当前数据表和模型名
if (!empty($this->table)) {