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

Refactoring assoc use in SqlResultProvider. Write SqlCriteria.find() method.

Browse Source
This commit is contained in:
Alexander Demidov
2013-09-19 12:54:10 +04:00
parent ba88ac5229
commit 72c38e641d
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
model/SqlCriteria.php
View File

@ -17,9 +17,20 @@ class SqlCriteria
*/
private $model;
/**
* @param $model SqlModel
*/
public function __construct($model)
{
$this->model = $model;
}
/**
* @return SqlResultProvider
*/
public function find()
{
return $this->model->find($this->select, $this->distinct, $this->where, $this->order, $this->limit);
}
/**

8
model/SqlResultProvider.php
View File

@ -17,7 +17,7 @@ class SqlResultProvider
$this->result_items = $result_items;
}
public function assoc($field, $assoc_as_array = false, $field_assoc_in_array = null)
public function assoc($field, $assoc_as_array = false)
{
if (is_null($this->result_items_base)) {
$this->result_items_base = $this->result_items;
@ -40,11 +40,9 @@ class SqlResultProvider
}
}
// Ассоциирование внутри каждого элемента массива
// $field_assoc_in_array - ассоциирование произовдится по этому полю (вернет ошибку, если этого поля нет в результатх выборки)
if ($assoc_as_array && $field_assoc_in_array) {
if ($assoc_as_array) {
foreach ($result_items_assoc as &$value) {
$sql_result_provider = new SqlResultProvider($value);
$value = $sql_result_provider->assoc($field_assoc_in_array)->fetchAll();
$value = new SqlResultProvider($value);
}
}
$this->result_items = $result_items_assoc;