Page MenuHomePhabricator
Files F15404641

D18722.diff
No OneTemporary
Actions

D18722.diff
View Options

diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -177,7 +177,63 @@
}
protected function loadPage() {
- return $this->loadStandardPage($this->newResultObject());
+ $table = $this->newResultObject();
+ $conn = $table->establishConnection('r');
+
+ $subqueries = array();
+ if ($this->responsiblePHIDs) {
+ $base_authors = $this->authorPHIDs;
+ $base_auditors = $this->auditorPHIDs;
+
+ $responsible_phids = $this->responsiblePHIDs;
+ if ($base_authors) {
+ $all_authors = array_merge($base_authors, $responsible_phids);
+ } else {
+ $all_authors = $responsible_phids;
+ }
+
+ if ($base_auditors) {
+ $all_auditors = array_merge($base_auditors, $responsible_phids);
+ } else {
+ $all_auditors = $responsible_phids;
+ }
+
+ $this->authorPHIDs = $all_authors;
+ $this->auditorPHIDs = $base_auditors;
+ $subqueries[] = $this->buildStandardPageQuery(
+ $conn,
+ $table->getTableName());
+
+ $this->authorPHIDs = $base_authors;
+ $this->auditorPHIDs = $all_auditors;
+ $subqueries[] = $this->buildStandardPageQuery(
+ $conn,
+ $table->getTableName());
+ } else {
+ $subqueries[] = $this->buildStandardPageQuery(
+ $conn,
+ $table->getTableName());
+ }
+
+ if (count($subqueries) > 1) {
+ foreach ($subqueries as $key => $subquery) {
+ $subqueries[$key] = '('.$subquery.')';
+ }
+
+ $query = qsprintf(
+ $conn,
+ '%Q %Q %Q',
+ implode(' UNION DISTINCT ', $subqueries),
+ $this->buildOrderClause($conn, true),
+ $this->buildLimitClause($conn));
+ } else {
+ $query = head($subqueries);
+ }
+
+ $rows = queryfx_all($conn, '%Q', $query);
+ $rows = $this->didLoadRawRows($rows);
+
+ return $table->loadAllFromArray($rows);
}
protected function willFilterPage(array $commits) {
@@ -487,18 +543,10 @@
$this->auditorPHIDs);
}
- if ($this->responsiblePHIDs !== null) {
- $where[] = qsprintf(
- $conn,
- '(audit.auditorPHID IN (%Ls) OR commit.authorPHID IN (%Ls))',
- $this->responsiblePHIDs,
- $this->responsiblePHIDs);
- }
-
if ($this->statuses !== null) {
$where[] = qsprintf(
$conn,
- 'commit.auditStatus IN (%Ls)',
+ 'commit.auditStatus IN (%Ld)',
$this->statuses);
}
@@ -541,10 +589,6 @@
return ($this->auditIDs || $this->auditorPHIDs);
}
- private function shouldJoinAudit() {
- return (bool)$this->responsiblePHIDs;
- }
-
private function shouldJoinOwners() {
return (bool)$this->packagePHIDs;
}
@@ -560,13 +604,6 @@
$audit_request->getTableName());
}
- if ($this->shouldJoinAudit()) {
- $join[] = qsprintf(
- $conn,
- 'LEFT JOIN %T audit ON commit.phid = audit.commitPHID',
- $audit_request->getTableName());
- }
-
if ($this->shouldJoinOwners()) {
$join[] = qsprintf(
$conn,
@@ -584,10 +621,6 @@
return true;
}
- if ($this->shouldJoinAudit()) {
- return true;
- }
-
if ($this->shouldJoinOwners()) {
return true;
}
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -111,7 +111,19 @@
AphrontDatabaseConnection $conn,
$table_name) {
- $rows = queryfx_all(
+ $query = $this->buildStandardPageQuery($conn, $table_name);
+
+ $rows = queryfx_all($conn, '%Q', $query);
+ $rows = $this->didLoadRawRows($rows);
+
+ return $rows;
+ }
+
+ protected function buildStandardPageQuery(
+ AphrontDatabaseConnection $conn,
+ $table_name) {
+
+ return qsprintf(
$conn,
'%Q FROM %T %Q %Q %Q %Q %Q %Q %Q',
$this->buildSelectClause($conn),
@@ -123,10 +135,6 @@
$this->buildHavingClause($conn),
$this->buildOrderClause($conn),
$this->buildLimitClause($conn));
-
- $rows = $this->didLoadRawRows($rows);
-
- return $rows;
}
protected function didLoadRawRows(array $rows) {
@@ -1032,7 +1040,10 @@
/**
* @task order
*/
- final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
+ final protected function buildOrderClause(
+ AphrontDatabaseConnection $conn,
+ $for_union = false) {
+
$orderable = $this->getOrderableColumns();
$vector = $this->getOrderVector();
@@ -1045,7 +1056,7 @@
$parts[] = $part;
}
- return $this->formatOrderClause($conn, $parts);
+ return $this->formatOrderClause($conn, $parts, $for_union);
}
@@ -1054,7 +1065,8 @@
*/
protected function formatOrderClause(
AphrontDatabaseConnection $conn,
- array $parts) {
+ array $parts,
+ $for_union = false) {
$is_query_reversed = false;
if ($this->getBeforeID()) {
@@ -1075,6 +1087,13 @@
}
$table = idx($part, 'table');
+
+ // When we're building an ORDER BY clause for a sequence of UNION
+ // statements, we can't refer to tables from the subqueries.
+ if ($for_union) {
+ $table = null;
+ }
+
$column = $part['column'];
if ($table !== null) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 8:31 AM (3 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387861
Default Alt Text
D18722.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility