Merge lp:~wallyworld/launchpad/accesspolicy-private-teams2-1024990 into lp:launchpad/db-devel

Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 11862
Proposed branch: lp:~wallyworld/launchpad/accesspolicy-private-teams2-1024990
Merge into: lp:launchpad/db-devel
Diff against target: 24 lines (+1/-2)
2 files modified
database/schema/patch-2209-30-1.sql (+0/-2)
database/schema/security.cfg (+1/-0)
To merge this branch: bzr merge lp:~wallyworld/launchpad/accesspolicy-private-teams2-1024990
Reviewer Review Type Date Requested Status
Ian Booth (community) Approve
Review via email: mp+121104@code.launchpad.net

Commit message

Text fix for rev 11858 - remove unique constraint and update database access grants.

Description of the change

A test fix for 11858:
- add grant to allow merge job to access the accesspolicy table
- remove a unique person constraint on accesspolicy until merge code updated

To post a comment you must log in.
Revision history for this message
Ian Booth (wallyworld) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'database/schema/patch-2209-30-1.sql'
2--- database/schema/patch-2209-30-1.sql 2012-08-23 07:08:43 +0000
3+++ database/schema/patch-2209-30-1.sql 2012-08-23 23:57:24 +0000
4@@ -19,8 +19,6 @@
5 ALTER TABLE ONLY accesspolicy
6 ADD CONSTRAINT accesspolicy_person_fkey FOREIGN KEY (person) REFERENCES person(id);
7
8-CREATE UNIQUE INDEX accesspolicy__person__key ON accesspolicy USING btree (person) WHERE (person IS NOT NULL);
9-
10 COMMENT ON TABLE AccessPolicy IS 'An access policy used to manage a project, distribution or private team''s artifacts.';
11 COMMENT ON COLUMN AccessPolicy.person IS 'The private team that this policy is used on.';
12
13
14=== modified file 'database/schema/security.cfg'
15--- database/schema/security.cfg 2012-08-23 14:52:32 +0000
16+++ database/schema/security.cfg 2012-08-23 23:57:24 +0000
17@@ -2094,6 +2094,7 @@
18 [person-merge-job]
19 groups=script
20 public.accessartifactgrant = SELECT, UPDATE, DELETE
21+public.accesspolicy = SELECT, UPDATE, DELETE
22 public.accesspolicygrant = SELECT, UPDATE, DELETE
23 public.account = SELECT, UPDATE
24 public.announcement = SELECT, UPDATE

Subscribers

People subscribed via source and target branches

to status/vote changes: