mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-16 11:44:42 +02:00
Code Issues Releases Wiki Activity

Update DatabaseQuerySelectFulltext class to support multiple (array-based) field names when used outside PageFinder context. This enables use of field1|field2|field3*=value selectors in some places that didn't previously support it, like $page->page_ref_field_name('selector');

Browse Source
This commit is contained in:
Ryan Cramer
2020-11-13 07:00:17 -05:00
parent e6dde560d4
commit 84cca8fe82
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wire/core/DatabaseQuerySelectFulltext.php
View File

@@ -49,11 +49,21 @@ class DatabaseQuerySelectFulltext extends Wire {
protected $tableName = ''; protected $tableName = '';
/** /**
* Current field/column name
*
* @var $fieldName * @var $fieldName
* *
*/ */
protected $fieldName = ''; protected $fieldName = '';
/**
* All field/column names (if more than one)
*
* @var array
*
*/
protected $fieldNames = array();
/** /**
* @var string * @var string
* *
@@ -256,7 +266,6 @@ class DatabaseQuerySelectFulltext extends Wire {
public function match($tableName, $fieldName, $operator, $value) { public function match($tableName, $fieldName, $operator, $value) {
$this->tableName = $this->database->escapeTable($tableName); $this->tableName = $this->database->escapeTable($tableName);
$this->fieldName = $this->database->escapeCol($fieldName);
$allowOrder = true; $allowOrder = true;
if(strpos($operator, '!') === 0 && $operator !== '!=') { if(strpos($operator, '!') === 0 && $operator !== '!=') {
@@ -281,7 +290,22 @@ class DatabaseQuerySelectFulltext extends Wire {
if(!$this->method) { if(!$this->method) {
throw new WireException("Unimplemented operator in $this::match()"); throw new WireException("Unimplemented operator in $this::match()");
} }
if(is_array($fieldName) && count($fieldName) < 2) {
$fieldName = reset($fieldName);
}
if(is_array($fieldName)) {
$this->matchArrayFieldName($fieldName, $value);
} else {
$this->matchFieldName($fieldName, $value);
}
return $this;
}
protected function matchFieldName($fieldName, $value) {
$this->fieldName = $this->database->escapeCol($fieldName);
if(is_array($value)) { if(is_array($value)) {
$this->matchArrayValue($value); $this->matchArrayValue($value);
} else { } else {
@@ -289,8 +313,28 @@ class DatabaseQuerySelectFulltext extends Wire {
$method = $this->method; $method = $this->method;
if(strlen($value)) $this->$method($value); if(strlen($value)) $this->$method($value);
} }
}
/**
* Match when given $fieldName is an array
*
* @param array $fieldNames
* @param mixed $value
* @since 3.0.169
*
*/
protected function matchArrayFieldName(array $fieldNames, $value) {
$query = $this->query;
$this->query = $this->wire(new DatabaseQuerySelect());
$this->query->bindOption(true, $query->bindOption(true));
return $this; foreach($fieldNames as $fieldName) {
$this->matchFieldName($fieldName, $value);
}
$query->where('(' . implode(') OR (', $this->query->where) . ')');
$this->query->copyBindValuesTo($query);
$this->query = $query;
} }
/** /**

8
wire/core/FieldtypeMulti.php
View File

@@ -479,9 +479,15 @@ abstract class FieldtypeMulti extends Fieldtype {
foreach($filters as $selector) { foreach($filters as $selector) {
// @todo add support for OR values of $col or $value // @todo add support for OR values of $col or $value
$col = $sanitizer->fieldName($selector->field); $col = $selector->field;
$op = $selector->operator; $op = $selector->operator;
$value = $selector->value; $value = $selector->value;
if(is_array($col)) {
foreach($col as $k => $v) $col[$k] = $sanitizer->fieldName($v);
} else {
$col = $sanitizer->fieldName($col);
}
if($col === 'sort') { if($col === 'sort') {
$desc = strpos($value, '-') === 0 ? '-' : ''; $desc = strpos($value, '-') === 0 ? '-' : '';