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

改进全局查询范围

Browse Source
This commit is contained in:
thinkphp
2016-10-01 15:32:37 +08:00
parent 3ec6e42183
commit a9782f094a
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/think/Model.php
View File

@@ -147,9 +147,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/**
* 获取当前模型的数据库查询对象
* @access public
* @param bool $baseQuery 是否调用全局查询范围
* @return Query
*/
public function db()
public function db($baseQuery = true)
{
$model = $this->class;
if (!isset(self::$links[$model])) {
@@ -169,6 +170,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
self::$links[$model] = $query;
}
// 全局作用域
if ($baseQuery && method_exists($this, 'base')) {
call_user_func_array([$this, 'base'], [ & self::$links[$model]]);
}
// 返回当前模型的数据库查询对象
return self::$links[$model];
}
@@ -1340,8 +1345,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function __call($method, $args)
{
$query = $this->db();
// 全局作用域
$this->baseQuery($query);
if (method_exists($this, 'scope' . $method)) {
// 动态调用命名范围
$method = 'scope' . $method;
@@ -1356,20 +1359,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function __callStatic($method, $params)
{
$query = self::getDb();
$model = new static();
// 全局作用域
$model->baseQuery($query);
return call_user_func_array([$query, $method], $params);
}
public function baseQuery(&$query)
{
// 全局作用域
if ($this->useGlobalScope && method_exists($this, 'base')) {
call_user_func_array([$this, 'base'], [ & $query]);
}
}
protected static function getDb()
{
$model = get_called_class();

3
library/think/model/Relation.php
View File

@@ -661,9 +661,6 @@ class Relation
public function __call($method, $args)
{
if ($this->query) {
$class = new $this->model;
// 全局作用域
$class->baseQuery($this->query);
switch ($this->type) {
case self::HAS_MANY:
if (isset($this->where)) {