tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #280 from chrometoasters/pulls/fix-108-getDirtyIDs-ss3 

FIX #108 for SS 3.x - Update and simplify getDirtyIDs method
This commit is contained in:
Daniel Hensby 2020-04-17 22:08:27 +01:00 committed by GitHub
parent 5c38b0abce 82d0bb4efe
commit fa502730d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/search/SearchIndex.php
View File

@ -598,16 +598,14 @@ abstract class SearchIndex extends ViewableData
foreach ($derivation['chain'] as $step) {
if ($step['through'] == 'has_one') {
$sql = new SQLQuery('"ID"', '"'.$step['class'].'"', '"'.$step['foreignkey'].'" IN ('.implode(',', $ids).')');
singleton($step['class'])->extend('augmentSQL', $sql);
$ids = $sql->execute()->column();
$ids = DataObject::get($step['class'])
->filter($step['foreignkey'], $ids)
->column('ID');
} elseif ($step['through'] == 'has_many') {
$sql = new SQLQuery('"'.$step['class'].'"."ID"', '"'.$step['class'].'"', '"'.$step['otherclass'].'"."ID" IN ('.implode(',', $ids).')');
$sql->addInnerJoin($step['otherclass'], '"'.$step['class'].'"."ID" = "'.$step['otherclass'].'"."'.$step['foreignkey'].'"');
singleton($step['class'])->extend('augmentSQL', $sql);
$ids = $sql->execute()->column();
// foreignkey identifies a has_one column on the model linked via the has_many relation
$ids = DataObject::get($step['otherclass'])
->filter('ID', $ids)
->column($step['foreignkey']);
}
if (empty($ids)) {