diff --git a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php @@ -52,12 +52,12 @@ switch ($type) { case 'open': $query - ->withStatus(DifferentialLegacyQuery::STATUS_OPEN) + ->withIsOpen(true) ->withAuthors($guids); break; case 'committable': $query - ->withStatus(DifferentialLegacyQuery::STATUS_ACCEPTED) + ->withStatuses(DifferentialRevisionStatus::ACCEPTED) ->withAuthors($guids); break; case 'revision-ids': diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php @@ -150,7 +150,10 @@ } if ($status) { - $query->withStatus($status); + $statuses = DifferentialLegacyQuery::getModernValues($status); + if ($statuses) { + $query->withStatuses($statuses); + } } if ($order) { $query->setOrder($order); diff --git a/src/applications/differential/constants/DifferentialLegacyQuery.php b/src/applications/differential/constants/DifferentialLegacyQuery.php --- a/src/applications/differential/constants/DifferentialLegacyQuery.php +++ b/src/applications/differential/constants/DifferentialLegacyQuery.php @@ -15,7 +15,7 @@ return array_keys(self::getMap()); } - public static function getQueryValues($status) { + public static function getModernValues($status) { if ($status === self::STATUS_ANY) { return null; } @@ -28,7 +28,7 @@ $status)); } - return self::getLegacyValues($map[$status]); + return $map[$status]; } public static function getLegacyValues(array $modern_values) { diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -10,8 +10,6 @@ private $pathIDs = array(); - private $status = 'status-any'; - private $authors = array(); private $draftAuthors = array(); private $ccs = array(); @@ -135,19 +133,6 @@ return $this; } - /** - * Filter results to revisions with a given status. Provide a class constant, - * such as `DifferentialLegacyQuery::STATUS_OPEN`. - * - * @param const Class STATUS constant, like STATUS_OPEN. - * @return this - * @task config - */ - public function withStatus($status_constant) { - $this->status = $status_constant; - return $this; - } - public function withStatuses(array $statuses) { $this->statuses = $statuses; return $this; @@ -706,17 +691,6 @@ $this->updatedEpochMax); } - // NOTE: Although the status constants are integers in PHP, the column is a - // string column in MySQL, and MySQL won't use keys on string columns if - // you put integers in the query. - $statuses = DifferentialLegacyQuery::getQueryValues($this->status); - if ($statuses !== null) { - $where[] = qsprintf( - $conn_r, - 'r.status IN (%Ls)', - $statuses); - } - if ($this->statuses !== null) { $where[] = qsprintf( $conn_r, @@ -726,16 +700,16 @@ if ($this->isOpen !== null) { if ($this->isOpen) { - $statuses = DifferentialLegacyQuery::getQueryValues( + $statuses = DifferentialLegacyQuery::getModernValues( DifferentialLegacyQuery::STATUS_OPEN); } else { - $statuses = DifferentialLegacyQuery::getQueryValues( + $statuses = DifferentialLegacyQuery::getModernValues( DifferentialLegacyQuery::STATUS_CLOSED); } $where[] = qsprintf( $conn_r, 'r.status in (%Ls)', - $statuses); + DifferentialLegacyQuery::getLegacyValues($statuses)); } $where[] = $this->buildWhereClauseParts($conn_r);