Skip to content

Commit 37f21b6

Browse files
committed
Remove results table from db schema
1 parent 11d434c commit 37f21b6

File tree

4 files changed

+0
-65
lines changed

4 files changed

+0
-65
lines changed

mapswipe_workers/tests/integration/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ def _clear_all_data(cls):
5757
TRUNCATE TABLE users_temp;
5858
TRUNCATE TABLE user_groups_membership_logs_temp;
5959
-- normal tables
60-
TRUNCATE TABLE results CASCADE;
6160
TRUNCATE TABLE results_user_groups CASCADE;
6261
TRUNCATE TABLE tasks CASCADE;
6362
TRUNCATE TABLE user_groups_user_memberships CASCADE;

mapswipe_workers/tests/integration/set_up_db.sql

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -78,37 +78,6 @@ CREATE TABLE IF NOT EXISTS users_temp (
7878
updated_at timestamp
7979
);
8080

81-
CREATE TABLE IF NOT EXISTS results (
82-
project_id varchar,
83-
group_id varchar,
84-
user_id varchar,
85-
task_id varchar,
86-
"timestamp" timestamp,
87-
start_time timestamp DEFAULT NULL,
88-
end_time timestamp DEFAULT NULL,
89-
result int,
90-
PRIMARY KEY (project_id, group_id, task_id, user_id),
91-
FOREIGN KEY (project_id) REFERENCES projects (project_id),
92-
FOREIGN KEY (project_id, group_id) REFERENCES groups (project_id, group_id),
93-
FOREIGN KEY (project_id, group_id, task_id) REFERENCES tasks (project_id, group_id, task_id),
94-
FOREIGN KEY (user_id) REFERENCES users (user_id)
95-
);
96-
97-
CREATE INDEX IF NOT EXISTS results_projectid ON public.results
98-
USING btree (project_id);
99-
100-
CREATE INDEX IF NOT EXISTS results_groupid ON public.results
101-
USING btree (group_id);
102-
103-
CREATE INDEX IF NOT EXISTS results_taskid ON public.results
104-
USING btree (task_id);
105-
106-
CREATE INDEX IF NOT EXISTS results_userid ON public.results
107-
USING btree (user_id);
108-
109-
CREATE INDEX IF NOT EXISTS results_timestamp_date_idx
110-
ON public.results ("timestamp" DESC);
111-
11281

11382
-- create table for results import through csv
11483
CREATE TABLE IF NOT EXISTS results_temp (

mapswipe_workers/tests/integration/tear_down.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ def delete_test_data(project_id: str) -> None:
5959
pg_db.query(sql_query, [project_id])
6060
sql_query = "DELETE FROM mapping_sessions WHERE project_id = %s"
6161
pg_db.query(sql_query, [project_id])
62-
sql_query = "DELETE FROM results WHERE project_id = %s"
63-
pg_db.query(sql_query, [project_id])
6462
sql_query = "DELETE FROM results_user_groups WHERE project_id = %s"
6563
pg_db.query(sql_query, [project_id])
6664
sql_query = "DELETE FROM results_temp WHERE project_id = %s"

postgres/initdb.sql

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -78,37 +78,6 @@ CREATE TABLE IF NOT EXISTS users_temp (
7878
updated_at timestamp
7979
);
8080

81-
CREATE TABLE IF NOT EXISTS results (
82-
project_id varchar,
83-
group_id varchar,
84-
user_id varchar,
85-
task_id varchar,
86-
"timestamp" timestamp,
87-
start_time timestamp DEFAULT NULL,
88-
end_time timestamp DEFAULT NULL,
89-
result int,
90-
PRIMARY KEY (project_id, group_id, task_id, user_id),
91-
FOREIGN KEY (project_id) REFERENCES projects (project_id),
92-
FOREIGN KEY (project_id, group_id) REFERENCES groups (project_id, group_id),
93-
FOREIGN KEY (project_id, group_id, task_id) REFERENCES tasks (project_id, group_id, task_id),
94-
FOREIGN KEY (user_id) REFERENCES users (user_id)
95-
);
96-
97-
CREATE INDEX IF NOT EXISTS results_projectid ON public.results
98-
USING btree (project_id);
99-
100-
CREATE INDEX IF NOT EXISTS results_groupid ON public.results
101-
USING btree (group_id);
102-
103-
CREATE INDEX IF NOT EXISTS results_taskid ON public.results
104-
USING btree (task_id);
105-
106-
CREATE INDEX IF NOT EXISTS results_userid ON public.results
107-
USING btree (user_id);
108-
109-
CREATE INDEX IF NOT EXISTS results_timestamp_date_idx
110-
ON public.results ("timestamp" DESC);
111-
11281

11382
-- create table for results import through csv
11483
CREATE TABLE IF NOT EXISTS results_temp (

0 commit comments

Comments
 (0)