From b8cb6ddaa5bbb53c3f5f6f4362d857a6896106ca Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 21 Sep 2013 16:23:01 -0700 Subject: [PATCH] Add some keys and policy fields to repositories Summary: - Add some TODO'd keys. - Add policy fields. Test Plan: Viewed repositories; created a new repository and verified it got the right default policy settings. Reviewers: btrahan Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D7056 --- .../sql/patches/20130920.repokeyspolicy.sql | 20 +++++++++++++++++++ .../query/PhabricatorRepositoryQuery.php | 4 ---- .../storage/PhabricatorRepository.php | 2 ++ .../patch/PhabricatorBuiltinPatchList.php | 4 ++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 resources/sql/patches/20130920.repokeyspolicy.sql diff --git a/resources/sql/patches/20130920.repokeyspolicy.sql b/resources/sql/patches/20130920.repokeyspolicy.sql new file mode 100644 index 0000000000..6614d2594d --- /dev/null +++ b/resources/sql/patches/20130920.repokeyspolicy.sql @@ -0,0 +1,20 @@ +ALTER TABLE {$NAMESPACE}_repository.repository_summary + ADD KEY `key_epoch` (epoch); + +ALTER TABLE {$NAMESPACE}_repository.repository + ADD KEY `key_name` (name); + +ALTER TABLE {$NAMESPACE}_repository.repository + ADD KEY `key_vcs` (versionControlSystem); + +ALTER TABLE {$NAMESPACE}_repository.repository + ADD viewPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin; + +ALTER TABLE {$NAMESPACE}_repository.repository + ADD editPolicy VARCHAR(64) NOT NULL COLLATE utf8_bin; + +UPDATE {$NAMESPACE}_repository.repository + SET viewPolicy = 'users' WHERE viewPolicy = ''; + +UPDATE {$NAMESPACE}_repository.repository + SET editPolicy = 'admin' WHERE editPolicy = ''; diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php index d4cd4c6853..8662f682ff 100644 --- a/src/applications/repository/query/PhabricatorRepositoryQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php @@ -147,9 +147,6 @@ final class PhabricatorRepositoryQuery protected function getPagingColumn() { - // TODO: Add a key for ORDER_NAME. - // TODO: Add a key for ORDER_COMMITTED. - $order = $this->order; switch ($order) { case self::ORDER_CREATED: @@ -290,7 +287,6 @@ final class PhabricatorRepositoryQuery $this->callsigns); } - // TODO: Add a key for this. if ($this->types) { $where[] = qsprintf( $conn_r, diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php index 00708edf13..67137188fa 100644 --- a/src/applications/repository/storage/PhabricatorRepository.php +++ b/src/applications/repository/storage/PhabricatorRepository.php @@ -29,6 +29,8 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO protected $name; protected $callsign; protected $uuid; + protected $viewPolicy = PhabricatorPolicies::POLICY_USER; + protected $editPolicy = PhabricatorPolicies::POLICY_ADMIN; protected $versionControlSystem; protected $details = array(); diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php index b25cc5e17f..ab085ec313 100644 --- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php +++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php @@ -1608,6 +1608,10 @@ final class PhabricatorBuiltinPatchList extends PhabricatorSQLPatchList { 'type' => 'php', 'name' => $this->getPatchPath('20130919.mfieldconf.php'), ), + '20130920.repokeyspolicy.sql' => array( + 'type' => 'sql', + 'name' => $this->getPatchPath('20130920.repokeyspolicy.sql'), + ), ); } } -- 2.51.2