@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Add missing expected keys and uniqueness
Summary:
Ref T1191.
- Adds definitions for missing keys and keys with wrong uniqueness. Generally, I defined these before fixing the key query to actually pull all keys and support uniqueness.
- Moves "key uniqueness" to note severity; this is fixable (probably?) and there are no remaining issues.
- Moves "Missing Key" to note severity; missing keys are fixable and all remaining missing keys are really missing (either missing edge keys, or missing PHID keys):
{F210089}
- Moves "Surplus Key" to note seveirty; surplus keys are fixable all remaining surplus keys are really surplus (duplicate key in Harbormaster, key on unused column in Worker):
{F210090}
Test Plan:
- Vetted missing/surplus/unique messages.
- 146 issues remaining.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T1191
Differential Revision: https://secure.phabricator.com/D10590
+280
-6
+17
src/applications/audit/storage/PhabricatorAuditTransactionComment.php
+17
src/applications/audit/storage/PhabricatorAuditTransactionComment.php
···
24
24
25
25
public function getConfiguration() {
26
26
$config = parent::getConfiguration();
27
+
27
28
$config[self::CONFIG_COLUMN_SCHEMA] = array(
28
29
'commitPHID' => 'phid?',
29
30
'pathID' => 'id?',
···
35
36
'replyToCommentPHID' => 'phid?',
36
37
'legacyCommentID' => 'id?',
37
38
) + $config[self::CONFIG_COLUMN_SCHEMA];
39
+
40
+
$config[self::CONFIG_KEY_SCHEMA] = array(
41
+
'key_path' => array(
42
+
'columns' => array('pathID'),
43
+
),
44
+
'key_draft' => array(
45
+
'columns' => array('authorPHID', 'transactionPHID'),
46
+
),
47
+
'key_commit' => array(
48
+
'columns' => array('commitPHID'),
49
+
),
50
+
'key_legacy' => array(
51
+
'columns' => array('legacyCommentID'),
52
+
),
53
+
) + $config[self::CONFIG_KEY_SCHEMA];
54
+
38
55
return $config;
39
56
}
40
57
+5
src/applications/auth/storage/PhabricatorAuthFactorConfig.php
+5
src/applications/auth/storage/PhabricatorAuthFactorConfig.php
+9
src/applications/auth/storage/PhabricatorAuthProviderConfig.php
+9
src/applications/auth/storage/PhabricatorAuthProviderConfig.php
···
40
40
'shouldAllowUnlink' => 'bool',
41
41
'shouldTrustEmails' => 'bool',
42
42
),
43
+
self::CONFIG_KEY_SCHEMA => array(
44
+
'key_provider' => array(
45
+
'columns' => array('providerType', 'providerDomain'),
46
+
'unique' => true,
47
+
),
48
+
'key_class' => array(
49
+
'columns' => array('providerClass'),
50
+
),
51
+
),
43
52
) + parent::getConfiguration();
44
53
}
45
54
+4
src/applications/auth/storage/PhabricatorAuthTemporaryToken.php
+4
src/applications/auth/storage/PhabricatorAuthTemporaryToken.php
+8
src/applications/cache/storage/PhabricatorCacheSchemaSpec.php
+8
src/applications/cache/storage/PhabricatorCacheSchemaSpec.php
···
20
20
array(
21
21
'PRIMARY' => array(
22
22
'columns' => array('id'),
23
+
'unique' => true,
23
24
),
24
25
'key_cacheKeyHash' => array(
25
26
'columns' => array('cacheKeyHash'),
27
+
'unique' => true,
28
+
),
29
+
'key_cacheCreated' => array(
30
+
'columns' => array('cacheCreated'),
31
+
),
32
+
'key_ttl' => array(
33
+
'columns' => array('cacheExpires'),
26
34
),
27
35
));
28
36
+4
src/applications/cache/storage/PhabricatorMarkupCache.php
+4
src/applications/cache/storage/PhabricatorMarkupCache.php
+5
src/applications/calendar/storage/PhabricatorCalendarEvent.php
+5
src/applications/calendar/storage/PhabricatorCalendarEvent.php
+1
src/applications/calendar/storage/PhabricatorCalendarHoliday.php
+1
src/applications/calendar/storage/PhabricatorCalendarHoliday.php
+1
src/applications/chatlog/storage/PhabricatorChatLogChannel.php
+1
src/applications/chatlog/storage/PhabricatorChatLogChannel.php
+5
src/applications/chatlog/storage/PhabricatorChatLogEvent.php
+5
src/applications/chatlog/storage/PhabricatorChatLogEvent.php
+2
src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
+2
src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
+5
src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
+5
src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
+11
src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
+11
src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
···
20
20
'duration' => 'uint64',
21
21
'callerPHID' => 'phid?',
22
22
),
23
+
self::CONFIG_KEY_SCHEMA => array(
24
+
'key_date' => array(
25
+
'columns' => array('dateCreated'),
26
+
),
27
+
'key_method' => array(
28
+
'columns' => array('method'),
29
+
),
30
+
'key_callermethod' => array(
31
+
'columns' => array('callerPHID', 'method'),
32
+
),
33
+
),
23
34
) + parent::getConfiguration();
24
35
}
25
36
+8
-1
src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
+8
-1
src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php
···
89
89
foreach ($issues as $issue) {
90
90
$const = $issue[4];
91
91
92
+
$database_link = phutil_tag(
93
+
'a',
94
+
array(
95
+
'href' => $this->getApplicationURI('/database/'.$issue[0].'/'),
96
+
),
97
+
$issue[0]);
98
+
92
99
$rows[] = array(
93
100
$this->renderIcon(
94
101
PhabricatorConfigStorageSchema::getIssueStatus($const)),
95
-
$issue[0],
102
+
$database_link,
96
103
$issue[1],
97
104
$issue[2],
98
105
$issue[3],
+4
-4
src/applications/config/schema/PhabricatorConfigStorageSchema.php
+4
-4
src/applications/config/schema/PhabricatorConfigStorageSchema.php
···
169
169
public static function getIssueStatus($issue) {
170
170
switch ($issue) {
171
171
case self::ISSUE_MISSING:
172
-
case self::ISSUE_MISSINGKEY:
173
172
case self::ISSUE_SUBFAIL:
174
-
return self::STATUS_FAIL;
175
173
case self::ISSUE_SURPLUS:
176
-
case self::ISSUE_SURPLUSKEY:
174
+
return self::STATUS_FAIL;
177
175
case self::ISSUE_SUBWARN:
178
176
case self::ISSUE_COLUMNTYPE:
179
177
case self::ISSUE_KEYCOLUMNS:
180
-
case self::ISSUE_UNIQUE:
181
178
case self::ISSUE_NULLABLE:
182
179
return self::STATUS_WARN;
183
180
case self::ISSUE_SUBNOTE:
184
181
case self::ISSUE_CHARSET:
185
182
case self::ISSUE_COLLATION:
183
+
case self::ISSUE_MISSINGKEY:
184
+
case self::ISSUE_SURPLUSKEY:
185
+
case self::ISSUE_UNIQUE:
186
186
return self::STATUS_NOTE;
187
187
default:
188
188
throw new Exception(pht('Unknown schema issue "%s"!', $issue));
+1
src/applications/config/storage/PhabricatorConfigEntry.php
+1
src/applications/config/storage/PhabricatorConfigEntry.php
+7
src/applications/conpherence/storage/ConpherenceParticipant.php
+7
src/applications/conpherence/storage/ConpherenceParticipant.php
···
23
23
self::CONFIG_KEY_SCHEMA => array(
24
24
'conpherencePHID' => array(
25
25
'columns' => array('conpherencePHID', 'participantPHID'),
26
+
'unique' => true,
27
+
),
28
+
'unreadCount' => array(
29
+
'columns' => array('participantPHID', 'participationStatus'),
30
+
),
31
+
'participationIndex' => array(
32
+
'columns' => array('participantPHID', 'dateTouched', 'id'),
26
33
),
27
34
),
28
35
) + parent::getConfiguration();
+1
src/applications/conpherence/storage/ConpherenceThread.php
+1
src/applications/conpherence/storage/ConpherenceThread.php
+9
src/applications/conpherence/storage/ConpherenceTransactionComment.php
+9
src/applications/conpherence/storage/ConpherenceTransactionComment.php
···
11
11
12
12
public function getConfiguration() {
13
13
$config = parent::getConfiguration();
14
+
14
15
$config[self::CONFIG_COLUMN_SCHEMA] = array(
15
16
'conpherencePHID' => 'phid?',
16
17
) + $config[self::CONFIG_COLUMN_SCHEMA];
18
+
19
+
$config[self::CONFIG_KEY_SCHEMA] = array(
20
+
'key_draft' => array(
21
+
'columns' => array('authorPHID', 'conpherencePHID', 'transactionPHID'),
22
+
'unique' => true,
23
+
),
24
+
) + $config[self::CONFIG_KEY_SCHEMA];
25
+
17
26
return $config;
18
27
}
19
28
+8
src/applications/daemon/storage/PhabricatorDaemonLog.php
+8
src/applications/daemon/storage/PhabricatorDaemonLog.php
···
31
31
'envHash' => 'bytes40',
32
32
'status' => 'text8',
33
33
),
34
+
self::CONFIG_KEY_SCHEMA => array(
35
+
'status' => array(
36
+
'columns' => array('status'),
37
+
),
38
+
'dateCreated' => array(
39
+
'columns' => array('dateCreated'),
40
+
),
41
+
),
34
42
) + parent::getConfiguration();
35
43
}
36
44
+5
src/applications/daemon/storage/PhabricatorDaemonLogEvent.php
+5
src/applications/daemon/storage/PhabricatorDaemonLogEvent.php
+1
src/applications/dashboard/storage/PhabricatorDashboardInstall.php
+1
src/applications/dashboard/storage/PhabricatorDashboardInstall.php
+9
src/applications/doorkeeper/storage/DoorkeeperExternalObject.php
+9
src/applications/doorkeeper/storage/DoorkeeperExternalObject.php
···
31
31
self::CONFIG_KEY_SCHEMA => array(
32
32
'key_object' => array(
33
33
'columns' => array('objectKey'),
34
+
'unique' => true,
35
+
),
36
+
'key_full' => array(
37
+
'columns' => array(
38
+
'applicationType',
39
+
'applicationDomain',
40
+
'objectType',
41
+
'objectID',
42
+
),
34
43
),
35
44
),
36
45
) + parent::getConfiguration();
+1
src/applications/draft/storage/PhabricatorDraft.php
+1
src/applications/draft/storage/PhabricatorDraft.php
+1
src/applications/drydock/storage/DrydockLease.php
+1
src/applications/drydock/storage/DrydockLease.php
+11
src/applications/drydock/storage/DrydockLog.php
+11
src/applications/drydock/storage/DrydockLog.php
···
19
19
'leaseID' => 'id?',
20
20
'message' => 'text',
21
21
),
22
+
self::CONFIG_KEY_SCHEMA => array(
23
+
'resourceID' => array(
24
+
'columns' => array('resourceID', 'epoch'),
25
+
),
26
+
'leaseID' => array(
27
+
'columns' => array('leaseID', 'epoch'),
28
+
),
29
+
'epoch' => array(
30
+
'columns' => array('epoch'),
31
+
),
32
+
),
22
33
) + parent::getConfiguration();
23
34
}
24
35
+1
src/applications/drydock/storage/DrydockResource.php
+1
src/applications/drydock/storage/DrydockResource.php
+2
src/applications/feed/storage/PhabricatorFeedStoryData.php
+2
src/applications/feed/storage/PhabricatorFeedStoryData.php
+4
src/applications/feed/storage/PhabricatorFeedStoryReference.php
+4
src/applications/feed/storage/PhabricatorFeedStoryReference.php
+14
-1
src/applications/files/storage/PhabricatorFile.php
+14
-1
src/applications/files/storage/PhabricatorFile.php
···
68
68
self::CONFIG_COLUMN_SCHEMA => array(
69
69
'name' => 'text255?',
70
70
'mimeType' => 'text255?',
71
-
'byteSize' => 'uint64?',
71
+
'byteSize' => 'uint64',
72
72
'storageEngine' => 'text32',
73
73
'storageFormat' => 'text32',
74
74
'storageHandle' => 'text255',
···
83
83
'key_phid' => null,
84
84
'phid' => array(
85
85
'columns' => array('phid'),
86
+
'unique' => true,
87
+
),
88
+
'authorPHID' => array(
89
+
'columns' => array('authorPHID'),
90
+
),
91
+
'contentHash' => array(
92
+
'columns' => array('contentHash'),
93
+
),
94
+
'key_ttl' => array(
95
+
'columns' => array('ttl'),
96
+
),
97
+
'key_dateCreated' => array(
98
+
'columns' => array('dateCreated'),
86
99
),
87
100
),
88
101
) + parent::getConfiguration();
+1
src/applications/files/storage/PhabricatorFileTransactionComment.php
+1
src/applications/files/storage/PhabricatorFileTransactionComment.php
+4
src/applications/files/storage/PhabricatorTransformedFile.php
+4
src/applications/files/storage/PhabricatorTransformedFile.php
+4
src/applications/flag/storage/PhabricatorFlag.php
+4
src/applications/flag/storage/PhabricatorFlag.php
+8
src/applications/fund/storage/FundBacker.php
+8
src/applications/fund/storage/FundBacker.php
···
32
32
'status' => 'text32',
33
33
'amountInCents' => 'uint32',
34
34
),
35
+
self::CONFIG_KEY_SCHEMA => array(
36
+
'key_initiative' => array(
37
+
'columns' => array('initiativePHID'),
38
+
),
39
+
'key_backer' => array(
40
+
'columns' => array('backerPHID'),
41
+
),
42
+
),
35
43
) + parent::getConfiguration();
36
44
}
37
45
+8
src/applications/fund/storage/FundInitiative.php
+8
src/applications/fund/storage/FundInitiative.php
···
53
53
'description' => 'text',
54
54
'status' => 'text32',
55
55
),
56
+
self::CONFIG_KEY_SCHEMA => array(
57
+
'key_status' => array(
58
+
'columns' => array('status'),
59
+
),
60
+
'key_owner' => array(
61
+
'columns' => array('ownerPHID'),
62
+
),
63
+
),
56
64
) + parent::getConfiguration();
57
65
}
58
66
+1
src/applications/herald/storage/transcript/HeraldTranscript.php
+1
src/applications/herald/storage/transcript/HeraldTranscript.php
+5
src/applications/legalpad/storage/LegalpadDocument.php
+5
src/applications/legalpad/storage/LegalpadDocument.php
+1
src/applications/legalpad/storage/LegalpadDocumentBody.php
+1
src/applications/legalpad/storage/LegalpadDocumentBody.php
+11
src/applications/legalpad/storage/LegalpadDocumentSignature.php
+11
src/applications/legalpad/storage/LegalpadDocumentSignature.php
···
37
37
'isExemption' => 'bool',
38
38
'exemptionPHID' => 'phid?',
39
39
),
40
+
self::CONFIG_KEY_SCHEMA => array(
41
+
'key_signer' => array(
42
+
'columns' => array('signerPHID', 'dateModified'),
43
+
),
44
+
'secretKey' => array(
45
+
'columns' => array('secretKey'),
46
+
),
47
+
'key_document' => array(
48
+
'columns' => array('documentPHID', 'signerPHID', 'documentVersion'),
49
+
),
50
+
),
40
51
) + parent::getConfiguration();
41
52
}
42
53
+1
src/applications/legalpad/storage/LegalpadTransactionComment.php
+1
src/applications/legalpad/storage/LegalpadTransactionComment.php
+7
src/applications/macro/storage/PhabricatorFileImageMacro.php
+7
src/applications/macro/storage/PhabricatorFileImageMacro.php
···
54
54
self::CONFIG_KEY_SCHEMA => array(
55
55
'name' => array(
56
56
'columns' => array('name'),
57
+
'unique' => true,
58
+
),
59
+
'key_disabled' => array(
60
+
'columns' => array('isDisabled'),
61
+
),
62
+
'key_dateCreated' => array(
63
+
'columns' => array('dateCreated'),
57
64
),
58
65
),
59
66
) + parent::getConfiguration();
+4
src/applications/notification/storage/PhabricatorFeedStoryNotification.php
+4
src/applications/notification/storage/PhabricatorFeedStoryNotification.php
+16
src/applications/nuance/storage/NuanceRequestorSource.php
+16
src/applications/nuance/storage/NuanceRequestorSource.php
···
5
5
6
6
protected $requestorPHID;
7
7
protected $sourcePHID;
8
+
protected $sourceKey;
8
9
protected $data;
9
10
10
11
public function getConfiguration() {
11
12
return array(
12
13
self::CONFIG_SERIALIZATION => array(
13
14
'data' => self::SERIALIZATION_JSON,
15
+
),
16
+
self::CONFIG_COLUMN_SCHEMA => array(
17
+
'sourceKey' => 'text128',
18
+
),
19
+
self::CONFIG_KEY_SCHEMA => array(
20
+
'key_source_key' => array(
21
+
'columns' => array('sourcePHID', 'sourceKey'),
22
+
'unique' => true,
23
+
),
24
+
'key_requestor' => array(
25
+
'columns' => array('requestorPHID', 'id'),
26
+
),
27
+
'key_source' => array(
28
+
'columns' => array('sourcePHID', 'id'),
29
+
),
14
30
),
15
31
) + parent::getConfiguration();
16
32
}
+1
src/applications/pholio/storage/PholioTransactionComment.php
+1
src/applications/pholio/storage/PholioTransactionComment.php
+13
src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
+13
src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
···
6
6
protected $optionID;
7
7
protected $authorPHID;
8
8
9
+
public function getConfiguration() {
10
+
return array(
11
+
self::CONFIG_KEY_SCHEMA => array(
12
+
'pollID' => array(
13
+
'columns' => array('pollID'),
14
+
),
15
+
'authorPHID' => array(
16
+
'columns' => array('authorPHID'),
17
+
),
18
+
),
19
+
) + parent::getConfiguration();
20
+
}
21
+
9
22
}
+5
src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
+5
src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
+1
src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
+1
src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
+8
src/applications/system/storage/PhabricatorSystemActionLog.php
+8
src/applications/system/storage/PhabricatorSystemActionLog.php
···
17
17
'action' => 'text32',
18
18
'score' => 'double',
19
19
),
20
+
self::CONFIG_KEY_SCHEMA => array(
21
+
'key_epoch' => array(
22
+
'columns' => array('epoch'),
23
+
),
24
+
'key_action' => array(
25
+
'columns' => array('actorHash', 'action', 'epoch'),
26
+
),
27
+
),
20
28
) + parent::getConfiguration();
21
29
}
22
30
+5
src/applications/system/storage/PhabricatorSystemDestructionLog.php
+5
src/applications/system/storage/PhabricatorSystemDestructionLog.php
+4
src/applications/tokens/storage/PhabricatorTokenCount.php
+4
src/applications/tokens/storage/PhabricatorTokenCount.php
+7
src/applications/tokens/storage/PhabricatorTokenGiven.php
+7
src/applications/tokens/storage/PhabricatorTokenGiven.php
···
14
14
self::CONFIG_KEY_SCHEMA => array(
15
15
'key_all' => array(
16
16
'columns' => array('objectPHID', 'authorPHID'),
17
+
'unique' => true,
18
+
),
19
+
'key_author' => array(
20
+
'columns' => array('authorPHID'),
21
+
),
22
+
'key_token' => array(
23
+
'columns' => array('tokenPHID'),
17
24
),
18
25
),
19
26
) + parent::getConfiguration();