mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 18:24:57 +02:00
Code Issues Releases Wiki Activity

Update DatabaseQuerySelectFulltext to use globally unique bind keys to allow for resulting queries to be merged with AND conditions and without potentially overwriting each other

Browse Source
This commit is contained in:
Ryan Cramer
2020-12-06 08:31:23 -05:00
parent 7549ba7370
commit 891c4684e2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/core/DatabaseQuerySelectFulltext.php
View File

@@ -325,6 +325,7 @@ class DatabaseQuerySelectFulltext extends Wire {
*/ */
protected function matchArrayFieldName(array $fieldNames, $value) { protected function matchArrayFieldName(array $fieldNames, $value) {
$query = $this->query; $query = $this->query;
$query->bindOption('global', true);
$this->query = $this->wire(new DatabaseQuerySelect()); $this->query = $this->wire(new DatabaseQuerySelect());
$this->query->bindOption(true, $query->bindOption(true)); $this->query->bindOption(true, $query->bindOption(true));
@@ -332,7 +333,7 @@ class DatabaseQuerySelectFulltext extends Wire {
$this->matchFieldName($fieldName, $value); $this->matchFieldName($fieldName, $value);
} }
$query->where('(' . implode(') OR (', $this->query->where) . ')'); $query->where('((' . implode(') OR (', $this->query->where) . '))');
$this->query->copyBindValuesTo($query); $this->query->copyBindValuesTo($query);
$this->query = $query; $this->query = $query;
} }
@@ -358,6 +359,7 @@ class DatabaseQuerySelectFulltext extends Wire {
// if($this->operator === '*=') $this->operator = '%='; // if($this->operator === '*=') $this->operator = '%=';
$query = $this->query; $query = $this->query;
$query->bindOption('global', true);
$this->query = $this->wire(new DatabaseQuerySelect()); $this->query = $this->wire(new DatabaseQuerySelect());
$this->query->bindOption(true, $query->bindOption(true)); $this->query->bindOption(true, $query->bindOption(true));
$method = $this->method; $method = $this->method;
@@ -368,7 +370,7 @@ class DatabaseQuerySelectFulltext extends Wire {
} }
// @todo need to get anything else from substitute query? // @todo need to get anything else from substitute query?
$query->where('(' . implode(') OR (', $this->query->where) . ')'); $query->where('((' . implode(') OR (', $this->query->where) . '))');
$this->query->copyBindValuesTo($query); $this->query->copyBindValuesTo($query);
$this->query = $query; $this->query = $query;
} }