Fix database JS tests

PrairieLearn · Feb 2, 2022 · 35d9f27 · 35d9f27
1 parent 54daba0
commit 35d9f27
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/database/tables/assessment_question_role_permissions.pg b/database/tables/assessment_question_role_permissions.pg
@@ -1,14 +1,14 @@
-columns:
+columns
     assessment_question_id: bigint not null
-    group_role_id: bigint not null
-    can_view: boolean
     can_submit: boolean
+    can_view: boolean
+    group_role_id: bigint not null
 
 indexes
     assessment_question_role_permissions_pkey: PRIMARY KEY (assessment_question_id, group_role_id) USING btree (assessment_question_id, group_role_id)
-    assessment_question_role_permissions_assessment_question_id_key: USING btree (assessment_question_id)
+    assessment_question_role_permissions_assessment_question_id_gro: UNIQUE USING btree (assessment_question_id, group_role_id)
     assessment_question_role_permissions_group_role_id_key: USING btree (group_role_id)
 
 foreign-key constraints
-    assessment_question_role_permissions_assessment_question_id_fkey: FOREIGN KEY (assessment_question_id) REFERENCES assessment_questions(id) ON UPDATE CASCADE ON DELETE CASCADE
+    assessment_question_role_permissions_assessment_question_id_fke: FOREIGN KEY (assessment_question_id) REFERENCES assessment_questions(id) ON UPDATE CASCADE ON DELETE CASCADE
     assessment_question_role_permissions_group_role_id_fkey: FOREIGN KEY (group_role_id) REFERENCES group_roles(id) ON UPDATE CASCADE ON DELETE CASCADE
diff --git a/database/tables/assessment_questions.pg b/database/tables/assessment_questions.pg
@@ -53,4 +53,5 @@ foreign-key constraints
     assessment_questions_question_id_fkey: FOREIGN KEY (question_id) REFERENCES questions(id) ON UPDATE CASCADE ON DELETE CASCADE
 
 referenced by
+    assessment_question_role_permissions: FOREIGN KEY (assessment_question_id) REFERENCES assessment_questions(id) ON UPDATE CASCADE ON DELETE CASCADE
     instance_questions: FOREIGN KEY (assessment_question_id) REFERENCES assessment_questions(id) ON UPDATE CASCADE ON DELETE CASCADE
diff --git a/database/tables/assessments.pg b/database/tables/assessments.pg
@@ -48,6 +48,7 @@ referenced by
     current_pages: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
     files: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
     group_configs: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
+    group_roles: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
     issues: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE SET NULL
     job_sequences: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
     jobs: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE

diff --git a/database/tables/group_configs.pg b/database/tables/group_configs.pg
@@ -13,7 +13,7 @@ columns
 
 indexes
     group_configs_pkey: PRIMARY KEY (id) USING btree (id)
-    group_configs_assessment_id_key: USING btree (assessment_id)
+    group_configs_assessment_id_key: UNIQUE USING btree (assessment_id)
     group_configs_course_instance_id_key: USING btree (course_instance_id)
 
 foreign-key constraints

diff --git a/database/tables/group_roles.pg b/database/tables/group_roles.pg
@@ -1,16 +1,20 @@
 columns
-    id: bigint not null default nextval('group_roles_id_seq'::regclass)
-    role_name: text not null
     assessment_id: bigint not null
-    minimum: int default 0
-    maximum: int default 4
     can_assign_roles_at_start: boolean default false
     can_assign_roles_during_assessment: boolean default false
     can_submit_assessment: boolean default true
+    id: bigint not null default nextval('group_roles_id_seq'::regclass)
+    maximum: integer default 4
+    minimum: integer default 0
+    role_name: text not null
 
 indexes
     group_roles_pkey: PRIMARY KEY (id) USING btree (id)
-    group_roles_assessment_id_number_key: UNIQUE (assessment_id, number) USING btree (assessment_id, number)
+    group_roles_role_name_assessment_id_key: UNIQUE USING btree (role_name, assessment_id)
 
 foreign-key constraints
     group_roles_assessment_id_fkey: FOREIGN KEY (assessment_id) REFERENCES assessments(id) ON UPDATE CASCADE ON DELETE CASCADE
+
+referenced by
+    assessment_question_role_permissions: FOREIGN KEY (group_role_id) REFERENCES group_roles(id) ON UPDATE CASCADE ON DELETE CASCADE
+    group_users: FOREIGN KEY (group_role_id) REFERENCES group_roles(id) ON UPDATE CASCADE ON DELETE CASCADE
diff --git a/database/tables/group_users.pg b/database/tables/group_users.pg
@@ -1,15 +1,14 @@
 columns
     group_id: bigint not null
-    user_id: bigint not null
     group_role_id: bigint
+    user_id: bigint not null
 
 indexes
     group_users_pkey: PRIMARY KEY (group_id, user_id) USING btree (group_id, user_id)
     group_users_group_id_key: USING btree (group_id)
     group_users_user_id_key: USING btree (user_id)
-    group_user_group_role_id_key: USING btree (group_role_id)
 
 foreign-key constraints
     group_users_group_id_fkey: FOREIGN KEY (group_id) REFERENCES groups(id) ON UPDATE CASCADE ON DELETE CASCADE
+    group_users_group_role_id_fkey: FOREIGN KEY (group_role_id) REFERENCES group_roles(id) ON UPDATE CASCADE ON DELETE CASCADE
     group_users_user_id_fkey: FOREIGN KEY (user_id) REFERENCES users(user_id) ON UPDATE CASCADE ON DELETE CASCADE
-    group_users_group_role_id_fkey: FOREIGN KEY (group_role_id) REFERENCES group_roles(group_role_id) ON UPDATE CASCADE ON DELETE CASCADE