From fda7e61420a4e3c1c20b275dedce144807f676cc Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 20 Oct 2012 20:54:38 -0500 Subject: [PATCH 1/2] * remove music_session_clients; merge into connections table (VRFS-18 --- manifest | 1 + up/collapse_participants.sql | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 up/collapse_participants.sql diff --git a/manifest b/manifest index 267b046f9..ee46ead05 100644 --- a/manifest +++ b/manifest @@ -2,3 +2,4 @@ sessions.sql users.sql sessions_api_v1.sql p2p.sql +collapse_participants.sql diff --git a/up/collapse_participants.sql b/up/collapse_participants.sql new file mode 100644 index 000000000..f4d86a4bb --- /dev/null +++ b/up/collapse_participants.sql @@ -0,0 +1,4 @@ +DROP TABLE music_session_clients; + +ALTER TABLE connections ADD COLUMN music_session_id VARCHAR(64) REFERENCES music_sessions(id); +ALTER TABLE connections ADD COLUMN ip_address VARCHAR(64); From a04bf4155503a93ec00b52c660773f27a0c10e1e Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 22 Oct 2012 20:00:13 -0500 Subject: [PATCH 2/2] * cascading delete SET NULL on client_id (to stop fk's from deleting music_session) --- up/collapse_participants.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/up/collapse_participants.sql b/up/collapse_participants.sql index f4d86a4bb..691b0018a 100644 --- a/up/collapse_participants.sql +++ b/up/collapse_participants.sql @@ -1,4 +1,4 @@ DROP TABLE music_session_clients; -ALTER TABLE connections ADD COLUMN music_session_id VARCHAR(64) REFERENCES music_sessions(id); +ALTER TABLE connections ADD COLUMN music_session_id VARCHAR(64) REFERENCES music_sessions(id) ON DELETE SET NULL; ALTER TABLE connections ADD COLUMN ip_address VARCHAR(64);