tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX. FulltextFilter requires table identifiers in match query

Browse Source 
Fixes #4483
This commit is contained in:
Elvinas L. 2015-08-05 09:41:44 +03:00
parent 102892e247
commit 29016645e5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
search/filters/FulltextFilter.php
View File

@ -58,12 +58,12 @@ class FulltextFilter extends SearchFilter {
if(is_array($indexes) && array_key_exists($this->getName(), $indexes)) {
$index = $indexes[$this->getName()];
if(is_array($index) && array_key_exists("value", $index)) {
return $index['value'];
return $this->prepareColumns($index['value']);
} else {
// Parse a fulltext string (eg. fulltext ("ColumnA", "ColumnB")) to figure out which columns
// we need to search.
if(preg_match('/^fulltext\s+\((.+)\)$/i', $index, $matches)) {
return $matches[1];
return $this->prepareColumns($matches[1]);
} else {
throw new Exception("Invalid fulltext index format for '" . $this->getName()
. "' on '" . $this->model . "'");
@ -73,5 +73,18 @@ class FulltextFilter extends SearchFilter {
return parent::getDbName();
}
private function prepareColumns($columns) {
$class = '';
$parts = explode(',', $columns);
array_walk($parts, function(&$col, $key) use (&$class) {
$name = trim($col, " \t\n\r\0\x0B\"");
if (empty($class)) {
$class = ClassInfo::table_for_object_field($this->model, $name);
}
$col = sprintf('"%s"."%s"', $class, $name);
});
return implode(',', $parts);
}
}