Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
denise 2013-10-15 16:01:56 -04:00
parent 787ecdc3fa f72bbefb78
commit 936ea714f3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install_minimal/upgrades/airtime-2.5.0/data/upgrade.sql
View File

@ -21,9 +21,10 @@ LEFT JOIN cc_schedule AS sched
ON sched.id = wm.instance_id ON sched.id = wm.instance_id
LEFT JOIN cc_webstream AS ws LEFT JOIN cc_webstream AS ws
ON sched.stream_id = ws.id ON sched.stream_id = ws.id
LEFT JOIN cc_show_instances as showinstances
ON sched.instance_id = showinstances.id
LEFT JOIN cc_show AS show LEFT JOIN cc_show AS show
ON sched.instance_id = show.id; ON showinstances.show_id = show.id;
CREATE OR REPLACE FUNCTION migrateWebstreamHistory() RETURNS int4 AS $$ CREATE OR REPLACE FUNCTION migrateWebstreamHistory() RETURNS int4 AS $$