From f5580c7a083efaf004eec6a899040b60053bab2f Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 18 Apr 2015 07:08:30 -0700 Subject: [PATCH] Make buildWhereClause() a method of AphrontCursorPagedPolicyAwareQuery Summary: Ref T4100. Ref T5595. To support a unified "Projects:" query across all applications, a future diff is going to add a set of "Edge Logic" capabilities to `PolicyAwareQuery` which write the required SELECT, JOIN, WHERE, HAVING and GROUP clauses for you. With the addition of "Edge Logic", we'll have three systems which may need to build components of query claues: ordering/paging, customfields/applicationsearch, and edge logic. For most clauses, queries don't currently call into the parent explicitly to get default components. I want to move more query construction logic up the class tree so it can be shared. For most methods, this isn't a problem, but many subclasses define a `buildWhereClause()`. Make all such definitions protected and consistent. This causes no behavioral changes. Test Plan: Ran `arc unit --everything`, which does a pretty through job of verifying this statically. Reviewers: btrahan Reviewed By: btrahan Subscribers: yelirekim, hach-que, epriestley Maniphest Tasks: T4100, T5595 Differential Revision: https://secure.phabricator.com/D12453 --- .../almanac/query/AlmanacBindingQuery.php | 2 +- .../almanac/query/AlmanacDeviceQuery.php | 2 +- .../almanac/query/AlmanacInterfaceQuery.php | 2 +- .../almanac/query/AlmanacNetworkQuery.php | 2 +- .../almanac/query/AlmanacPropertyQuery.php | 2 +- .../almanac/query/AlmanacServiceQuery.php | 2 +- .../query/PhabricatorCalendarEventQuery.php | 2 +- .../query/PhabricatorChatLogChannelQuery.php | 2 +- .../chatlog/query/PhabricatorChatLogQuery.php | 2 +- .../query/PhabricatorConduitLogQuery.php | 2 +- .../query/PhabricatorConduitTokenQuery.php | 2 +- .../query/PhabricatorConfigEntryQuery.php | 2 +- .../query/ConpherenceFulltextQuery.php | 2 +- .../ConpherenceParticipantCountQuery.php | 2 +- .../query/ConpherenceParticipantQuery.php | 2 +- .../query/ConpherenceThreadQuery.php | 2 +- .../query/PhabricatorCountdownQuery.php | 2 +- .../query/PhabricatorDaemonLogQuery.php | 2 +- .../query/PhabricatorDashboardPanelQuery.php | 2 +- .../query/PhabricatorDashboardQuery.php | 2 +- .../query/DifferentialChangesetQuery.php | 2 +- .../query/DifferentialDiffQuery.php | 2 +- .../query/DifferentialHunkQuery.php | 2 +- .../query/DifferentialInlineCommentQuery.php | 2 +- .../query/DifferentialRevisionQuery.php | 2 +- .../diffusion/query/DiffusionCommitQuery.php | 2 +- .../query/DiffusionLintCountQuery.php | 7 +++- .../diffusion/query/DiffusionPathQuery.php | 2 +- .../diffusion/query/DiffusionSymbolQuery.php | 2 +- .../diviner/query/DivinerAtomQuery.php | 2 +- .../diviner/query/DivinerBookQuery.php | 2 +- .../query/DoorkeeperExternalObjectQuery.php | 2 +- .../drydock/query/DrydockBlueprintQuery.php | 2 +- .../drydock/query/DrydockLeaseQuery.php | 2 +- .../drydock/query/DrydockLogQuery.php | 2 +- .../drydock/query/DrydockResourceQuery.php | 2 +- .../feed/query/PhabricatorFeedQuery.php | 2 +- .../files/query/PhabricatorFileChunkQuery.php | 2 +- .../files/query/PhabricatorFileQuery.php | 2 +- .../flag/query/PhabricatorFlagQuery.php | 2 +- .../fund/query/FundBackerQuery.php | 2 +- .../fund/query/FundInitiativeQuery.php | 2 +- .../query/HarbormasterBuildArtifactQuery.php | 2 +- .../query/HarbormasterBuildItemQuery.php | 2 +- .../query/HarbormasterBuildLogQuery.php | 2 +- .../query/HarbormasterBuildMessageQuery.php | 2 +- .../query/HarbormasterBuildPlanQuery.php | 2 +- .../query/HarbormasterBuildQuery.php | 2 +- .../query/HarbormasterBuildStepQuery.php | 2 +- .../query/HarbormasterBuildTargetQuery.php | 2 +- .../query/HarbormasterBuildableQuery.php | 2 +- .../herald/query/HeraldRuleQuery.php | 2 +- .../herald/query/HeraldTranscriptQuery.php | 2 +- .../legalpad/query/LegalpadDocumentQuery.php | 2 +- .../query/LegalpadDocumentSignatureQuery.php | 2 +- .../query/PhabricatorMailingListQuery.php | 2 +- ...habricatorMetaMTAApplicationEmailQuery.php | 2 +- .../query/PhabricatorNotificationQuery.php | 2 +- .../nuance/query/NuanceItemQuery.php | 2 +- .../nuance/query/NuanceQueueQuery.php | 2 +- .../nuance/query/NuanceRequestorQuery.php | 2 +- .../nuance/query/NuanceSourceQuery.php | 2 +- ...abricatorOAuthClientAuthorizationQuery.php | 2 +- .../PhabricatorOAuthServerClientQuery.php | 2 +- .../query/PhabricatorOwnersPackageQuery.php | 2 +- .../query/PassphraseCredentialQuery.php | 2 +- .../paste/query/PhabricatorPasteQuery.php | 2 +- .../query/PhabricatorPeopleLogQuery.php | 2 +- .../people/query/PhabricatorPeopleQuery.php | 2 +- .../phame/query/PhameBlogQuery.php | 2 +- .../phame/query/PhamePostQuery.php | 2 +- .../phlux/query/PhluxVariableQuery.php | 2 +- .../pholio/query/PholioImageQuery.php | 2 +- .../pholio/query/PholioMockQuery.php | 2 +- .../phortune/query/PhortuneAccountQuery.php | 2 +- .../phortune/query/PhortuneCartQuery.php | 2 +- .../phortune/query/PhortuneChargeQuery.php | 2 +- .../phortune/query/PhortuneMerchantQuery.php | 2 +- .../query/PhortunePaymentMethodQuery.php | 2 +- .../PhortunePaymentProviderConfigQuery.php | 2 +- .../phortune/query/PhortuneProductQuery.php | 2 +- .../phortune/query/PhortunePurchaseQuery.php | 2 +- .../query/PhortuneSubscriptionQuery.php | 2 +- .../query/PhragmentFragmentQuery.php | 2 +- .../query/PhragmentFragmentVersionQuery.php | 2 +- .../query/PhragmentSnapshotChildQuery.php | 2 +- .../query/PhragmentSnapshotQuery.php | 2 +- .../query/PhrequentUserTimeQuery.php | 2 +- .../ponder/query/PonderAnswerQuery.php | 2 +- .../ponder/query/PonderQuestionQuery.php | 2 +- .../PhabricatorProjectColumnPositionQuery.php | 2 +- .../query/PhabricatorProjectColumnQuery.php | 2 +- .../project/query/PhabricatorProjectQuery.php | 2 +- .../releeph/query/ReleephBranchQuery.php | 2 +- .../releeph/query/ReleephProductQuery.php | 2 +- .../releeph/query/ReleephRequestQuery.php | 2 +- ...bricatorRepositoryArcanistProjectQuery.php | 2 +- .../PhabricatorRepositoryMirrorQuery.php | 2 +- .../PhabricatorRepositoryPushEventQuery.php | 2 +- .../PhabricatorRepositoryPushLogQuery.php | 2 +- .../query/PhabricatorRepositoryQuery.php | 2 +- .../PhabricatorRepositoryRefCursorQuery.php | 2 +- .../query/PhabricatorNamedQueryQuery.php | 2 +- .../query/PhabricatorSavedQueryQuery.php | 2 +- .../query/PhabricatorSlowvoteQuery.php | 2 +- .../query/PhabricatorTokenCountQuery.php | 2 +- .../query/PhabricatorTokenGivenQuery.php | 2 +- ...atorApplicationTransactionCommentQuery.php | 2 +- ...PhabricatorApplicationTransactionQuery.php | 2 +- .../PhabricatorWorkerArchiveTaskQuery.php | 2 +- .../query/PhabricatorWorkerLeaseQuery.php | 7 +++- .../query/PhabricatorWorkerTriggerQuery.php | 2 +- .../edges/query/PhabricatorEdgeQuery.php | 2 +- ...PhabricatorCursorPagedPolicyAwareQuery.php | 42 ++++++++++++++++++- 114 files changed, 162 insertions(+), 116 deletions(-) diff --git a/src/applications/almanac/query/AlmanacBindingQuery.php b/src/applications/almanac/query/AlmanacBindingQuery.php index dd4336db8c..0b6d7cda3a 100644 --- a/src/applications/almanac/query/AlmanacBindingQuery.php +++ b/src/applications/almanac/query/AlmanacBindingQuery.php @@ -93,7 +93,7 @@ final class AlmanacBindingQuery return $bindings; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/almanac/query/AlmanacDeviceQuery.php b/src/applications/almanac/query/AlmanacDeviceQuery.php index bd1797088f..287af6c647 100644 --- a/src/applications/almanac/query/AlmanacDeviceQuery.php +++ b/src/applications/almanac/query/AlmanacDeviceQuery.php @@ -49,7 +49,7 @@ final class AlmanacDeviceQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/almanac/query/AlmanacInterfaceQuery.php b/src/applications/almanac/query/AlmanacInterfaceQuery.php index 7e2a867d29..e119203da5 100644 --- a/src/applications/almanac/query/AlmanacInterfaceQuery.php +++ b/src/applications/almanac/query/AlmanacInterfaceQuery.php @@ -83,7 +83,7 @@ final class AlmanacInterfaceQuery return $interfaces; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/almanac/query/AlmanacNetworkQuery.php b/src/applications/almanac/query/AlmanacNetworkQuery.php index 1eb43fa828..d33def72ea 100644 --- a/src/applications/almanac/query/AlmanacNetworkQuery.php +++ b/src/applications/almanac/query/AlmanacNetworkQuery.php @@ -31,7 +31,7 @@ final class AlmanacNetworkQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/almanac/query/AlmanacPropertyQuery.php b/src/applications/almanac/query/AlmanacPropertyQuery.php index 470ea62618..886c26a7be 100644 --- a/src/applications/almanac/query/AlmanacPropertyQuery.php +++ b/src/applications/almanac/query/AlmanacPropertyQuery.php @@ -71,7 +71,7 @@ final class AlmanacPropertyQuery return $properties; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/almanac/query/AlmanacServiceQuery.php b/src/applications/almanac/query/AlmanacServiceQuery.php index d9aca2650e..d961b2e4ab 100644 --- a/src/applications/almanac/query/AlmanacServiceQuery.php +++ b/src/applications/almanac/query/AlmanacServiceQuery.php @@ -88,7 +88,7 @@ final class AlmanacServiceQuery return implode(' ', $joins); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php index f6feea5041..cdfeb0ca43 100644 --- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php @@ -51,7 +51,7 @@ final class PhabricatorCalendarEventQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php index 4dcc4a16a9..2aded5c11b 100644 --- a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php +++ b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php @@ -33,7 +33,7 @@ final class PhabricatorChatLogChannelQuery return $logs; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/query/PhabricatorChatLogQuery.php index cb7fe53128..d174fdac90 100644 --- a/src/applications/chatlog/query/PhabricatorChatLogQuery.php +++ b/src/applications/chatlog/query/PhabricatorChatLogQuery.php @@ -55,7 +55,7 @@ final class PhabricatorChatLogQuery return $events; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php index 56934caf45..4d66cccae5 100644 --- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php @@ -25,7 +25,7 @@ final class PhabricatorConduitLogQuery return $table->loadAllFromArray($data);; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->methods) { diff --git a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php index 563e437a4a..870043cac8 100644 --- a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php @@ -49,7 +49,7 @@ final class PhabricatorConduitTokenQuery return $table->loadAllFromArray($data);; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/config/query/PhabricatorConfigEntryQuery.php b/src/applications/config/query/PhabricatorConfigEntryQuery.php index 01982ca7d0..56bf15a267 100644 --- a/src/applications/config/query/PhabricatorConfigEntryQuery.php +++ b/src/applications/config/query/PhabricatorConfigEntryQuery.php @@ -31,7 +31,7 @@ final class PhabricatorConfigEntryQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/conpherence/query/ConpherenceFulltextQuery.php b/src/applications/conpherence/query/ConpherenceFulltextQuery.php index 780c4914cf..244791076c 100644 --- a/src/applications/conpherence/query/ConpherenceFulltextQuery.php +++ b/src/applications/conpherence/query/ConpherenceFulltextQuery.php @@ -32,7 +32,7 @@ final class ConpherenceFulltextQuery return $rows; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->threadPHIDs !== null) { diff --git a/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php b/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php index 1d0cb81f8c..7a4f170c3a 100644 --- a/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php +++ b/src/applications/conpherence/query/ConpherenceParticipantCountQuery.php @@ -42,7 +42,7 @@ final class ConpherenceParticipantCountQuery return ipull($rows, 'count', 'participantPHID'); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->participantPHIDs) { diff --git a/src/applications/conpherence/query/ConpherenceParticipantQuery.php b/src/applications/conpherence/query/ConpherenceParticipantQuery.php index f9c31deed6..bb879be4e4 100644 --- a/src/applications/conpherence/query/ConpherenceParticipantQuery.php +++ b/src/applications/conpherence/query/ConpherenceParticipantQuery.php @@ -79,7 +79,7 @@ final class ConpherenceParticipantQuery extends PhabricatorOffsetPagedQuery { return $participants; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->participantPHIDs) { diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php index b5607c1061..c191a763b4 100644 --- a/src/applications/conpherence/query/ConpherenceThreadQuery.php +++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php @@ -163,7 +163,7 @@ final class ConpherenceThreadQuery return false; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php index 5d04dfde6a..c5f206a4e2 100644 --- a/src/applications/countdown/query/PhabricatorCountdownQuery.php +++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php @@ -45,7 +45,7 @@ final class PhabricatorCountdownQuery return $countdowns; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php index 545c412f86..5822194d06 100644 --- a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php +++ b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php @@ -124,7 +124,7 @@ final class PhabricatorDaemonLogQuery return $daemons; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php index 9641f33338..a9a062ffb2 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php @@ -43,7 +43,7 @@ final class PhabricatorDashboardPanelQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/dashboard/query/PhabricatorDashboardQuery.php b/src/applications/dashboard/query/PhabricatorDashboardQuery.php index d8ba184e81..324151e722 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardQuery.php @@ -73,7 +73,7 @@ final class PhabricatorDashboardQuery return $dashboards; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php index 6cb60e04e9..7b9f2e6d10 100644 --- a/src/applications/differential/query/DifferentialChangesetQuery.php +++ b/src/applications/differential/query/DifferentialChangesetQuery.php @@ -124,7 +124,7 @@ final class DifferentialChangesetQuery return $changesets; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->diffs !== null) { diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php index 3d58e12f8a..15ddc9c46b 100644 --- a/src/applications/differential/query/DifferentialDiffQuery.php +++ b/src/applications/differential/query/DifferentialDiffQuery.php @@ -121,7 +121,7 @@ final class DifferentialDiffQuery return $diffs; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php index 94bc0297b3..3c9f898810 100644 --- a/src/applications/differential/query/DifferentialHunkQuery.php +++ b/src/applications/differential/query/DifferentialHunkQuery.php @@ -90,7 +90,7 @@ final class DifferentialHunkQuery return $hunks; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if (!$this->changesets) { diff --git a/src/applications/differential/query/DifferentialInlineCommentQuery.php b/src/applications/differential/query/DifferentialInlineCommentQuery.php index f605a78b02..127dcb7c7d 100644 --- a/src/applications/differential/query/DifferentialInlineCommentQuery.php +++ b/src/applications/differential/query/DifferentialInlineCommentQuery.php @@ -76,7 +76,7 @@ final class DifferentialInlineCommentQuery return head($this->execute()); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); // Only find inline comments. diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php index 13399bd7cc..63b5256454 100644 --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -693,7 +693,7 @@ final class DifferentialRevisionQuery /** * @task internal */ - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->pathIDs) { diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php index 22331e8510..8fd9d0c73e 100644 --- a/src/applications/diffusion/query/DiffusionCommitQuery.php +++ b/src/applications/diffusion/query/DiffusionCommitQuery.php @@ -279,7 +279,7 @@ final class DiffusionCommitQuery return $commits; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->repositoryPHIDs !== null) { diff --git a/src/applications/diffusion/query/DiffusionLintCountQuery.php b/src/applications/diffusion/query/DiffusionLintCountQuery.php index 89fca4cded..f85505af76 100644 --- a/src/applications/diffusion/query/DiffusionLintCountQuery.php +++ b/src/applications/diffusion/query/DiffusionLintCountQuery.php @@ -56,7 +56,7 @@ final class DiffusionLintCountQuery extends PhabricatorQuery { 'SELECT %s path_prefix, COUNT(*) N FROM %T %Q', $key, PhabricatorRepository::TABLE_LINTMESSAGE, - $this->buildWhereClause($conn_r, $part)); + $this->buildCustomWhereClause($conn_r, $part)); } $huge_union_query = '('.implode(') UNION ALL (', $queries).')'; @@ -69,7 +69,10 @@ final class DiffusionLintCountQuery extends PhabricatorQuery { return $this->processResults($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r, $part) { + protected function buildCustomWhereClause( + AphrontDatabaseConnection $conn_r, + $part) { + $where = array(); $where[] = $part; diff --git a/src/applications/diffusion/query/DiffusionPathQuery.php b/src/applications/diffusion/query/DiffusionPathQuery.php index 33e7b57909..f442da7173 100644 --- a/src/applications/diffusion/query/DiffusionPathQuery.php +++ b/src/applications/diffusion/query/DiffusionPathQuery.php @@ -23,7 +23,7 @@ final class DiffusionPathQuery { return ipull($results, null, 'id'); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->pathIDs) { diff --git a/src/applications/diffusion/query/DiffusionSymbolQuery.php b/src/applications/diffusion/query/DiffusionSymbolQuery.php index e5cb2b91c4..053f4a222e 100644 --- a/src/applications/diffusion/query/DiffusionSymbolQuery.php +++ b/src/applications/diffusion/query/DiffusionSymbolQuery.php @@ -184,7 +184,7 @@ final class DiffusionSymbolQuery extends PhabricatorOffsetPagedQuery { /** * @task internal */ - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if (isset($this->context)) { diff --git a/src/applications/diviner/query/DivinerAtomQuery.php b/src/applications/diviner/query/DivinerAtomQuery.php index 5b9b8814f7..70759a2cc1 100644 --- a/src/applications/diviner/query/DivinerAtomQuery.php +++ b/src/applications/diviner/query/DivinerAtomQuery.php @@ -259,7 +259,7 @@ final class DivinerAtomQuery extends PhabricatorCursorPagedPolicyAwareQuery { return $atoms; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/diviner/query/DivinerBookQuery.php b/src/applications/diviner/query/DivinerBookQuery.php index 31e6f336a9..90fed52a23 100644 --- a/src/applications/diviner/query/DivinerBookQuery.php +++ b/src/applications/diviner/query/DivinerBookQuery.php @@ -36,7 +36,7 @@ final class DivinerBookQuery extends PhabricatorCursorPagedPolicyAwareQuery { return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php index 75ace905da..770678a687 100644 --- a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php +++ b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php @@ -31,7 +31,7 @@ final class DoorkeeperExternalObjectQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->phids) { diff --git a/src/applications/drydock/query/DrydockBlueprintQuery.php b/src/applications/drydock/query/DrydockBlueprintQuery.php index 4afdb582c2..b698855bcf 100644 --- a/src/applications/drydock/query/DrydockBlueprintQuery.php +++ b/src/applications/drydock/query/DrydockBlueprintQuery.php @@ -42,7 +42,7 @@ final class DrydockBlueprintQuery extends DrydockQuery { return $blueprints; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/drydock/query/DrydockLeaseQuery.php b/src/applications/drydock/query/DrydockLeaseQuery.php index 028351bdae..d5d62f950e 100644 --- a/src/applications/drydock/query/DrydockLeaseQuery.php +++ b/src/applications/drydock/query/DrydockLeaseQuery.php @@ -69,7 +69,7 @@ final class DrydockLeaseQuery extends DrydockQuery { return $leases; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->resourceIDs) { diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php index 83413d79c0..1e21864f10 100644 --- a/src/applications/drydock/query/DrydockLogQuery.php +++ b/src/applications/drydock/query/DrydockLogQuery.php @@ -88,7 +88,7 @@ final class DrydockLogQuery extends DrydockQuery { return $logs; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->resourceIDs) { diff --git a/src/applications/drydock/query/DrydockResourceQuery.php b/src/applications/drydock/query/DrydockResourceQuery.php index 468af91db4..af84fefa4a 100644 --- a/src/applications/drydock/query/DrydockResourceQuery.php +++ b/src/applications/drydock/query/DrydockResourceQuery.php @@ -50,7 +50,7 @@ final class DrydockResourceQuery extends DrydockQuery { return $resources; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/feed/query/PhabricatorFeedQuery.php b/src/applications/feed/query/PhabricatorFeedQuery.php index 5f3efe5aaf..424658b342 100644 --- a/src/applications/feed/query/PhabricatorFeedQuery.php +++ b/src/applications/feed/query/PhabricatorFeedQuery.php @@ -49,7 +49,7 @@ final class PhabricatorFeedQuery $ref_table->getTableName()); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->filterPHIDs) { diff --git a/src/applications/files/query/PhabricatorFileChunkQuery.php b/src/applications/files/query/PhabricatorFileChunkQuery.php index 7c2a961fd0..b6fda13103 100644 --- a/src/applications/files/query/PhabricatorFileChunkQuery.php +++ b/src/applications/files/query/PhabricatorFileChunkQuery.php @@ -86,7 +86,7 @@ final class PhabricatorFileChunkQuery return $chunks; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->chunkHandles !== null) { diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php index ad0bbbac1b..a15be0c0bb 100644 --- a/src/applications/files/query/PhabricatorFileQuery.php +++ b/src/applications/files/query/PhabricatorFileQuery.php @@ -228,7 +228,7 @@ final class PhabricatorFileQuery return implode(' ', $joins); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/flag/query/PhabricatorFlagQuery.php b/src/applications/flag/query/PhabricatorFlagQuery.php index 910ed7dfa9..0b1902f6f1 100644 --- a/src/applications/flag/query/PhabricatorFlagQuery.php +++ b/src/applications/flag/query/PhabricatorFlagQuery.php @@ -122,7 +122,7 @@ final class PhabricatorFlagQuery return $flags; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ownerPHIDs) { diff --git a/src/applications/fund/query/FundBackerQuery.php b/src/applications/fund/query/FundBackerQuery.php index 505de2bdf3..5f7406f5ad 100644 --- a/src/applications/fund/query/FundBackerQuery.php +++ b/src/applications/fund/query/FundBackerQuery.php @@ -68,7 +68,7 @@ final class FundBackerQuery return $backers; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php index 8fd910c046..66f87a883c 100644 --- a/src/applications/fund/query/FundInitiativeQuery.php +++ b/src/applications/fund/query/FundInitiativeQuery.php @@ -73,7 +73,7 @@ final class FundInitiativeQuery return $initiatives; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php index 077e77a4bd..553780aa76 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php @@ -75,7 +75,7 @@ final class HarbormasterBuildArtifactQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php index 2c82588940..1c54cf1fa7 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php @@ -31,7 +31,7 @@ final class HarbormasterBuildItemQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php index 461697a1e4..f0f2021fd8 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php @@ -62,7 +62,7 @@ final class HarbormasterBuildLogQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php index 816bafc1ad..749fdd76d4 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php @@ -62,7 +62,7 @@ final class HarbormasterBuildMessageQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php index 8ea76ba36f..4123941665 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php @@ -43,7 +43,7 @@ final class HarbormasterBuildPlanQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php index 0daf5ac906..d0b1e7420c 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php @@ -136,7 +136,7 @@ final class HarbormasterBuildQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php index bea3ec10f0..c14185116c 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php @@ -37,7 +37,7 @@ final class HarbormasterBuildStepQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php index 213a6a4a20..c61c0bd8b0 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php @@ -49,7 +49,7 @@ final class HarbormasterBuildTargetQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php index 5b5972fa2f..1b1956a0c7 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php @@ -172,7 +172,7 @@ final class HarbormasterBuildableQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php index 6e88dc40a0..5967c6ffc9 100644 --- a/src/applications/herald/query/HeraldRuleQuery.php +++ b/src/applications/herald/query/HeraldRuleQuery.php @@ -174,7 +174,7 @@ final class HeraldRuleQuery extends PhabricatorCursorPagedPolicyAwareQuery { return $rules; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/herald/query/HeraldTranscriptQuery.php b/src/applications/herald/query/HeraldTranscriptQuery.php index b76b657a7f..d679009c4e 100644 --- a/src/applications/herald/query/HeraldTranscriptQuery.php +++ b/src/applications/herald/query/HeraldTranscriptQuery.php @@ -85,7 +85,7 @@ final class HeraldTranscriptQuery return $transcripts; } - public function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php index 03ec6b3d3c..e2e43e0e28 100644 --- a/src/applications/legalpad/query/LegalpadDocumentQuery.php +++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php @@ -165,7 +165,7 @@ final class LegalpadDocumentQuery } } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php index 3bb3628c99..452ea6759b 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php @@ -86,7 +86,7 @@ final class LegalpadDocumentSignatureQuery return $signatures; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php index 44f54edbda..113bb4c80d 100644 --- a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php +++ b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php @@ -43,7 +43,7 @@ final class PhabricatorMailingListQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php index d2ac2f17a6..b173224914 100644 --- a/src/applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php +++ b/src/applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php @@ -71,7 +71,7 @@ final class PhabricatorMetaMTAApplicationEmailQuery return $app_emails; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->addresses !== null) { diff --git a/src/applications/notification/query/PhabricatorNotificationQuery.php b/src/applications/notification/query/PhabricatorNotificationQuery.php index a1f8ac63c7..aa430a2518 100644 --- a/src/applications/notification/query/PhabricatorNotificationQuery.php +++ b/src/applications/notification/query/PhabricatorNotificationQuery.php @@ -76,7 +76,7 @@ final class PhabricatorNotificationQuery return $stories; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->userPHIDs !== null) { diff --git a/src/applications/nuance/query/NuanceItemQuery.php b/src/applications/nuance/query/NuanceItemQuery.php index 5264c4b527..4b87f38a77 100644 --- a/src/applications/nuance/query/NuanceItemQuery.php +++ b/src/applications/nuance/query/NuanceItemQuery.php @@ -38,7 +38,7 @@ final class NuanceItemQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/nuance/query/NuanceQueueQuery.php b/src/applications/nuance/query/NuanceQueueQuery.php index b4a067f01c..822a60c620 100644 --- a/src/applications/nuance/query/NuanceQueueQuery.php +++ b/src/applications/nuance/query/NuanceQueueQuery.php @@ -31,7 +31,7 @@ final class NuanceQueueQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/nuance/query/NuanceRequestorQuery.php b/src/applications/nuance/query/NuanceRequestorQuery.php index e23cc71343..91a9878b83 100644 --- a/src/applications/nuance/query/NuanceRequestorQuery.php +++ b/src/applications/nuance/query/NuanceRequestorQuery.php @@ -31,7 +31,7 @@ final class NuanceRequestorQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/nuance/query/NuanceSourceQuery.php b/src/applications/nuance/query/NuanceSourceQuery.php index 3a177a4e42..77421656e7 100644 --- a/src/applications/nuance/query/NuanceSourceQuery.php +++ b/src/applications/nuance/query/NuanceSourceQuery.php @@ -44,7 +44,7 @@ final class NuanceSourceQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php index 754e3474ab..f19be14434 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php @@ -59,7 +59,7 @@ final class PhabricatorOAuthClientAuthorizationQuery return $authorizations; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->phids) { diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php index bf22a2a701..b5da9ecd5f 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php @@ -37,7 +37,7 @@ final class PhabricatorOAuthServerClientQuery return $table->loadAllFromArray($data); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php index bdfb6f5a4e..64640c3ab8 100644 --- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php +++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php @@ -48,7 +48,7 @@ final class PhabricatorOwnersPackageQuery return implode(' ', $joins); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->phids) { diff --git a/src/applications/passphrase/query/PassphraseCredentialQuery.php b/src/applications/passphrase/query/PassphraseCredentialQuery.php index 29f661397d..9cae8b1f85 100644 --- a/src/applications/passphrase/query/PassphraseCredentialQuery.php +++ b/src/applications/passphrase/query/PassphraseCredentialQuery.php @@ -99,7 +99,7 @@ final class PassphraseCredentialQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php index 35c3820311..ae74978510 100644 --- a/src/applications/paste/query/PhabricatorPasteQuery.php +++ b/src/applications/paste/query/PhabricatorPasteQuery.php @@ -96,7 +96,7 @@ final class PhabricatorPasteQuery return $pastes; } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php index 3315234d12..9bcdc53f49 100644 --- a/src/applications/people/query/PhabricatorPeopleLogQuery.php +++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php @@ -55,7 +55,7 @@ final class PhabricatorPeopleLogQuery return $table->loadAllFromArray($data); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->actorPHIDs !== null) { diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php index 472e76a8a1..437f764fe9 100644 --- a/src/applications/people/query/PhabricatorPeopleQuery.php +++ b/src/applications/people/query/PhabricatorPeopleQuery.php @@ -227,7 +227,7 @@ final class PhabricatorPeopleQuery return $joins; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->usernames !== null) { diff --git a/src/applications/phame/query/PhameBlogQuery.php b/src/applications/phame/query/PhameBlogQuery.php index 160749a18f..a3e88e5143 100644 --- a/src/applications/phame/query/PhameBlogQuery.php +++ b/src/applications/phame/query/PhameBlogQuery.php @@ -43,7 +43,7 @@ final class PhameBlogQuery extends PhabricatorCursorPagedPolicyAwareQuery { return $blogs; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php index d87c26e35e..2eed8d2960 100644 --- a/src/applications/phame/query/PhamePostQuery.php +++ b/src/applications/phame/query/PhamePostQuery.php @@ -81,7 +81,7 @@ final class PhamePostQuery extends PhabricatorCursorPagedPolicyAwareQuery { return $posts; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phlux/query/PhluxVariableQuery.php b/src/applications/phlux/query/PhluxVariableQuery.php index 3439ee1d8b..82072485d4 100644 --- a/src/applications/phlux/query/PhluxVariableQuery.php +++ b/src/applications/phlux/query/PhluxVariableQuery.php @@ -37,7 +37,7 @@ final class PhluxVariableQuery return $table->loadAllFromArray($rows); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/pholio/query/PholioImageQuery.php b/src/applications/pholio/query/PholioImageQuery.php index dd5fb23f3c..2d5057ccdc 100644 --- a/src/applications/pholio/query/PholioImageQuery.php +++ b/src/applications/pholio/query/PholioImageQuery.php @@ -61,7 +61,7 @@ final class PholioImageQuery return $images; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/pholio/query/PholioMockQuery.php b/src/applications/pholio/query/PholioMockQuery.php index d80bf57a28..2f6edd313f 100644 --- a/src/applications/pholio/query/PholioMockQuery.php +++ b/src/applications/pholio/query/PholioMockQuery.php @@ -82,7 +82,7 @@ final class PholioMockQuery return $mocks; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); $where[] = $this->buildPagingClause($conn_r); diff --git a/src/applications/phortune/query/PhortuneAccountQuery.php b/src/applications/phortune/query/PhortuneAccountQuery.php index 676badcb0c..a567aa2d38 100644 --- a/src/applications/phortune/query/PhortuneAccountQuery.php +++ b/src/applications/phortune/query/PhortuneAccountQuery.php @@ -73,7 +73,7 @@ final class PhortuneAccountQuery return $accounts; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); $where[] = $this->buildPagingClause($conn); diff --git a/src/applications/phortune/query/PhortuneCartQuery.php b/src/applications/phortune/query/PhortuneCartQuery.php index 4897ad7f22..5009d3a685 100644 --- a/src/applications/phortune/query/PhortuneCartQuery.php +++ b/src/applications/phortune/query/PhortuneCartQuery.php @@ -152,7 +152,7 @@ final class PhortuneCartQuery return $carts; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); $where[] = $this->buildPagingClause($conn); diff --git a/src/applications/phortune/query/PhortuneChargeQuery.php b/src/applications/phortune/query/PhortuneChargeQuery.php index aba655b4e4..6b11cbe95e 100644 --- a/src/applications/phortune/query/PhortuneChargeQuery.php +++ b/src/applications/phortune/query/PhortuneChargeQuery.php @@ -94,7 +94,7 @@ final class PhortuneChargeQuery return $charges; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); $where[] = $this->buildPagingClause($conn); diff --git a/src/applications/phortune/query/PhortuneMerchantQuery.php b/src/applications/phortune/query/PhortuneMerchantQuery.php index 1632797421..41a6f1004d 100644 --- a/src/applications/phortune/query/PhortuneMerchantQuery.php +++ b/src/applications/phortune/query/PhortuneMerchantQuery.php @@ -53,7 +53,7 @@ final class PhortuneMerchantQuery return $merchants; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php index c6b1fd878a..07d49a5909 100644 --- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php +++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php @@ -106,7 +106,7 @@ final class PhortunePaymentMethodQuery return $methods; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/phortune/query/PhortunePaymentProviderConfigQuery.php b/src/applications/phortune/query/PhortunePaymentProviderConfigQuery.php index 748ff7cb64..d80b0e90d0 100644 --- a/src/applications/phortune/query/PhortunePaymentProviderConfigQuery.php +++ b/src/applications/phortune/query/PhortunePaymentProviderConfigQuery.php @@ -59,7 +59,7 @@ final class PhortunePaymentProviderConfigQuery return $provider_configs; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/phortune/query/PhortuneProductQuery.php b/src/applications/phortune/query/PhortuneProductQuery.php index ae824ab914..99ba535585 100644 --- a/src/applications/phortune/query/PhortuneProductQuery.php +++ b/src/applications/phortune/query/PhortuneProductQuery.php @@ -77,7 +77,7 @@ final class PhortuneProductQuery return $page; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/phortune/query/PhortunePurchaseQuery.php b/src/applications/phortune/query/PhortunePurchaseQuery.php index 70aff445a0..6e9e599240 100644 --- a/src/applications/phortune/query/PhortunePurchaseQuery.php +++ b/src/applications/phortune/query/PhortunePurchaseQuery.php @@ -74,7 +74,7 @@ final class PhortunePurchaseQuery return $purchases; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); $where[] = $this->buildPagingClause($conn); diff --git a/src/applications/phortune/query/PhortuneSubscriptionQuery.php b/src/applications/phortune/query/PhortuneSubscriptionQuery.php index ba6d7acc73..e8b39c0fee 100644 --- a/src/applications/phortune/query/PhortuneSubscriptionQuery.php +++ b/src/applications/phortune/query/PhortuneSubscriptionQuery.php @@ -142,7 +142,7 @@ final class PhortuneSubscriptionQuery return $subscriptions; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); $where[] = $this->buildPagingClause($conn); diff --git a/src/applications/phragment/query/PhragmentFragmentQuery.php b/src/applications/phragment/query/PhragmentFragmentQuery.php index 173acfb1ce..d6dc67609d 100644 --- a/src/applications/phragment/query/PhragmentFragmentQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentQuery.php @@ -55,7 +55,7 @@ final class PhragmentFragmentQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php index 4acbd0f636..a874a8be1a 100644 --- a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php @@ -49,7 +49,7 @@ final class PhragmentFragmentVersionQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php index 8f81beeabe..032fb0c49c 100644 --- a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php @@ -55,7 +55,7 @@ final class PhragmentSnapshotChildQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phragment/query/PhragmentSnapshotQuery.php b/src/applications/phragment/query/PhragmentSnapshotQuery.php index 81c73441d2..d6f9d3422f 100644 --- a/src/applications/phragment/query/PhragmentSnapshotQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotQuery.php @@ -43,7 +43,7 @@ final class PhragmentSnapshotQuery return $table->loadAllFromArray($data); } - protected function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/phrequent/query/PhrequentUserTimeQuery.php b/src/applications/phrequent/query/PhrequentUserTimeQuery.php index b6e0c85f48..61fa978165 100644 --- a/src/applications/phrequent/query/PhrequentUserTimeQuery.php +++ b/src/applications/phrequent/query/PhrequentUserTimeQuery.php @@ -73,7 +73,7 @@ final class PhrequentUserTimeQuery return $this; } - private function buildWhereClause(AphrontDatabaseConnection $conn) { + protected function buildWhereClause(AphrontDatabaseConnection $conn) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php index 1b5c66a10c..0fe61bc9e1 100644 --- a/src/applications/ponder/query/PonderAnswerQuery.php +++ b/src/applications/ponder/query/PonderAnswerQuery.php @@ -36,7 +36,7 @@ final class PonderAnswerQuery return $this; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php index 9cb8c81d40..51081b3203 100644 --- a/src/applications/ponder/query/PonderQuestionQuery.php +++ b/src/applications/ponder/query/PonderQuestionQuery.php @@ -51,7 +51,7 @@ final class PonderQuestionQuery return $this; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php index 87bd87ffd3..3348b4054d 100644 --- a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php +++ b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php @@ -262,7 +262,7 @@ final class PhabricatorProjectColumnPositionQuery return $page; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php index d369161fe3..c486968070 100644 --- a/src/applications/project/query/PhabricatorProjectColumnQuery.php +++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php @@ -69,7 +69,7 @@ final class PhabricatorProjectColumnQuery return $page; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php index 4b6ad566a7..f743be7295 100644 --- a/src/applications/project/query/PhabricatorProjectQuery.php +++ b/src/applications/project/query/PhabricatorProjectQuery.php @@ -240,7 +240,7 @@ final class PhabricatorProjectQuery return $projects; } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->status != self::STATUS_ANY) { diff --git a/src/applications/releeph/query/ReleephBranchQuery.php b/src/applications/releeph/query/ReleephBranchQuery.php index 43a600fa2d..201c2653d0 100644 --- a/src/applications/releeph/query/ReleephBranchQuery.php +++ b/src/applications/releeph/query/ReleephBranchQuery.php @@ -103,7 +103,7 @@ final class ReleephBranchQuery return $branches; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php index 2562004a06..6fe2b90db3 100644 --- a/src/applications/releeph/query/ReleephProductQuery.php +++ b/src/applications/releeph/query/ReleephProductQuery.php @@ -111,7 +111,7 @@ final class ReleephProductQuery return $products; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->active !== null) { diff --git a/src/applications/releeph/query/ReleephRequestQuery.php b/src/applications/releeph/query/ReleephRequestQuery.php index 84d35d288a..1a5965ad43 100644 --- a/src/applications/releeph/query/ReleephRequestQuery.php +++ b/src/applications/releeph/query/ReleephRequestQuery.php @@ -147,7 +147,7 @@ final class ReleephRequestQuery return $requests; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php index 5cbc730075..901f58cbdf 100644 --- a/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php @@ -56,7 +56,7 @@ final class PhabricatorRepositoryArcanistProjectQuery return $projects; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php index f6e7d22950..84c5ef74ce 100644 --- a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php @@ -63,7 +63,7 @@ final class PhabricatorRepositoryMirrorQuery return $mirrors; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php index 14b4e4d596..a3bed7abd3 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php @@ -88,7 +88,7 @@ final class PhabricatorRepositoryPushEventQuery return $events; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php index 7812f77abd..94a0b6922e 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php @@ -82,7 +82,7 @@ final class PhabricatorRepositoryPushLogQuery return $logs; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php index 1b4e90fb22..d9ea26433f 100644 --- a/src/applications/repository/query/PhabricatorRepositoryQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php @@ -418,7 +418,7 @@ final class PhabricatorRepositoryQuery return implode(' ', $joins); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php index b75a8aa31e..c4c48c713c 100644 --- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php @@ -59,7 +59,7 @@ final class PhabricatorRepositoryRefCursorQuery return $refs; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->repositoryPHIDs !== null) { diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php index 413811771d..ce54ae9a84 100644 --- a/src/applications/search/query/PhabricatorNamedQueryQuery.php +++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php @@ -43,7 +43,7 @@ final class PhabricatorNamedQueryQuery return $table->loadAllFromArray($data); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/search/query/PhabricatorSavedQueryQuery.php b/src/applications/search/query/PhabricatorSavedQueryQuery.php index 168342fdf2..623b001662 100644 --- a/src/applications/search/query/PhabricatorSavedQueryQuery.php +++ b/src/applications/search/query/PhabricatorSavedQueryQuery.php @@ -37,7 +37,7 @@ final class PhabricatorSavedQueryQuery return $table->loadAllFromArray($data); } - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php index d17672b5e3..b7449d06a9 100644 --- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php +++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php @@ -125,7 +125,7 @@ final class PhabricatorSlowvoteQuery return $polls; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids) { diff --git a/src/applications/tokens/query/PhabricatorTokenCountQuery.php b/src/applications/tokens/query/PhabricatorTokenCountQuery.php index cc333109a2..d942f22ce4 100644 --- a/src/applications/tokens/query/PhabricatorTokenCountQuery.php +++ b/src/applications/tokens/query/PhabricatorTokenCountQuery.php @@ -24,7 +24,7 @@ final class PhabricatorTokenCountQuery return ipull($rows, 'tokenCount', 'objectPHID'); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->objectPHIDs) { diff --git a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php index 896b4532c9..c16eaa2168 100644 --- a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php +++ b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php @@ -37,7 +37,7 @@ final class PhabricatorTokenGivenQuery return $table->loadAllFromArray($rows); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->authorPHIDs) { diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php index cd61c0fd30..f79de81ba3 100644 --- a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php +++ b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php @@ -57,7 +57,7 @@ abstract class PhabricatorApplicationTransactionCommentQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { return $this->formatWhereClause($this->buildWhereClauseComponents($conn_r)); } diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php index 5da8411277..ac6f713eeb 100644 --- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php +++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php @@ -142,7 +142,7 @@ abstract class PhabricatorApplicationTransactionQuery return $xactions; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->phids) { diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerArchiveTaskQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerArchiveTaskQuery.php index eb46857a4f..7dfafa16cc 100644 --- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerArchiveTaskQuery.php +++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerArchiveTaskQuery.php @@ -49,7 +49,7 @@ final class PhabricatorWorkerArchiveTaskQuery return $task_table->loadAllFromArray($rows); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php index 456a042776..07c3460494 100644 --- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php +++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php @@ -122,7 +122,7 @@ final class PhabricatorWorkerLeaseQuery extends PhabricatorQuery { $conn_w, 'SELECT id, leaseOwner FROM %T %Q %Q %Q', $task_table->getTableName(), - $this->buildWhereClause($conn_w, $phase), + $this->buildCustomWhereClause($conn_w, $phase), $this->buildOrderClause($conn_w, $phase), $this->buildLimitClause($conn_w, $limit - $leased)); @@ -206,7 +206,10 @@ final class PhabricatorWorkerLeaseQuery extends PhabricatorQuery { return $tasks; } - private function buildWhereClause(AphrontDatabaseConnection $conn_w, $phase) { + protected function buildCustomWhereClause( + AphrontDatabaseConnection $conn_w, + $phase) { + $where = array(); switch ($phase) { diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php index 679a5236a7..eb9441aa8f 100644 --- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php +++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php @@ -160,7 +160,7 @@ final class PhabricatorWorkerTriggerQuery return implode(' ', $joins); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->ids !== null) { diff --git a/src/infrastructure/edges/query/PhabricatorEdgeQuery.php b/src/infrastructure/edges/query/PhabricatorEdgeQuery.php index 17f1660b33..3ea7eb998e 100644 --- a/src/infrastructure/edges/query/PhabricatorEdgeQuery.php +++ b/src/infrastructure/edges/query/PhabricatorEdgeQuery.php @@ -289,7 +289,7 @@ final class PhabricatorEdgeQuery extends PhabricatorQuery { /** * @task internal */ - private function buildWhereClause($conn_r) { + protected function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); if ($this->sourcePHIDs) { diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php index 7e7bfc2d35..d532d1cf0f 100644 --- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php +++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php @@ -4,7 +4,9 @@ * A query class which uses cursor-based paging. This paging is much more * performant than offset-based paging in the presence of policy filtering. * + * @task clauses Building Query Clauses * @task appsearch Integration with ApplicationSearch + * @task customfield Integration with CustomField * @task paging Paging * @task order Result Ordering */ @@ -175,9 +177,23 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery } +/* -( Building Query Clauses )--------------------------------------------- */ + + + /** + * @task clauses + */ + protected function buildWhereClause(AphrontDatabaseConnection $conn) { + throw new PhutilMethodNotImplementedException(); + } + + /* -( Paging )------------------------------------------------------------- */ + /** + * @task paging + */ protected function buildPagingClause(AphrontDatabaseConnection $conn) { $orderable = $this->getOrderableColumns(); $vector = $this->getOrderVector(); @@ -228,13 +244,20 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery )); } + + /** + * @task paging + */ protected function getPagingValueMap($cursor, array $keys) { - // TODO: This is a hack to make this work with existing classes for now. return array( 'id' => $cursor, ); } + + /** + * @task paging + */ protected function loadCursorObject($cursor) { $query = newv(get_class($this), array()) ->setViewer($this->getPagingViewer()) @@ -253,6 +276,10 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery return $object; } + + /** + * @task paging + */ protected function willExecuteCursorQuery( PhabricatorCursorPagedPolicyAwareQuery $query) { return; @@ -295,6 +322,7 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery * @param list Column description dictionaries. * @param map Additional constuction options. * @return string Query clause. + * @task paging */ final protected function buildPagingClauseFromMultipleColumns( AphrontDatabaseConnection $conn, @@ -1082,6 +1110,13 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery return implode(' ', $joins); } + +/* -( Integration with CustomField )--------------------------------------- */ + + + /** + * @task customfield + */ protected function getPagingValueMapForCustomFields( PhabricatorCustomFieldInterface $object) { @@ -1100,9 +1135,14 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery return $map; } + + /** + * @task customfield + */ protected function isCustomFieldOrderKey($key) { $prefix = 'custom:'; return !strncmp($key, $prefix, strlen($prefix)); } + }