From 3775e144786aa1b87cfc858bde4a1f9e3a162a60 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Thu, 16 Aug 2012 18:32:57 -0700
Subject: [PATCH] Use scoped names in revision query

Test Plan:
  id(new DifferentialRevisionQuery())
    ->withIDs($revision_ids)
    ->withDraftRepliesByAuthors($user_phids)
    ->execute();

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3322
---
 .../query/DifferentialRevisionQuery.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 4b18259c6e..d2bcd6563d 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -610,7 +610,7 @@ final class DifferentialRevisionQuery {
       foreach ($repo_info as $repository_id => $paths) {
         $path_clauses[] = qsprintf(
           $conn_r,
-          '(repositoryID = %d AND pathID IN (%Ld))',
+          '(p.repositoryID = %d AND p.pathID IN (%Ld))',
           $repository_id,
           ipull($paths, 'pathID'));
       }
@@ -621,7 +621,7 @@ final class DifferentialRevisionQuery {
     if ($this->authors) {
       $where[] = qsprintf(
         $conn_r,
-        'authorPHID IN (%Ls)',
+        'r.authorPHID IN (%Ls)',
         $this->authors);
     }
 
@@ -634,7 +634,7 @@ final class DifferentialRevisionQuery {
     if ($this->revIDs) {
       $where[] = qsprintf(
         $conn_r,
-        'id IN (%Ld)',
+        'r.id IN (%Ld)',
         $this->revIDs);
     }
 
@@ -655,7 +655,7 @@ final class DifferentialRevisionQuery {
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
-        'phid IN (%Ls)',
+        'r.phid IN (%Ls)',
         $this->phids);
     }
 
@@ -686,7 +686,7 @@ final class DifferentialRevisionQuery {
       case self::STATUS_OPEN:
         $where[] = qsprintf(
           $conn_r,
-          'status IN (%Ld)',
+          'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::NEEDS_REVIEW,
             ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
@@ -696,7 +696,7 @@ final class DifferentialRevisionQuery {
       case self::STATUS_NEEDS_REVIEW:
         $where[] = qsprintf(
           $conn_r,
-          'status IN (%Ld)',
+          'r.status IN (%Ld)',
           array(
                ArcanistDifferentialRevisionStatus::NEEDS_REVIEW,
           ));
@@ -704,7 +704,7 @@ final class DifferentialRevisionQuery {
       case self::STATUS_ACCEPTED:
         $where[] = qsprintf(
           $conn_r,
-          'status IN (%Ld)',
+          'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::ACCEPTED,
           ));
@@ -718,7 +718,7 @@ final class DifferentialRevisionQuery {
       case self::STATUS_CLOSED:
         $where[] = qsprintf(
           $conn_r,
-          'status IN (%Ld)',
+          'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::CLOSED,
           ));
@@ -726,7 +726,7 @@ final class DifferentialRevisionQuery {
       case self::STATUS_ABANDONED:
         $where[] = qsprintf(
           $conn_r,
-          'status IN (%Ld)',
+          'r.status IN (%Ld)',
           array(
             ArcanistDifferentialRevisionStatus::ABANDONED,
           ));