ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Searching: more robust entity counting

Browse source
This commit is contained in:
Marcin Kurczewski 2014-02-16 18:19:04 +01:00
parent 0c5fc7e03f
commit 18bfd6605d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Models/SearchServices/AbstractSearchService.php
View file

@ -21,7 +21,7 @@ abstract class AbstractSearchService
$sqlQuery->offset('?')->put(($page - 1) * $perPage); $sqlQuery->offset('?')->put(($page - 1) * $perPage);
} }
static function getEntitiesRows($searchQuery, $perPage = null, $page = 1) public static function getEntitiesRows($searchQuery, $perPage = null, $page = 1)
{ {
$modelClassName = self::getModelClassName(); $modelClassName = self::getModelClassName();
$table = $modelClassName::getTableName(); $table = $modelClassName::getTableName();
@ -35,21 +35,23 @@ abstract class AbstractSearchService
return $rows; return $rows;
} }
static function getEntities($searchQuery, $perPage = null, $page = 1) public static function getEntities($searchQuery, $perPage = null, $page = 1)
{ {
$modelClassName = self::getModelClassName(); $modelClassName = self::getModelClassName();
$rows = static::getEntitiesRows($searchQuery, $perPage, $page); $rows = static::getEntitiesRows($searchQuery, $perPage, $page);
return $modelClassName::convertRows($rows); return $modelClassName::convertRows($rows);
} }
static function getEntityCount($searchQuery) public static function getEntityCount($searchQuery)
{ {
$modelClassName = self::getModelClassName(); $modelClassName = self::getModelClassName();
$table = $modelClassName::getTableName(); $table = $modelClassName::getTableName();
$sqlQuery = new SqlQuery(); $sqlQuery = new SqlQuery();
$sqlQuery->select('count(1)')->as('count'); $sqlQuery->select('count(1)')->as('count');
$sqlQuery->from()->raw('(')->select('1');
static::decorate($sqlQuery, $searchQuery); static::decorate($sqlQuery, $searchQuery);
$sqlQuery->raw(')');
return Database::fetchOne($sqlQuery)['count']; return Database::fetchOne($sqlQuery)['count'];
} }