Minor source code cleanups
This commit is contained in:
parent
52acf5e8f8
commit
73d9bbb446
0
app/cache/.gitkeep
vendored
0
app/cache/.gitkeep
vendored
1
app/cache/status.json
vendored
1
app/cache/status.json
vendored
File diff suppressed because one or more lines are too long
|
@ -588,23 +588,6 @@ class MySQL extends Adapter
|
|||
|
||||
// Search
|
||||
if (!empty($options['search'])) { // Handle free search
|
||||
// $where[] = "LEFT JOIN `" . $this->getNamespace() . ".database.properties` b_search ON a.uid IS NOT NULL AND b_search.documentUid = a.uid
|
||||
// LEFT JOIN
|
||||
// `" . $this->getNamespace() . ".database.relationships` c_search ON c_search.start = a.uid
|
||||
// LEFT JOIN
|
||||
// `" . $this->getNamespace() . ".database.properties` d_search ON d_search.documentUid = c_search.end
|
||||
// LEFT JOIN
|
||||
// `" . $this->getNamespace() . ".database.relationships` e_search ON e_search.start = c_search.end
|
||||
// LEFT JOIN
|
||||
// `" . $this->getNamespace() . ".database.properties` f_search ON f_search.documentUid = e_search.end
|
||||
// \n";
|
||||
// $search = "AND (MATCH (b_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
|
||||
// OR b_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)}
|
||||
// OR MATCH (d_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
|
||||
// OR d_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)}
|
||||
// OR MATCH (f_search.value) AGAINST ({$this->getPDO()->quote($options['search'], PDO::PARAM_STR)} IN BOOLEAN MODE)
|
||||
// OR f_search.value LIKE {$this->getPDO()->quote('%%' . $options['search'] . '%%', PDO::PARAM_STR)})";
|
||||
|
||||
$where[] = 'LEFT JOIN `'.$this->getNamespace().".database.properties` b_search ON a.uid IS NOT NULL AND b_search.documentUid = a.uid AND b_search.primitive = 'string'
|
||||
LEFT JOIN
|
||||
`".$this->getNamespace().'.database.relationships` c_search ON c_search.start = b_search.documentUid
|
||||
|
|
Loading…
Reference in a new issue