archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Remove getPagingColumn() / getReversePaging()

Browse Source 
Summary: Ref T7803. Remove these in favor of more generalized paging and ordering.

Test Plan: Sorted and paged results in various applications.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7803

Differential Revision: https://secure.phabricator.com/D12378
This commit is contained in:
epriestley
2015-04-12 13:11:42 -07:00
parent bdd1edea7a
commit 2794c69db5
9 changed files with 8 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
View File

@@ -18,10 +18,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
private $internalPaging;
private $orderVector;
protected function getPagingColumn() {
return 'id';
}
protected function getPagingValue($result) {
if (!is_object($result)) {
// This interface can't be typehinted and PHP gets really angry if we
@@ -31,10 +27,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
return $result->getID();
}
protected function getReversePaging() {
return false;
}
protected function nextPage(array $page) {
// See getPagingViewer() for a description of this flag.
$this->internalPaging = true;
@@ -171,28 +163,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
protected function buildPagingClause(AphrontDatabaseConnection $conn) {
$orderable = $this->getOrderableColumns();
// TODO: Remove this once subqueries modernize.
if (!$orderable) {
if ($this->beforeID) {
return qsprintf(
$conn,
'%Q %Q %s',
$this->getPagingColumn(),
$this->getReversePaging() ? '<' : '>',
$this->beforeID);
} else if ($this->afterID) {
return qsprintf(
$conn,
'%Q %Q %s',
$this->getPagingColumn(),
$this->getReversePaging() ? '>' : '<',
$this->afterID);
} else {
return null;
}
}
$vector = $this->getOrderVector();
if ($this->beforeID !== null) {
@@ -543,13 +513,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
* @task order
*/
public function getOrderableColumns() {
// TODO: Remove this once all subclasses move off the old stuff.
if ($this->getPagingColumn() !== 'id') {
// This class has bad old custom logic around paging, so return nothing
// here. This deactivates the new order code.
return array();
}
$columns = array(
'id' => array(
'table' => $this->getPrimaryTableAlias(),
@@ -593,26 +556,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
*/
final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
$orderable = $this->getOrderableColumns();
// TODO: Remove this once all subclasses move off the old stuff. We'll
// only enter this block for code using older ordering mechanisms. New
// code should expose an orderable column list.
if (!$orderable) {
if ($this->beforeID) {
return qsprintf(
$conn,
'ORDER BY %Q %Q',
$this->getPagingColumn(),
$this->getReversePaging() ? 'DESC' : 'ASC');
} else {
return qsprintf(
$conn,
'ORDER BY %Q %Q',
$this->getPagingColumn(),
$this->getReversePaging() ? 'ASC' : 'DESC');
}
}
$vector = $this->getOrderVector();
$parts = array();
@@ -636,10 +579,6 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
array $parts) {
$is_query_reversed = false;
if ($this->getReversePaging()) {
$is_query_reversed = !$is_query_reversed;
}
if ($this->getBeforeID()) {
$is_query_reversed = !$is_query_reversed;
}