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

改进Model类 支持动态查询调用

Browse Source
This commit is contained in:
thinkphp
2016-05-18 17:42:36 +08:00
parent 2af19639cb
commit 811b22fe74
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -859,10 +859,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/** /**
* 初始化数据库对象 * 初始化数据库对象
* @access public * @access protected
* @return \think\db\Query * @return \think\db\Query
*/ */
public static function db() protected static function db()
{ {
$model = get_called_class(); $model = get_called_class();
if (!isset(self::$links[$model])) { if (!isset(self::$links[$model])) {
@@ -894,7 +894,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
call_user_func_array([$this, $method], $args); call_user_func_array([$this, $method], $args);
return $this; return $this;
} else { } else {
throw new Exception(__CLASS__ . ':' . $method . ' method not exist'); return call_user_func_array([self::db(), $method], $args);
} }
} }

2
library/think/model/Merge.php
View File

@@ -66,7 +66,7 @@ class Merge extends Model
foreach (static::$relationModel as $key => $model) { foreach (static::$relationModel as $key => $model) {
$name = is_int($key) ? $model : $key; $name = is_int($key) ? $model : $key;
$table = is_int($key) ? self::db()->getTable($name) : $model; $table = is_int($key) ? $query->getTable($name) : $model;
$query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk()); $query->join($table . ' ' . $name, $name . '.' . $class->fk . '=' . $master . '.' . $class->getPk());
$fields = self::getModelField($name, $table, $class->mapFields); $fields = self::getModelField($name, $table, $class->mapFields);
$query->field($fields); $query->field($fields);