Page MenuHomePhabricator
Files F15369990

D12102.diff
No OneTemporary
Actions

D12102.diff
View Options

diff --git a/resources/sql/autopatches/20150317.conpherence.isroom.1.sql b/resources/sql/autopatches/20150317.conpherence.isroom.1.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20150317.conpherence.isroom.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_thread
+ ADD isRoom BOOL NOT NULL DEFAULT 0 AFTER title;
diff --git a/resources/sql/autopatches/20150317.conpherence.isroom.2.sql b/resources/sql/autopatches/20150317.conpherence.isroom.2.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20150317.conpherence.isroom.2.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_thread
+ ADD KEY `key_room` (isRoom, dateModified);
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
@@ -7,6 +7,7 @@
private $phids;
private $ids;
+ private $isRoom;
private $needWidgetData;
private $needTransactions;
private $needParticipantCache;
@@ -45,6 +46,11 @@
return $this;
}
+ public function withIsRoom($bool) {
+ $this->isRoom = $bool;
+ return $this;
+ }
+
public function setAfterTransactionID($id) {
$this->afterTransactionID = $id;
return $this;
@@ -105,20 +111,27 @@
$where[] = $this->buildPagingClause($conn_r);
- if ($this->ids) {
+ if ($this->ids !== null) {
$where[] = qsprintf(
$conn_r,
'id IN (%Ld)',
$this->ids);
}
- if ($this->phids) {
+ if ($this->phids !== null) {
$where[] = qsprintf(
$conn_r,
'phid IN (%Ls)',
$this->phids);
}
+ if ($this->isRoom !== null) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'isRoom = %d',
+ (int)$this->isRoom);
+ }
+
return $this->formatWhereClause($where);
}
diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -4,6 +4,7 @@
implements PhabricatorPolicyInterface {
protected $title;
+ protected $isRoom = 0;
protected $messageCount;
protected $recentParticipantPHIDs = array();
protected $mailKey;
@@ -29,10 +30,13 @@
),
self::CONFIG_COLUMN_SCHEMA => array(
'title' => 'text255?',
+ 'isRoom' => 'bool',
'messageCount' => 'uint64',
'mailKey' => 'text20',
),
self::CONFIG_KEY_SCHEMA => array(
+ 'key_room' => array(
+ 'columns' => array('isRoom', 'dateModified'),),
'key_phid' => null,
'phid' => array(
'columns' => array('phid'),

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 8:59 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7613688
Default Alt Text
D12102.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility