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

修正Model类的useGlobalScope方法无效的问题

Browse Source
This commit is contained in:
thinkphp
2016-12-21 12:14:37 +08:00
parent d898ab35de
commit 6bd6d03440
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Model.php
View File

@@ -151,7 +151,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (is_null($this->autoWriteTimestamp)) { if (is_null($this->autoWriteTimestamp)) {
// 自动写入时间戳 // 自动写入时间戳
$this->autoWriteTimestamp = $this->db()->getConfig('auto_timestamp'); $this->autoWriteTimestamp = $this->db(false)->getConfig('auto_timestamp');
} }
// 执行初始化操作 // 执行初始化操作
@@ -634,10 +634,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function getPk($name = '') public function getPk($name = '')
{ {
if (!empty($name)) { if (!empty($name)) {
$table = $this->db()->getTable($name); $table = $this->db(false)->getTable($name);
return $this->db()->getPk($table); return $this->db(false)->getPk($table);
} elseif (empty($this->pk)) { } elseif (empty($this->pk)) {
$this->pk = $this->db()->getPk(); $this->pk = $this->db(false)->getPk();
} }
return $this->pk; return $this->pk;
} }
@@ -834,7 +834,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function allowField($field) public function allowField($field)
{ {
if (true === $field) { if (true === $field) {
$field = $this->db()->getTableInfo('', 'fields'); $field = $this->db(false)->getTableInfo('', 'fields');
} }
$this->field = $field; $this->field = $field;
return $this; return $this;
@@ -1402,7 +1402,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 记录当前关联信息 // 记录当前关联信息
$model = $this->parseModel($model); $model = $this->parseModel($model);
$name = Loader::parseName(basename(str_replace('\\', '/', $model))); $name = Loader::parseName(basename(str_replace('\\', '/', $model)));
$table = $table ?: $this->db()->getTable(Loader::parseName($this->name) . '_' . $name); $table = $table ?: $this->db(false)->getTable(Loader::parseName($this->name) . '_' . $name);
$foreignKey = $foreignKey ?: $name . '_id'; $foreignKey = $foreignKey ?: $name . '_id';
$localKey = $localKey ?: Loader::parseName($this->name) . '_id'; $localKey = $localKey ?: Loader::parseName($this->name) . '_id';
return new BelongsToMany($this, $model, $table, $foreignKey, $localKey, $alias); return new BelongsToMany($this, $model, $table, $foreignKey, $localKey, $alias);
@@ -1459,7 +1459,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function __call($method, $args) public function __call($method, $args)
{ {
if (isset(static::$db)) {
$query = static::$db;
} else {
$query = $this->db(); $query = $this->db();
}
if (method_exists($this, 'scope' . $method)) { if (method_exists($this, 'scope' . $method)) {
// 动态调用命名范围 // 动态调用命名范围
$method = 'scope' . $method; $method = 'scope' . $method;