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

关联查询支持远程一对多关联 Query类view方法的field参数支持传入true

Browse Source
This commit is contained in:
thinkphp
2016-05-25 17:57:50 +08:00
parent 62b01bf566
commit e890d43d55
3 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/think/Model.php
View File

@@ -885,6 +885,28 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $this->relation()->hasMany($model, $foreignKey, $localKey, $alias);
}
/**
* HAS MANY 远程关联定义
* @access public
* @param string $model 模型名
* @param string $through 中间模型名
* @param string $foreignKey 关联外键
* @param string $throughKey 关联外键
* @param string $localKey 关联主键
* @param array $alias 别名定义
* @return \think\db\Query|string
*/
public function hasManyThrough($model,$through,$foreignKey='',$throughKey='',$localKey='',$alias=[]){
// 记录当前关联信息
$model = $this->parseModel($model);
$through = $this->parseModel($through);
$localKey = $localKey ?: $this->getPk();
$foreignKey = $foreignKey ?: Loader::parseName($this->name) . '_id';
$name = Loader::parseName(basename(str_replace('\\', '/', $through)));
$throughKey = $throughKey ?: $name . '_id';
return $this->relation()->hasManyThrough($model, $through,$foreignKey,$throughKey, $localKey, $alias);
}
/**
* BELONGS TO MANY 关联定义
* @access public

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

@@ -667,17 +667,21 @@ class Query
$alias = $join;
}
$table = !empty($table) ? $table : $this->getTable($join);
if (is_string($field)) {
$field = explode(',', $field);
}
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$fields[] = $alias . '.' . $val;
$this->options['map'][$val] = $alias . '.' . $val;
} else {
$fields[] = $alias . '.' . $key . ' AS ' . $val;
$this->options['map'][$val] = $alias . '.' . $key;
if(true === $field){
$fields = $alias . '.*';
}else{
if (is_string($field)) {
$field = explode(',', $field);
}
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$fields[] = $alias . '.' . $val;
$this->options['map'][$val] = $alias . '.' . $val;
} else {
$fields[] = $alias . '.' . $key . ' AS ' . $val;
$this->options['map'][$val] = $alias . '.' . $key;
}
}
}
$this->field($fields);
if ($on) {

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

@@ -21,9 +21,11 @@ class Relation
{
const HAS_ONE = 1;
const HAS_MANY = 2;
const HAS_MANY_THROUGH= 5;
const BELONGS_TO = 3;
const BELONGS_TO_MANY = 4;
// 父模型对象
protected $parent;
/** @var Model 当前关联的模型类 */
@@ -32,9 +34,11 @@ class Relation
protected $middle;
// 当前关联类型
protected $type;
// 关联外键
// 关联表外键
protected $foreignKey;
// 关联键
// 中间关联表外键
protected $throughKey;
// 关联表主键
protected $localKey;
// 数据表别名
protected $alias;
@@ -85,7 +89,10 @@ class Relation
$result = $relation->where($localKey, $this->parent->$foreignKey)->find();
break;
case self::HAS_MANY:
$result = $relation->where($foreignKey, $this->parent->$localKey)->select();
$result = $relation->select();
break;
case self::HAS_MANY_THROUGH:
$result = $relation->select();
break;
case self::BELONGS_TO_MANY:
// 关联查询
@@ -451,6 +458,32 @@ class Relation
return $this;
}
/**
* HAS MANY 远程关联定义
* @access public
* @param string $model 模型名
* @param string $through 中间模型名
* @param string $firstkey 关联外键
* @param string $secondKey 关联外键
* @param string $localKey 关联主键
* @param array $alias 别名定义
* @return $this
*/
public function hasManyThrough($model, $through,$foreignKey,$throughKey, $localKey, $alias)
{
// 记录当前关联信息
$this->type = self::HAS_MANY_THROUGH;
$this->model = $model;
$this->middle = $through;
$this->foreignKey = $foreignKey;
$this->throughKey = $throughKey;
$this->localKey = $localKey;
$this->alias = $alias;
// 返回关联的模型对象
return $this;
}
/**
* BELONGS TO MANY 关联定义
* @access public
@@ -621,9 +654,26 @@ class Relation
if ($this->model) {
$model = new $this->model;
$db = $model->db();
if (self::HAS_MANY == $this->type && isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件
$db->where($this->foreignKey, $this->parent->{$this->localKey});
switch($this->type){
case self::HAS_MANY:
if (isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件
$db->where($this->foreignKey, $this->parent->{$this->localKey});
}
break;
case self::HAS_MANY_THROUGH:
$through = $this->middle;
$model = $this->model;
$table = $model::getTable();
$throughTable = $through::getTable();
$pk = (new $this->model)->getPk();
$throughKey = $this->throughKey;
$modelTable = $this->parent->getTable();
$result = $db->field($table.'.*')
->join($throughTable,$throughTable.'.'.$pk.'='.$table.'.'.$throughKey)
->join($modelTable,$modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
->where($throughTable.'.'.$this->foreignKey, $this->parent->{$this->localKey});
break;
}
return call_user_func_array([$db, $method], $args);
} else {