From 68caf957ea113292713c69abbf081dfc1d8a4ff8 Mon Sep 17 00:00:00 2001 From: Naomi Date: Wed, 9 Oct 2013 18:24:54 -0400 Subject: [PATCH 1/2] CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade --- .../upgrades/airtime-2.5.0/data/upgrade.sql | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql index 565503413..9f91d06f9 100644 --- a/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql @@ -4,4 +4,47 @@ INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.5.0'); INSERT INTO cc_playout_history (file_id, starts, ends, instance_id) SELECT file_id, starts, ends, instance_id FROM cc_schedule -WHERE media_item_played = true; \ No newline at end of file +WHERE media_item_played = true; + +drop view ws_history; +create view ws_history as + +select +wm.start_time as starts, +ws.name as creator, +wm.liquidsoap_data as title, +sched.instance_id as instance_id + +from cc_webstream_metadata as wm +left join cc_schedule as sched +on sched.id = wm.instance_id +left join cc_webstream as ws +on sched.stream_id = ws.id; + + +CREATE OR REPLACE FUNCTION migrateWebstreamHistory() RETURNS int4 AS $$ + +DECLARE r RECORD; +DECLARE hisid integer; + +BEGIN + FOR r IN SELECT * from ws_history LOOP + + insert into cc_playout_history (starts, instance_id) + values (r.starts, r.instance_id) + returning id into hisid; + + insert into cc_playout_history_metadata (history_id, key, value) + values (hisid, 'track_title', r.title); + + insert into cc_playout_history_metadata (history_id, key, value) + values (hisid, 'artist_name', r.creator); + + + END LOOP; +return 1; +END; +$$ +LANGUAGE plpgsql; + +SELECT migrateWebstreamHistory() as output; \ No newline at end of file From c6b061d46ae50f791d700e0200b14441a191b0cb Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 10 Oct 2013 10:52:18 -0400 Subject: [PATCH 2/2] CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade removing temp view, function. adding showname info as well. --- .../upgrades/airtime-2.5.0/data/upgrade.sql | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql index 9f91d06f9..2bf940359 100644 --- a/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql @@ -6,20 +6,23 @@ SELECT file_id, starts, ends, instance_id FROM cc_schedule WHERE media_item_played = true; -drop view ws_history; -create view ws_history as -select +CREATE VIEW ws_history AS + +SELECT wm.start_time as starts, ws.name as creator, wm.liquidsoap_data as title, -sched.instance_id as instance_id +sched.instance_id as instance_id, +show.name as showname -from cc_webstream_metadata as wm -left join cc_schedule as sched -on sched.id = wm.instance_id -left join cc_webstream as ws -on sched.stream_id = ws.id; +FROM cc_webstream_metadata AS wm +LEFT JOIN cc_schedule AS sched +ON sched.id = wm.instance_id +LEFT JOIN cc_webstream AS ws +ON sched.stream_id = ws.id +LEFT JOIN cc_show AS show +ON sched.instance_id = show.id; CREATE OR REPLACE FUNCTION migrateWebstreamHistory() RETURNS int4 AS $$ @@ -40,6 +43,8 @@ BEGIN insert into cc_playout_history_metadata (history_id, key, value) values (hisid, 'artist_name', r.creator); + insert into cc_playout_history_metadata (history_id, key, value) + values (hisid, 'showname', r.showname); END LOOP; return 1; @@ -47,4 +52,7 @@ END; $$ LANGUAGE plpgsql; -SELECT migrateWebstreamHistory() as output; \ No newline at end of file +SELECT migrateWebstreamHistory() as output; + +DROP FUNCTION migrateWebstreamHistory(); +DROP VIEW ws_history; \ No newline at end of file