as2252258/kiri-databases
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
向林
2021-10-19 18:27:12 +08:00
parent 1d1b908c2d
commit bc2b60b42e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActiveQuery.php
+3 -2
View File
@@ -198,7 +198,9 @@ class ActiveQuery extends Component implements ISqlBuilder
public function all(): Collection|array public function all(): Collection|array
{ {
$data = $this->execute($this->builder->all())->all(); $data = $this->execute($this->builder->all())->all();
if (!empty($this->with)){
$this->modelClass->setWith($this->with);
}
$collect = new Collection($this, $data, $this->modelClass); $collect = new Collection($this, $data, $this->modelClass);
if ($this->asArray) { if ($this->asArray) {
return $collect->toArray(); return $collect->toArray();
@@ -223,7 +225,6 @@ class ActiveQuery extends Component implements ISqlBuilder
*/ */
public function getWith(ModelInterface $model): ModelInterface public function getWith(ModelInterface $model): ModelInterface
{ {
var_dump($this->with);
if (empty($this->with) || !is_array($this->with)) { if (empty($this->with) || !is_array($this->with)) {
return $model; return $model;
} }
src/Base/CollectionIterator.php
+1 -1
View File
@@ -68,7 +68,7 @@ class CollectionIterator extends \ArrayIterator
if (is_array($current = parent::current())) { if (is_array($current = parent::current())) {
$current = $this->newModel($current); $current = $this->newModel($current);
} }
return $this->query->getWith($current); return $current;
} }