revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 00:32:42 +01:00
Code Issues Releases Wiki Activity

Remove "mailKey" from "PhabricatorRepositoryCommit"

Browse source 
Summary: Ref T13197. Ref T13065. This continues the gradual purge of dedicated "mailKey" columns in favor of shared infrastructure.

Test Plan:
  - Ran migration.
  - Visually inspected database.
  - Grepped for `mailKey`.
  - Added some comments, saw the daemons generate corresponding mail.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197, T13065

Differential Revision: https://secure.phabricator.com/D19670
This commit is contained in:
epriestley 2018-09-14 06:24:32 -07:00
parent 2ddc770fd8
commit 40d5d5c984
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
resources/sql/autopatches/20180914.audit.01.mailkey.php Normal file
View file

@ -0,0 +1,26 @@
<?php
$commit_table = new PhabricatorRepositoryCommit();
$commit_conn = $commit_table->establishConnection('w');
$commit_name = $commit_table->getTableName();
$properties_table = new PhabricatorMetaMTAMailProperties();
$conn = $properties_table->establishConnection('w');
$iterator = new LiskRawMigrationIterator($commit_conn, $commit_name);
foreach ($iterator as $commit) {
queryfx(
$conn,
'INSERT IGNORE INTO %T
(objectPHID, mailProperties, dateCreated, dateModified)
VALUES
(%s, %s, %d, %d)',
$properties_table->getTableName(),
$commit['phid'],
phutil_json_encode(
array(
'mailKey' => $commit['mailKey'],
)),
PhabricatorTime::getNow(),
PhabricatorTime::getNow());
}

2
resources/sql/autopatches/20180914.audit.02.rmkey.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE {$NAMESPACE}_repository.repository_commit
DROP mailKey;

10
src/applications/repository/storage/PhabricatorRepositoryCommit.php
View file

@ -25,7 +25,6 @@ final class PhabricatorRepositoryCommit
protected $committerIdentityPHID; protected $committerIdentityPHID;
protected $commitIdentifier; protected $commitIdentifier;
protected $epoch; protected $epoch;
protected $mailKey;
protected $authorPHID; protected $authorPHID;
protected $auditStatus = DiffusionCommitAuditStatus::NONE; protected $auditStatus = DiffusionCommitAuditStatus::NONE;
protected $summary = ''; protected $summary = '';
@ -116,7 +115,6 @@ final class PhabricatorRepositoryCommit
self::CONFIG_TIMESTAMPS => false, self::CONFIG_TIMESTAMPS => false,
self::CONFIG_COLUMN_SCHEMA => array( self::CONFIG_COLUMN_SCHEMA => array(
'commitIdentifier' => 'text40', 'commitIdentifier' => 'text40',
'mailKey' => 'bytes20',
'authorPHID' => 'phid?', 'authorPHID' => 'phid?',
'authorIdentityPHID' => 'phid?', 'authorIdentityPHID' => 'phid?',
'committerIdentityPHID' => 'phid?', 'committerIdentityPHID' => 'phid?',
@ -321,13 +319,6 @@ final class PhabricatorRepositoryCommit
return mpull($audits, 'getAuditorPHID'); return mpull($audits, 'getAuditorPHID');
} }
public function save() {
if (!$this->mailKey) {
$this->mailKey = Filesystem::readRandomCharacters(20);
}
return parent::save();
}
public function delete() { public function delete() {
$data = $this->loadCommitData(); $data = $this->loadCommitData();
$audits = id(new PhabricatorRepositoryAuditRequest()) $audits = id(new PhabricatorRepositoryAuditRequest())
@ -605,7 +596,6 @@ final class PhabricatorRepositoryCommit
'phid' => $this->getPHID(), 'phid' => $this->getPHID(),
'commitIdentifier' => $this->getCommitIdentifier(), 'commitIdentifier' => $this->getCommitIdentifier(),
'epoch' => $this->getEpoch(), 'epoch' => $this->getEpoch(),
'mailKey' => $this->getMailKey(),
'authorPHID' => $this->getAuthorPHID(), 'authorPHID' => $this->getAuthorPHID(),
'auditStatus' => $this->getAuditStatus(), 'auditStatus' => $this->getAuditStatus(),
'summary' => $this->getSummary(), 'summary' => $this->getSummary(),