From 27216dcea2454dbd840396134ffcd52b3d8db2a3 Mon Sep 17 00:00:00 2001 From: vansika Date: Tue, 23 Jul 2019 18:52:18 +0530 Subject: [PATCH] keep recommender id only in the join table --- admin/sql/create_foreign_keys.sql | 6 ------ admin/sql/create_tables.sql | 3 +-- admin/sql/updates/2019-07-09-add-recommendation-table.sql | 8 +------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/admin/sql/create_foreign_keys.sql b/admin/sql/create_foreign_keys.sql index caee739056..a3cd009232 100644 --- a/admin/sql/create_foreign_keys.sql +++ b/admin/sql/create_foreign_keys.sql @@ -36,12 +36,6 @@ ALTER TABLE recommendation.cf_recording REFERENCES "user" (id) ON DELETE CASCADE; -ALTER TABLE recommendation.cf_recording - ADD CONSTRAINT cf_recording_recommender_id_foreign_key - FOREIGN KEY (recommender_id) - REFERENCES recommendation.recommender (id) - ON DELETE CASCADE; - ALTER TABLE recommendation.cf_recording_recommender_join ADD CONSTRAINT cf_recording_recommender_join_recommender_id_foreign_key FOREIGN KEY (recommender_id) diff --git a/admin/sql/create_tables.sql b/admin/sql/create_tables.sql index bf691f0380..234654cdc7 100644 --- a/admin/sql/create_tables.sql +++ b/admin/sql/create_tables.sql @@ -108,7 +108,6 @@ CREATE TABLE recommendation.cf_recording ( id SERIAL, -- PK user_id INTEGER NOT NULL, --FK to "user".id msid UUID NOT NULL, - recommender_id INTEGER, --FK to recommendation.recommender.id type recording_type, created TIMESTAMP WITH TIME ZONE DEFAULT NOW() ); @@ -122,7 +121,7 @@ CREATE TABLE recommendation.recommender ( ); CREATE TABLE recommendation.cf_recording_recommender_join( - last_used TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + last_used TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL, cf_recording_id INTEGER, --FK to recommendation.cf_recording.id recommender_id INTEGER --FK to recommendation.recommender.id ); diff --git a/admin/sql/updates/2019-07-09-add-recommendation-table.sql b/admin/sql/updates/2019-07-09-add-recommendation-table.sql index 71d1e1c262..06a6923c0e 100644 --- a/admin/sql/updates/2019-07-09-add-recommendation-table.sql +++ b/admin/sql/updates/2019-07-09-add-recommendation-table.sql @@ -6,7 +6,6 @@ CREATE TABLE recommendation.cf_recording ( id SERIAL, -- PK user_id INTEGER NOT NULL, --FK to "user".id msid UUID NOT NULL, - recommender_id INTEGER, --FK to recommendation.recommender.id type recording_type, created TIMESTAMP WITH TIME ZONE DEFAULT NOW() ); @@ -20,7 +19,7 @@ CREATE TABLE recommendation.recommender ( ); CREATE TABLE recommendation.cf_recording_recommender_join( - last_used TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + last_used TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL, cf_recording_id INTEGER, --FK to recommendation.cf_recording.id recommender_id INTEGER --FK tol recommendation.recommender.id ); @@ -36,11 +35,6 @@ ALTER TABLE recommendation.cf_recording REFERENCES "user" (id) ON DELETE CASCADE; -ALTER TABLE recommendation.cf_recording - ADD CONSTRAINT cf_recording_recommender_id_foreign_key - FOREIGN KEY (recommender_id) - REFERENCES recommendation.recommender (id); - ALTER TABLE recommendation.cf_recording_recommender_join ADD CONSTRAINT cf_recording_recommender_join_recommender_id_foreign_key FOREIGN KEY (recommender_id)