Skip to content

Commit cf9f57e

Browse files
stephenfinstephenfin
committed
sql: Sort 'grant-all' scripts alphabetically
This makes it easier to compare to the output of 'show tables'. Signed-off-by: Stephen Finucane <stephen@that.guru> (cherry picked from commit ca0e79d)
1 parent 0cdbb28 commit cf9f57e

File tree

2 files changed

+61
-62
lines changed

2 files changed

+61
-62
lines changed

‎lib/sql/grant-all.mysql.sql‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
BEGIN;
22
-- give necessary permissions to the web server. Because the admin is all
33
-- web-based, these need to be quite permissive
4-
GRANT SELECT, UPDATE, INSERT, DELETE ON django_session TO 'www-data'@localhost;
5-
GRANT SELECT, UPDATE, INSERT, DELETE ON django_site TO 'www-data'@localhost;
6-
GRANT SELECT, UPDATE, INSERT, DELETE ON django_admin_log TO 'www-data'@localhost;
7-
GRANT SELECT, UPDATE, INSERT, DELETE ON django_content_type TO 'www-data'@localhost;
4+
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_group TO 'www-data'@localhost;
85
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_group_permissions TO 'www-data'@localhost;
6+
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_permission TO 'www-data'@localhost;
97
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_user TO 'www-data'@localhost;
108
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_user_groups TO 'www-data'@localhost;
11-
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_group TO 'www-data'@localhost;
129
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_user_user_permissions TO 'www-data'@localhost;
13-
GRANT SELECT, UPDATE, INSERT, DELETE ON auth_permission TO 'www-data'@localhost;
14-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_emailconfirmation TO 'www-data'@localhost;
15-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_state TO 'www-data'@localhost;
16-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_comment TO 'www-data'@localhost;
17-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_person TO 'www-data'@localhost;
18-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_userprofile TO 'www-data'@localhost;
19-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_userprofile_maintainer_projects TO 'www-data'@localhost;
20-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_project TO 'www-data'@localhost;
10+
GRANT SELECT, UPDATE, INSERT, DELETE ON django_admin_log TO 'www-data'@localhost;
11+
GRANT SELECT, UPDATE, INSERT, DELETE ON django_content_type TO 'www-data'@localhost;
12+
GRANT SELECT, UPDATE, INSERT, DELETE ON django_session TO 'www-data'@localhost;
13+
GRANT SELECT, UPDATE, INSERT, DELETE ON django_site TO 'www-data'@localhost;
2114
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_bundle TO 'www-data'@localhost;
2215
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_bundlepatch TO 'www-data'@localhost;
23-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_submission TO 'www-data'@localhost;
24-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patch TO 'www-data'@localhost;
16+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_check TO 'www-data'@localhost;
17+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_comment TO 'www-data'@localhost;
2518
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_coverletter TO 'www-data'@localhost;
19+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_delegationrule TO 'www-data'@localhost;
20+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_emailconfirmation TO 'www-data'@localhost;
21+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_emailoptout TO 'www-data'@localhost;
22+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patch TO 'www-data'@localhost;
23+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patchchangenotification TO 'www-data'@localhost;
24+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patchtag TO 'www-data'@localhost;
25+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_person TO 'www-data'@localhost;
26+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_project TO 'www-data'@localhost;
2627
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_series TO 'www-data'@localhost;
2728
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_seriespatch TO 'www-data'@localhost;
2829
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_seriesreference TO 'www-data'@localhost;
29-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_emailoptout TO 'www-data'@localhost;
30-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patchchangenotification TO 'www-data'@localhost;
30+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_state TO 'www-data'@localhost;
31+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_submission TO 'www-data'@localhost;
3132
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_tag TO 'www-data'@localhost;
32-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_patchtag TO 'www-data'@localhost;
33-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_check TO 'www-data'@localhost;
34-
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_delegationrule TO 'www-data'@localhost;
33+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_userprofile TO 'www-data'@localhost;
34+
GRANT SELECT, UPDATE, INSERT, DELETE ON patchwork_userprofile_maintainer_projects TO 'www-data'@localhost;
3535

3636
-- allow the mail user (in this case, 'nobody') to add submissions (patches,
3737
-- cover letters) and series
38-
GRANT INSERT, SELECT ON patchwork_submission TO 'nobody'@localhost;
39-
GRANT INSERT, SELECT ON patchwork_patch TO 'nobody'@localhost;
38+
GRANT INSERT, SELECT ON patchwork_comment TO 'nobody'@localhost;
4039
GRANT INSERT, SELECT ON patchwork_coverletter TO 'nobody'@localhost;
40+
GRANT INSERT, SELECT ON patchwork_patch TO 'nobody'@localhost;
41+
GRANT INSERT, SELECT ON patchwork_person TO 'nobody'@localhost;
4142
GRANT INSERT, SELECT ON patchwork_series TO 'nobody'@localhost;
4243
GRANT INSERT, SELECT ON patchwork_seriespatch TO 'nobody'@localhost;
4344
GRANT INSERT, SELECT ON patchwork_seriesreference TO 'nobody'@localhost;
44-
GRANT INSERT, SELECT ON patchwork_comment TO 'nobody'@localhost;
45-
GRANT INSERT, SELECT ON patchwork_person TO 'nobody'@localhost;
45+
GRANT INSERT, SELECT ON patchwork_submission TO 'nobody'@localhost;
4646
GRANT INSERT, SELECT, UPDATE, DELETE ON patchwork_patchtag TO 'nobody'@localhost;
47+
GRANT SELECT ON patchwork_delegationrule TO 'nobody'@localhost;
4748
GRANT SELECT ON patchwork_project TO 'nobody'@localhost;
4849
GRANT SELECT ON patchwork_state TO 'nobody'@localhost;
4950
GRANT SELECT ON patchwork_tag TO 'nobody'@localhost;
50-
GRANT SELECT ON patchwork_delegationrule TO 'nobody'@localhost;
5151

5252
COMMIT;

‎lib/sql/grant-all.postgres.sql‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ BEGIN;
22
-- give necessary permissions to the web server. Because the admin is all
33
-- web-based, these need to be quite permissive
44
GRANT SELECT, UPDATE, INSERT, DELETE ON
5-
django_session,
6-
django_site,
7-
django_admin_log,
8-
django_content_type,
5+
auth_group,
96
auth_group_permissions,
107
auth_user,
118
auth_user_groups,
12-
auth_group,
139
auth_user_user_permissions,
1410
auth_permission,
1511
authtoken_token,
16-
patchwork_emailconfirmation,
17-
patchwork_state,
18-
patchwork_comment,
19-
patchwork_person,
20-
patchwork_userprofile,
21-
patchwork_userprofile_maintainer_projects,
22-
patchwork_project,
12+
django_admin_log,
13+
django_content_type,
14+
django_session,
15+
django_site,
2316
patchwork_bundle,
2417
patchwork_bundlepatch,
25-
patchwork_submission,
26-
patchwork_patch,
18+
patchwork_check,
19+
patchwork_comment,
2720
patchwork_coverletter,
21+
patchwork_delegationrule
22+
patchwork_emailconfirmation,
23+
patchwork_emailoptout,
24+
patchwork_patch,
25+
patchwork_patchchangenotification,
26+
patchwork_patchtag,
27+
patchwork_person,
28+
patchwork_project,
2829
patchwork_series,
2930
patchwork_seriespatch,
3031
patchwork_seriesreference,
31-
patchwork_emailoptout,
32-
patchwork_patchchangenotification,
32+
patchwork_state,
33+
patchwork_submission,
3334
patchwork_tag,
34-
patchwork_patchtag,
35-
patchwork_check,
36-
patchwork_delegationrule
35+
patchwork_userprofile,
36+
patchwork_userprofile_maintainer_projects,
3737
TO "www-data";
3838
GRANT SELECT, UPDATE ON
3939
auth_group_id_seq,
@@ -47,55 +47,54 @@ GRANT SELECT, UPDATE ON
4747
django_site_id_seq,
4848
patchwork_bundle_id_seq,
4949
patchwork_bundlepatch_id_seq,
50+
patchwork_check_id_seq,
5051
patchwork_comment_id_seq,
52+
patchwork_delegationrule_id_seq
53+
patchwork_emailconfirmation_id_seq,
5154
patchwork_patch_id_seq,
55+
patchwork_patchtag_id_seq,
56+
patchwork_person_id_seq,
57+
patchwork_project_id_seq,
5258
patchwork_series_id_seq,
5359
patchwork_seriespatch_id_seq,
5460
patchwork_seriesreference_id_seq,
55-
patchwork_person_id_seq,
56-
patchwork_project_id_seq,
5761
patchwork_state_id_seq,
58-
patchwork_emailconfirmation_id_seq,
62+
patchwork_tag_id_seq,
5963
patchwork_userprofile_id_seq,
6064
patchwork_userprofile_maintainer_projects_id_seq,
61-
patchwork_tag_id_seq,
62-
patchwork_patchtag_id_seq,
63-
patchwork_check_id_seq,
64-
patchwork_delegationrule_id_seq
6565
TO "www-data";
6666

6767
-- allow the mail user (in this case, 'nobody') to add submissions (patches,
6868
-- cover letters) and series
6969
GRANT INSERT, SELECT ON
70-
patchwork_submission,
70+
patchwork_comment,
7171
patchwork_coverletter,
72+
patchwork_event
7273
patchwork_seriespatch,
7374
patchwork_seriesreference,
74-
patchwork_comment,
75-
patchwork_event
75+
patchwork_submission,
7676
TO "nobody";
7777
GRANT INSERT, SELECT, UPDATE, DELETE ON
78-
patchwork_patchtag,
7978
patchwork_patch,
80-
patchwork_series,
79+
patchwork_patchtag,
8180
patchwork_person
81+
patchwork_series,
8282
TO "nobody";
8383
GRANT SELECT ON
84+
patchwork_delegationrule
8485
patchwork_project,
8586
patchwork_state,
8687
patchwork_tag,
87-
patchwork_delegationrule
8888
TO "nobody";
8989
GRANT UPDATE, SELECT ON
90+
patchwork_comment_id_seq,
91+
patchwork_event_id_seq
9092
patchwork_patch_id_seq,
93+
patchwork_patchtag_id_seq,
94+
patchwork_person_id_seq,
9195
patchwork_series_id_seq,
9296
patchwork_seriespatch_id_seq,
9397
patchwork_seriesreference_id_seq,
94-
patchwork_person_id_seq,
95-
patchwork_comment_id_seq,
96-
patchwork_patchtag_id_seq,
97-
patchwork_event_id_seq
9898
TO "nobody";
9999

100100
COMMIT;
101-

0 commit comments

Comments
 (0)