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

改进Query类的driver属性设置 删除Connection类的getDriverName方法 改进connect方法

Browse Source
This commit is contained in:
thinkphp
2016-08-02 15:38:58 +08:00
parent 731d0c0002
commit 17c76a41c7
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
library/think/db/Connection.php
View File

@@ -226,13 +226,17 @@ abstract class Connection
/** /**
* 设置数据库的配置参数 * 设置数据库的配置参数
* @access public * @access public
* @param string $config 配置名称 * @param string|array $config 配置名称
* @param mixed $value 配置值 * @param mixed $value 配置值
* @return void * @return void
*/ */
public function setConfig($config, $value) public function setConfig($config, $value = '')
{ {
$this->config[$config] = $value; if (is_array($config)) {
$this->config = array_merge($this->config, $config);
} else {
$this->config[$config] = $value;
}
} }
/** /**
@@ -247,9 +251,10 @@ abstract class Connection
public function connect(array $config = [], $linkNum = 0, $autoConnection = false) public function connect(array $config = [], $linkNum = 0, $autoConnection = false)
{ {
if (!isset($this->links[$linkNum])) { if (!isset($this->links[$linkNum])) {
if (empty($config)) { if ($config) {
$config = $this->config; $this->setConfig($config);
} }
$config = $this->config;
// 连接参数 // 连接参数
if (isset($config['params']) && is_array($config['params'])) { if (isset($config['params']) && is_array($config['params'])) {
$params = $config['params'] + $this->params; $params = $config['params'] + $this->params;
@@ -281,20 +286,6 @@ abstract class Connection
return $this->links[$linkNum]; return $this->links[$linkNum];
} }
/**
* 获取当前数据库的驱动类型
* @access public
* @return string
*/
public function getDriverName()
{
if ($this->linkID) {
return $this->linkID->getAttribute(PDO::ATTR_DRIVER_NAME);
} else {
return $this->config['type'];
}
}
/** /**
* 释放查询结果 * 释放查询结果
* @access public * @access public

2
library/think/db/Query.php
View File

@@ -59,7 +59,7 @@ class Query
public function __construct(Connection $connection = null, $model = '') public function __construct(Connection $connection = null, $model = '')
{ {
$this->connection = $connection ?: Db::connect([], true); $this->connection = $connection ?: Db::connect([], true);
$this->driver = $this->connection->getDriverName(); $this->driver = $this->connection->getConfig('type');
$this->prefix = $this->connection->getConfig('prefix'); $this->prefix = $this->connection->getConfig('prefix');
$this->model = $model; $this->model = $model;
} }