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

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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);

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);

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) {

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) {

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) {

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) {

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) {

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) {

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);

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);

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) {

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) {

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) {

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) {

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) {

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) {

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.

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) {

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) {

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;

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) {

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)) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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);

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) {

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);

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);

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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);

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) {

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) {

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) {

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);

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);

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);

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);

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) {

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) {

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) {

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);

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);

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) {

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) {

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) {

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) {

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) {

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);

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);

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);

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);

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);

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) {

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) {

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) {

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) {

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);

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);

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {