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

Connection类model方法更改为getQuery

Browse Source
This commit is contained in:
thinkphp
2016-12-27 08:15:57 +08:00
parent 0fd7259679
commit c20c27bcb8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -178,7 +178,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$connection = []; $connection = [];
} }
// 设置当前模型 确保查询返回模型对象 // 设置当前模型 确保查询返回模型对象
$query = Db::connect($connection)->model($model, $this->query); $query = Db::connect($connection)->getQuery($model, $this->query);
// 设置当前数据表和模型名 // 设置当前数据表和模型名
if (!empty($this->table)) { if (!empty($this->table)) {

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

@@ -137,7 +137,7 @@ abstract class Connection
* @param string $queryClass 查询对象类名 * @param string $queryClass 查询对象类名
* @return Query * @return Query
*/ */
public function model($model = 'db', $queryClass = '') public function getQuery($model = 'db', $queryClass = '')
{ {
if (!isset($this->query[$model])) { if (!isset($this->query[$model])) {
$class = $queryClass ?: $this->config['query']; $class = $queryClass ?: $this->config['query'];
@@ -155,7 +155,7 @@ abstract class Connection
*/ */
public function __call($method, $args) public function __call($method, $args)
{ {
return call_user_func_array([$this->model(), $method], $args); return call_user_func_array([$this->getQuery(), $method], $args);
} }
/** /**