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

改进远程一对多查询

Browse Source
This commit is contained in:
thinkphp
2016-05-25 18:17:45 +08:00
parent e890d43d55
commit 15de3e328a
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
library/think/Model.php
View File

@@ -740,10 +740,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$model = new static(); $model = new static();
$info = $model->$relation()->getRelationInfo(); $info = $model->$relation()->getRelationInfo();
$table = $info['model']::getTable(); $table = $info['model']::getTable();
return $model->db()->alias('a') switch($info['type']){
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey']) case Relation::HAS_MANY:
->group('b.' . $info['foreignKey']) return $model->db()->alias('a')
->having('count(' . $id . ')' . $operator . $count); ->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])
->group('b.' . $info['foreignKey'])
->having('count(' . $id . ')' . $operator . $count);
case Relation::HAS_MANY_THROUGH:
// TODO
}
} }
/** /**
@@ -757,19 +763,24 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{ {
$model = new static(); $model = new static();
$info = $model->$relation()->getRelationInfo(); $info = $model->$relation()->getRelationInfo();
$table = $info['model']::getTable(); switch($info['type']){
if (is_array($where)) { case Relation::HAS_MANY:
foreach ($where as $key => $val) { $table = $info['model']::getTable();
if (false === strpos($key, '.')) { if (is_array($where)) {
$where['b.' . $key] = $val; foreach ($where as $key => $val) {
unset($where[$key]); if (false === strpos($key, '.')) {
$where['b.' . $key] = $val;
unset($where[$key]);
}
}
} }
} return $model->db()->alias('a')
->field('a.*')
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])
->where($where);
case Relation::HAS_MANY_THROUGH:
// TODO
} }
return $model->db()->alias('a')
->field('a.*')
->join($table . ' b', 'a.' . $info['localKey'] . '=b.' . $info['foreignKey'])
->where($where);
} }
/** /**

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

@@ -664,13 +664,13 @@ class Relation
case self::HAS_MANY_THROUGH: case self::HAS_MANY_THROUGH:
$through = $this->middle; $through = $this->middle;
$model = $this->model; $model = $this->model;
$table = $model::getTable(); $alias = Loader::parseName(basename(str_replace('\\', '/', $model)));
$throughTable = $through::getTable(); $throughTable = $through::getTable();
$pk = (new $this->model)->getPk(); $pk = (new $this->model)->getPk();
$throughKey = $this->throughKey; $throughKey = $this->throughKey;
$modelTable = $this->parent->getTable(); $modelTable = $this->parent->getTable();
$result = $db->field($table.'.*') $result = $db->field($alias.'.*')->alias($alias)
->join($throughTable,$throughTable.'.'.$pk.'='.$table.'.'.$throughKey) ->join($throughTable,$throughTable.'.'.$pk.'='.$alias.'.'.$throughKey)
->join($modelTable,$modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey) ->join($modelTable,$modelTable.'.'.$this->localKey.'='.$throughTable.'.'.$this->foreignKey)
->where($throughTable.'.'.$this->foreignKey, $this->parent->{$this->localKey}); ->where($throughTable.'.'.$this->foreignKey, $this->parent->{$this->localKey});
break; break;