Skip to content

Commit d6639b6

Browse files
author
epriestley
committedSep 24, 2014
Generate expected schemata for MetaMTA, Nuance, MetaData, OAuthServer
Summary: Ref T1191. Handful of minor things here (T6150, T6149, T6148, T6147, T6146) but nothing very noteworthy. Test Plan: Viewed web UI, saw fewer errors. Reviewers: btrahan Reviewed By: btrahan Subscribers: epriestley Maniphest Tasks: T1191 Differential Revision: https://secure.phabricator.com/D10527
1 parent cd4e3c6 commit d6639b6

18 files changed

+273
-0
lines changed
 

‎src/__phutil_library_map__.php

+8
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@
992992
'NuanceRequestorTransactionComment' => 'applications/nuance/storage/NuanceRequestorTransactionComment.php',
993993
'NuanceRequestorTransactionQuery' => 'applications/nuance/query/NuanceRequestorTransactionQuery.php',
994994
'NuanceRequestorViewController' => 'applications/nuance/controller/NuanceRequestorViewController.php',
995+
'NuanceSchemaSpec' => 'applications/nuance/storage/NuanceSchemaSpec.php',
995996
'NuanceSource' => 'applications/nuance/storage/NuanceSource.php',
996997
'NuanceSourceDefaultEditCapability' => 'applications/nuance/capability/NuanceSourceDefaultEditCapability.php',
997998
'NuanceSourceDefaultViewCapability' => 'applications/nuance/capability/NuanceSourceDefaultViewCapability.php',
@@ -1808,6 +1809,7 @@
18081809
'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php',
18091810
'PhabricatorMetaMTAReceivedMailProcessingException' => 'applications/metamta/exception/PhabricatorMetaMTAReceivedMailProcessingException.php',
18101811
'PhabricatorMetaMTAReceivedMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAReceivedMailTestCase.php',
1812+
'PhabricatorMetaMTASchemaSpec' => 'applications/metamta/storage/PhabricatorMetaMTASchemaSpec.php',
18111813
'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php',
18121814
'PhabricatorMetaMTAWorker' => 'applications/metamta/PhabricatorMetaMTAWorker.php',
18131815
'PhabricatorMultiColumnExample' => 'applications/uiexample/examples/PhabricatorMultiColumnExample.php',
@@ -1844,6 +1846,7 @@
18441846
'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
18451847
'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php',
18461848
'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
1849+
'PhabricatorOAuthSchemaSpec' => 'applications/oauthserver/storage/PhabricatorOAuthSchemaSpec.php',
18471850
'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
18481851
'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php',
18491852
'PhabricatorOAuthServerApplication' => 'applications/oauthserver/application/PhabricatorOAuthServerApplication.php',
@@ -2305,6 +2308,7 @@
23052308
'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php',
23062309
'PhabricatorStorageManagementWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php',
23072310
'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php',
2311+
'PhabricatorStorageSchemaSpec' => 'infrastructure/storage/schema/PhabricatorStorageSchemaSpec.php',
23082312
'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
23092313
'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php',
23102314
'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php',
@@ -3892,6 +3896,7 @@
38923896
'NuanceRequestorTransactionComment' => 'PhabricatorApplicationTransactionComment',
38933897
'NuanceRequestorTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
38943898
'NuanceRequestorViewController' => 'NuanceController',
3899+
'NuanceSchemaSpec' => 'PhabricatorConfigSchemaSpec',
38953900
'NuanceSource' => array(
38963901
'NuanceDAO',
38973902
'PhabricatorPolicyInterface',
@@ -4738,6 +4743,7 @@
47384743
'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
47394744
'PhabricatorMetaMTAReceivedMailProcessingException' => 'Exception',
47404745
'PhabricatorMetaMTAReceivedMailTestCase' => 'PhabricatorTestCase',
4746+
'PhabricatorMetaMTASchemaSpec' => 'PhabricatorConfigSchemaSpec',
47414747
'PhabricatorMetaMTASendGridReceiveController' => 'PhabricatorMetaMTAController',
47424748
'PhabricatorMetaMTAWorker' => 'PhabricatorWorker',
47434749
'PhabricatorMultiColumnExample' => 'PhabricatorUIExample',
@@ -4778,6 +4784,7 @@
47784784
'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientController',
47794785
'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientController',
47804786
'PhabricatorOAuthResponse' => 'AphrontResponse',
4787+
'PhabricatorOAuthSchemaSpec' => 'PhabricatorConfigSchemaSpec',
47814788
'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO',
47824789
'PhabricatorOAuthServerApplication' => 'PhabricatorApplication',
47834790
'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
@@ -5283,6 +5290,7 @@
52835290
'PhabricatorStorageManagementStatusWorkflow' => 'PhabricatorStorageManagementWorkflow',
52845291
'PhabricatorStorageManagementUpgradeWorkflow' => 'PhabricatorStorageManagementWorkflow',
52855292
'PhabricatorStorageManagementWorkflow' => 'PhabricatorManagementWorkflow',
5293+
'PhabricatorStorageSchemaSpec' => 'PhabricatorConfigSchemaSpec',
52865294
'PhabricatorSubscribersQuery' => 'PhabricatorQuery',
52875295
'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication',
52885296
'PhabricatorSubscriptionsEditController' => 'PhabricatorController',

‎src/applications/config/schema/PhabricatorConfigSchemaSpec.php

+5
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ private function getDetailsForDataType($data_type) {
271271
$charset = $this->getUTF8Charset();
272272
$collation = $this->getUTF8Collation();
273273
break;
274+
case 'text40':
275+
$column_type = 'varchar(40)';
276+
$charset = $this->getUTF8Charset();
277+
$collation = $this->getUTF8Collation();
278+
break;
274279
case 'text32':
275280
$column_type = 'varchar(32)';
276281
$charset = $this->getUTF8Charset();

‎src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php

+20
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,26 @@ public function generatePHID() {
1717
public function getConfiguration() {
1818
return array(
1919
self::CONFIG_AUX_PHID => true,
20+
self::CONFIG_COLUMN_SCHEMA => array(
21+
'name' => 'text255',
22+
'email' => 'text255',
23+
'uri' => 'text255?',
24+
),
25+
self::CONFIG_KEY_SCHEMA => array(
26+
'key_phid' => null,
27+
'phid' => array(
28+
'columns' => array('phid'),
29+
'unique' => true,
30+
),
31+
'email' => array(
32+
'columns' => array('email'),
33+
'unique' => true,
34+
),
35+
'name' => array(
36+
'columns' => array('name'),
37+
'unique' => true,
38+
),
39+
),
2040
) + parent::getConfiguration();
2141
}
2242

‎src/applications/metamta/storage/PhabricatorMetaMTAMail.php

+16
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@ public function getConfiguration() {
3232
self::CONFIG_SERIALIZATION => array(
3333
'parameters' => self::SERIALIZATION_JSON,
3434
),
35+
self::CONFIG_COLUMN_SCHEMA => array(
36+
'status' => 'text255',
37+
'message' => 'text',
38+
'relatedPHID' => 'phid?',
39+
),
40+
self::CONFIG_KEY_SCHEMA => array(
41+
'status' => array(
42+
'columns' => array('status'),
43+
),
44+
'relatedPHID' => array(
45+
'columns' => array('relatedPHID'),
46+
),
47+
'key_created' => array(
48+
'columns' => array('dateCreated'),
49+
),
50+
),
3551
) + parent::getConfiguration();
3652
}
3753

‎src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php

+21
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,27 @@ public function getConfiguration() {
1919
'bodies' => self::SERIALIZATION_JSON,
2020
'attachments' => self::SERIALIZATION_JSON,
2121
),
22+
self::CONFIG_COLUMN_SCHEMA => array(
23+
'relatedPHID' => 'phid?',
24+
'authorPHID' => 'phid?',
25+
'message' => 'text?',
26+
'messageIDHash' => 'bytes12',
27+
'status' => 'text32',
28+
),
29+
self::CONFIG_KEY_SCHEMA => array(
30+
'relatedPHID' => array(
31+
'columns' => array('relatedPHID'),
32+
),
33+
'authorPHID' => array(
34+
'columns' => array('authorPHID'),
35+
),
36+
'key_messageIDHash' => array(
37+
'columns' => array('messageIDHash'),
38+
),
39+
'key_created' => array(
40+
'columns' => array('dateCreated'),
41+
),
42+
),
2243
) + parent::getConfiguration();
2344
}
2445

‎src/applications/metamta/storage/PhabricatorMetaMTASchemaSpec.php

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
final class PhabricatorMetaMTASchemaSpec
4+
extends PhabricatorConfigSchemaSpec {
5+
6+
public function buildSchemata() {
7+
$this->buildLiskSchemata('PhabricatorMetaMTADAO');
8+
$this->buildLiskSchemata('PhabricatorSMSDAO');
9+
10+
$this->buildEdgeSchemata(
11+
new PhabricatorMetaMTAMail());
12+
}
13+
14+
}

‎src/applications/nuance/storage/NuanceItem.php

+19
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,31 @@ public static function initializeNewItem(PhabricatorUser $user) {
2222
->setDateNuanced(time())
2323
->setStatus(NuanceItem::STATUS_OPEN);
2424
}
25+
2526
public function getConfiguration() {
2627
return array(
2728
self::CONFIG_AUX_PHID => true,
2829
self::CONFIG_SERIALIZATION => array(
2930
'data' => self::SERIALIZATION_JSON,
3031
),
32+
self::CONFIG_COLUMN_SCHEMA => array(
33+
'ownerPHID' => 'phid?',
34+
'sourceLabel' => 'text255?',
35+
'status' => 'uint32',
36+
'mailKey' => 'bytes20',
37+
'dateNuanced' => 'epoch',
38+
),
39+
self::CONFIG_KEY_SCHEMA => array(
40+
'key_source' => array(
41+
'columns' => array('sourcePHID', 'status', 'dateNuanced'),
42+
),
43+
'key_owner' => array(
44+
'columns' => array('ownerPHID', 'status', 'dateNuanced'),
45+
),
46+
'key_contacter' => array(
47+
'columns' => array('requestorPHID', 'status', 'dateNuanced'),
48+
),
49+
),
3150
) + parent::getConfiguration();
3251
}
3352

‎src/applications/nuance/storage/NuanceQueue.php

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ final class NuanceQueue
1212
public function getConfiguration() {
1313
return array(
1414
self::CONFIG_AUX_PHID => true,
15+
self::CONFIG_COLUMN_SCHEMA => array(
16+
'name' => 'text255?',
17+
'mailKey' => 'bytes20',
18+
),
1519
) + parent::getConfiguration();
1620
}
1721

‎src/applications/nuance/storage/NuanceQueueItem.php

+17
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,22 @@ final class NuanceQueueItem
88
protected $itemStatus;
99
protected $itemDateNuanced;
1010

11+
public function getConfiguration() {
12+
return array(
13+
self::CONFIG_COLUMN_SCHEMA => array(
14+
'itemStatus' => 'uint32',
15+
'itemDateNuanced' => 'epoch',
16+
),
17+
self::CONFIG_KEY_SCHEMA => array(
18+
'key_one_per_queue' => array(
19+
'columns' => array('itemPHID', 'queuePHID'),
20+
'unique' => true,
21+
),
22+
'key_queue' => array(
23+
'columns' => array('queuePHID', 'itemStatus', 'itemDateNuanced'),
24+
),
25+
),
26+
) + parent::getConfiguration();
27+
}
1128

1229
}

‎src/applications/nuance/storage/NuanceSchemaSpec.php

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
final class NuanceSchemaSpec
4+
extends PhabricatorConfigSchemaSpec {
5+
6+
public function buildSchemata() {
7+
$this->buildLiskSchemata('NuanceDAO');
8+
$this->buildEdgeSchemata(new NuanceItem());
9+
10+
$this->buildTransactionSchema(
11+
new NuanceItemTransaction(),
12+
new NuanceItemTransactionComment());
13+
14+
$this->buildTransactionSchema(
15+
new NuanceQueueTransaction(),
16+
new NuanceQueueTransactionComment());
17+
18+
$this->buildTransactionSchema(
19+
new NuanceRequestorTransaction(),
20+
new NuanceRequestorTransactionComment());
21+
22+
$this->buildTransactionSchema(
23+
new NuanceSourceTransaction(),
24+
new NuanceSourceTransactionComment());
25+
}
26+
27+
}

‎src/applications/nuance/storage/NuanceSource.php

+10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ public function getConfiguration() {
1616
self::CONFIG_SERIALIZATION => array(
1717
'data' => self::SERIALIZATION_JSON,
1818
),
19+
self::CONFIG_COLUMN_SCHEMA => array(
20+
'name' => 'text255?',
21+
'type' => 'text32',
22+
'mailKey' => 'bytes20',
23+
),
24+
self::CONFIG_KEY_SCHEMA => array(
25+
'key_type' => array(
26+
'columns' => array('type', 'dateModified'),
27+
),
28+
),
1929
) + parent::getConfiguration();
2030
}
2131

‎src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php

+14
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@ public function getConfiguration() {
2323
self::CONFIG_SERIALIZATION => array(
2424
'scope' => self::SERIALIZATION_JSON,
2525
),
26+
self::CONFIG_COLUMN_SCHEMA => array(
27+
'scope' => 'text',
28+
),
29+
self::CONFIG_KEY_SCHEMA => array(
30+
'key_phid' => null,
31+
'phid' => array(
32+
'columns' => array('phid'),
33+
'unique' => true,
34+
),
35+
'userPHID' => array(
36+
'columns' => array('userPHID', 'clientPHID'),
37+
'unique' => true,
38+
),
39+
),
2640
) + parent::getConfiguration();
2741
}
2842

‎src/applications/oauthserver/storage/PhabricatorOAuthSchemaSpec.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
final class PhabricatorOAuthSchemaSpec
4+
extends PhabricatorConfigSchemaSpec {
5+
6+
public function buildSchemata() {
7+
$this->buildLiskSchemata('PhabricatorOAuthServerDAO');
8+
}
9+
10+
}

‎src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php

+15
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,19 @@ final class PhabricatorOAuthServerAccessToken
77
protected $token;
88
protected $userPHID;
99
protected $clientPHID;
10+
11+
public function getConfiguration() {
12+
return array(
13+
self::CONFIG_COLUMN_SCHEMA => array(
14+
'token' => 'text32',
15+
),
16+
self::CONFIG_KEY_SCHEMA => array(
17+
'token' => array(
18+
'columns' => array('token'),
19+
'unique' => true,
20+
),
21+
),
22+
) + parent::getConfiguration();
23+
}
24+
1025
}

‎src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php

+17
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,21 @@ final class PhabricatorOAuthServerAuthorizationCode
99
protected $clientSecret;
1010
protected $userPHID;
1111
protected $redirectURI;
12+
13+
public function getConfiguration() {
14+
return array(
15+
self::CONFIG_COLUMN_SCHEMA => array(
16+
'code' => 'text32',
17+
'clientSecret' => 'text32',
18+
'redirectURI' => 'text255',
19+
),
20+
self::CONFIG_KEY_SCHEMA => array(
21+
'code' => array(
22+
'columns' => array('code'),
23+
'unique' => true,
24+
),
25+
),
26+
) + parent::getConfiguration();
27+
}
28+
1229
}

‎src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php

+15
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ public static function initializeNewClient(PhabricatorUser $actor) {
3030
public function getConfiguration() {
3131
return array(
3232
self::CONFIG_AUX_PHID => true,
33+
self::CONFIG_COLUMN_SCHEMA => array(
34+
'name' => 'text255',
35+
'secret' => 'text32',
36+
'redirectURI' => 'text255',
37+
),
38+
self::CONFIG_KEY_SCHEMA => array(
39+
'key_phid' => null,
40+
'phid' => array(
41+
'columns' => array('phid'),
42+
'unique' => true,
43+
),
44+
'creatorPHID' => array(
45+
'columns' => array('creatorPHID'),
46+
),
47+
),
3348
) + parent::getConfiguration();
3449
}
3550

0 commit comments

Comments
 (0)
Failed to load comments.