wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

10_ballov-1452 10_ballov-174 Параметр возврата нового заполненногоq из запроса собственного экземпляра в SqlModel::fetch().

Browse Source
This commit is contained in:
Eduard
2020-04-09 21:41:05 +03:00
parent 984e9aa716
commit d8031c497b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Model/SqlModel.php
View File

@ -164,9 +164,10 @@ abstract class SqlModel extends Model
* @param string $data Request * @param string $data Request
* @param array $params Request parameters * @param array $params Request parameters
* @param CacheKey $cache_key Key for caching in * @param CacheKey $cache_key Key for caching in
* @param bool $returnNewInstance Return the instance of this filled from query
* @return mixed * @return mixed
*/ */
protected function fetch($data, $params = array(), $cache_key = null) protected function fetch($data, $params = array(), $cache_key = null, $returnFilledInstance = true)
{ {
if (!$cache_key || !$result = $cache_key->get()) { if (!$cache_key || !$result = $cache_key->get()) {
$result = $this->query($data, $params)->fetch(); $result = $this->query($data, $params)->fetch();
@ -175,19 +176,17 @@ abstract class SqlModel extends Model
} }
} }
$calledClassName = get_called_class(); if ($result && $returnFilledInstance) {
$instance = new $this;
if ($result) {
$orm = new $calledClassName;
foreach (get_object_vars($result) as $key => $value) { foreach (get_object_vars($result) as $key => $value) {
if ($key == 'table') { if ($key == 'table') {
$key = 'table_field'; $key = 'table_field';
} }
$orm->$key = $value; $instance->$key = $value;
} }
return $orm; return $instance;
} }
return $result; return $result;