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

Fix PostgreSQLDatabase::searchEngine()

This commit is contained in:
Loz Calver 2017-11-24 22:15:55 +00:00
parent 0b5b6ddad2
commit 851309f187
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/PostgreSQLDatabase.php
View File

@ -352,16 +352,13 @@ class PostgreSQLDatabase extends SS_Database {
if($keywords) $orderBy = " ORDER BY $sortBy";
else $orderBy='';
$fullQuery = "SELECT * FROM (" . implode(" UNION ", $tables) . ") AS q1 $orderBy LIMIT $limit OFFSET $offset";
// Get the total items in this search
$totalItemsQuery = "SELECT COUNT(*) AS totalitems FROM (" . implode(" UNION ", $tables) . ") AS q1";
$totalCount = DB::query($totalItemsQuery);
$fullQuery = "SELECT *, count(*) OVER() as _fullcount FROM (" . implode(" UNION ", $tables) . ") AS q1 $orderBy LIMIT $limit OFFSET $offset";
// Get records
$records = $this->preparedQuery($fullQuery, $tableParameters);
foreach($records as $record){
$objects[] = new $record['ClassName']($record);
$objects[] = Injector::inst()->createWithArgs($record['ClassName'], array($record));
$totalCount = $record['_fullcount'];
}
if(isset($objects)) $results = new ArrayList($objects);
@ -370,7 +367,7 @@ class PostgreSQLDatabase extends SS_Database {
$list->setLimitItems(false);
$list->setPageStart($start);
$list->setPageLength($pageLength);
$list->setTotalItems($totalCount->value());
$list->setTotalItems($totalCount);
return $list;
}