Page MenuHomePhabricator

D19910.id47530.diff
No OneTemporary

D19910.id47530.diff

diff --git a/src/applications/pholio/query/PholioImageQuery.php b/src/applications/pholio/query/PholioImageQuery.php
--- a/src/applications/pholio/query/PholioImageQuery.php
+++ b/src/applications/pholio/query/PholioImageQuery.php
@@ -44,43 +44,32 @@
return $this->mockCache;
}
- protected function loadPage() {
- $table = new PholioImage();
- $conn_r = $table->establishConnection('r');
-
- $data = queryfx_all(
- $conn_r,
- 'SELECT * FROM %T %Q %Q %Q',
- $table->getTableName(),
- $this->buildWhereClause($conn_r),
- $this->buildOrderClause($conn_r),
- $this->buildLimitClause($conn_r));
-
- $images = $table->loadAllFromArray($data);
-
- return $images;
+ public function newResultObject() {
+ return new PholioImage();
}
- protected function buildWhereClause(AphrontDatabaseConnection $conn) {
- $where = array();
+ protected function loadPage() {
+ return $this->loadStandardPage($this->newResultObject());
+ }
- $where[] = $this->buildPagingClause($conn);
+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+ $where = parent::buildWhereClauseParts($conn);
- if ($this->ids) {
+ if ($this->ids !== null) {
$where[] = qsprintf(
$conn,
'id IN (%Ld)',
$this->ids);
}
- if ($this->phids) {
+ if ($this->phids !== null) {
$where[] = qsprintf(
$conn,
'phid IN (%Ls)',
$this->phids);
}
- if ($this->mockIDs) {
+ if ($this->mockIDs !== null) {
$where[] = qsprintf(
$conn,
'mockID IN (%Ld)',
@@ -94,7 +83,7 @@
$this->obsolete);
}
- return $this->formatWhereClause($conn, $where);
+ return $where;
}
protected function willFilterPage(array $images) {

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 1:13 PM (5 d, 16 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705244
Default Alt Text
D19910.id47530.diff (1 KB)

Event Timeline