Page MenuHomePhabricator

D16080.diff
No OneTemporary

D16080.diff

diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -100,7 +100,7 @@
$data = queryfx_all(
$conn_r,
- 'SELECT conpherence_thread.* FROM %T conpherence_thread %Q %Q %Q %Q %Q',
+ 'SELECT thread.* FROM %T thread %Q %Q %Q %Q %Q',
$table->getTableName(),
$this->buildJoinClause($conn_r),
$this->buildWhereClause($conn_r),
@@ -144,7 +144,7 @@
protected function buildGroupClause(AphrontDatabaseConnection $conn_r) {
if ($this->participantPHIDs !== null || strlen($this->fulltext)) {
- return 'GROUP BY conpherence_thread.id';
+ return 'GROUP BY thread.id';
} else {
return $this->buildApplicationSearchGroupClause($conn_r);
}
@@ -156,14 +156,14 @@
if ($this->participantPHIDs !== null) {
$joins[] = qsprintf(
$conn_r,
- 'JOIN %T p ON p.conpherencePHID = conpherence_thread.phid',
+ 'JOIN %T p ON p.conpherencePHID = thread.phid',
id(new ConpherenceParticipant())->getTableName());
}
if (strlen($this->fulltext)) {
$joins[] = qsprintf(
$conn_r,
- 'JOIN %T idx ON idx.threadPHID = conpherence_thread.phid',
+ 'JOIN %T idx ON idx.threadPHID = thread.phid',
id(new ConpherenceIndex())->getTableName());
}
@@ -179,14 +179,14 @@
if ($this->ids !== null) {
$where[] = qsprintf(
$conn_r,
- 'conpherence_thread.id IN (%Ld)',
+ 'thread.id IN (%Ld)',
$this->ids);
}
if ($this->phids !== null) {
$where[] = qsprintf(
$conn_r,
- 'conpherence_thread.phid IN (%Ls)',
+ 'thread.phid IN (%Ls)',
$this->phids);
}
@@ -438,4 +438,8 @@
return 'PhabricatorConpherenceApplication';
}
+ protected function getPrimaryTableAlias() {
+ return 'thread';
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 2, 12:33 AM (20 h, 3 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6710647
Default Alt Text
D16080.diff (2 KB)

Event Timeline