php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-16 15:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Query::filter() adjustments

Browse Source
This commit is contained in:
Alexander Makarov
2014-03-29 23:26:02 +04:00
parent a884c80fe3
commit 8cd247730a
7 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/elasticsearch/Query.php
View File

@ -92,7 +92,7 @@ class Query extends Component implements QueryInterface
* @var array|string The filter part of this search query. This is an array or json string that follows the format of
* the elasticsearch [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html).
*/
public $filter;
public $filterPart;
public $facets = [];
@ -459,9 +459,9 @@ class Query extends Component implements QueryInterface
* @param string $filter
* @return static the query object itself
*/
public function applyFilter($filter)
public function filterPart($filter)
{
$this->filter = $filter;
$this->filterPart = $filter;
return $this;
}

12
extensions/elasticsearch/QueryBuilder.php
View File

@ -62,17 +62,17 @@ class QueryBuilder extends \yii\base\Object
}
$whereFilter = $this->buildCondition($query->where);
if (is_string($query->filter)) {
if (is_string($query->filterPart)) {
if (empty($whereFilter)) {
$parts['filter'] = $query->filter;
$parts['filter'] = $query->filterPart;
} else {
$parts['filter'] = '{"and": [' . $query->filter . ', ' . Json::encode($whereFilter) . ']}';
$parts['filter'] = '{"and": [' . $query->filterPart . ', ' . Json::encode($whereFilter) . ']}';
}
} elseif ($query->filter !== null) {
} elseif ($query->filterPart !== null) {
if (empty($whereFilter)) {
$parts['filter'] = $query->filter;
$parts['filter'] = $query->filterPart;
} else {
$parts['filter'] = ['and' => [$query->filter, $whereFilter]];
$parts['filter'] = ['and' => [$query->filterPart, $whereFilter]];
}
} elseif (!empty($whereFilter)) {
$parts['filter'] = $whereFilter;