Fix some "%Q" behavior in PhortuneMerchantQuery

Summary: Ref T13217. This older query does some manual joins; update it for more modern joins.

Test Plan: Ran `instances/` unit tests and got a clean result, browsed Phortune merchants.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13217

Differential Revision: https://secure.phabricator.com/D19820

src/applications/phortune/query/PhortuneMerchantQuery.php

@@ -28,20 +28,12 @@ final class PhortuneMerchantQuery
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhortuneMerchant();
+  }
+
   protected function loadPage() {
-    $table = new PhortuneMerchant();
+    return $this->loadStandardPage($this->newResultObject());
-    $conn = $table->establishConnection('r');
-
-    $rows = queryfx_all(
-      $conn,
-      'SELECT m.* FROM %T m %Q %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildJoinClause($conn),
-      $this->buildWhereClause($conn),
-      $this->buildOrderClause($conn),
-      $this->buildLimitClause($conn));
-
-    return $table->loadAllFromArray($rows);
   }
 
   protected function willFilterPage(array $merchants) {
@@ -88,8 +80,8 @@ final class PhortuneMerchantQuery
     return $merchants;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn) {
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
-    $where = array();
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
@@ -112,13 +104,11 @@ final class PhortuneMerchantQuery
         $this->memberPHIDs);
     }
 
-    $where[] = $this->buildPagingClause($conn);
+    return $where;
-
-    return $this->formatWhereClause($conn, $where);
   }
 
-  protected function buildJoinClause(AphrontDatabaseConnection $conn) {
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
-    $joins = array();
+    $joins = parent::buildJoinClauseParts($conn);
 
     if ($this->memberPHIDs !== null) {
       $joins[] = qsprintf(
@@ -128,11 +118,15 @@ final class PhortuneMerchantQuery
         PhortuneMerchantHasMemberEdgeType::EDGECONST);
     }
 
-    return implode(' ', $joins);
+    return $joins;
   }
 
   public function getQueryApplicationClass() {
     return 'PhabricatorPhortuneApplication';
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'm';
+  }
+
 }