From 1c399476798f716231eae74ff6558e6373fb6868 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 May 2015 10:16:37 -0700
Subject: [PATCH] Fix "not(project)" in Diffusion

Summary: Fixes T8105. We weren't including the parent WHERE clause fragment correctly.

Test Plan: Used `not(project)` in a query.

Reviewers: btrahan, avivey

Reviewed By: avivey

Subscribers: avivey, epriestley

Maniphest Tasks: T8105

Differential Revision: https://secure.phabricator.com/D12746
---
 src/__phutil_library_map__.php                         |  2 --
 .../repository/query/PhabricatorRepositoryQuery.php    | 10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b73b05e501..8e19b001f3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -102,7 +102,6 @@ phutil_register_library_map(array(
     'AphrontApplicationConfiguration' => 'aphront/configuration/AphrontApplicationConfiguration.php',
     'AphrontBarView' => 'view/widget/bars/AphrontBarView.php',
     'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
-    'AphrontCalendarDayEventView' => 'applications/calendar/view/AphrontCalendarDayEventView.php',
     'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
     'AphrontController' => 'aphront/AphrontController.php',
     'AphrontCursorPagerView' => 'view/control/AphrontCursorPagerView.php',
@@ -3352,7 +3351,6 @@ phutil_register_library_map(array(
     'AphrontAjaxResponse' => 'AphrontResponse',
     'AphrontBarView' => 'AphrontView',
     'AphrontCSRFException' => 'AphrontException',
-    'AphrontCalendarDayEventView' => 'AphrontView',
     'AphrontCalendarEventView' => 'AphrontView',
     'AphrontController' => 'Phobject',
     'AphrontCursorPagerView' => 'AphrontView',
diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
index b414dc39e9..eea20780bc 100644
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -429,8 +429,8 @@ final class PhabricatorRepositoryQuery
     return false;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn_r) {
+    $where = parent::buildWhereClauseParts($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
@@ -518,13 +518,9 @@ final class PhabricatorRepositoryQuery
         $callsign);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
-
-
   public function getQueryApplicationClass() {
     return 'PhabricatorDiffusionApplication';
   }