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

Merge branch 'cc-84-smart-playlist' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
This commit is contained in:
James 2012-07-18 12:23:57 -04:00
commit 9516771099
24 changed files with 4016 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

25
airtime_mvc/build/sql/schema.sql
View file

@ -301,6 +301,7 @@ CREATE TABLE "cc_playlist"
"creator_id" INTEGER,
"description" VARCHAR(512),
"length" interval default '00:00:00',
"type" VARCHAR(7) default 'static',
PRIMARY KEY ("id")
);
@ -332,6 +333,28 @@ CREATE TABLE "cc_playlistcontents"
COMMENT ON TABLE "cc_playlistcontents" IS '';
SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_playlistcriteria
-----------------------------------------------------------------------------
DROP TABLE "cc_playlistcriteria" CASCADE;
CREATE TABLE "cc_playlistcriteria"
(
"id" serial NOT NULL,
"criteria" VARCHAR(16) NOT NULL,
"modifier" VARCHAR(16) NOT NULL,
"value" VARCHAR(32) NOT NULL,
"extra" VARCHAR(32),
"playlist_id" INTEGER NOT NULL,
PRIMARY KEY ("id")
);
COMMENT ON TABLE "cc_playlistcriteria" IS '';
SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_pref
@ -606,6 +629,8 @@ ALTER TABLE "cc_playlistcontents" ADD CONSTRAINT "cc_playlistcontents_file_id_fk
ALTER TABLE "cc_playlistcontents" ADD CONSTRAINT "cc_playlistcontents_playlist_id_fkey" FOREIGN KEY ("playlist_id") REFERENCES "cc_playlist" ("id") ON DELETE CASCADE;
ALTER TABLE "cc_playlistcriteria" ADD CONSTRAINT "cc_playlistcontents_playlist_id_fkey" FOREIGN KEY ("playlist_id") REFERENCES "cc_playlist" ("id") ON DELETE CASCADE;
ALTER TABLE "cc_pref" ADD CONSTRAINT "cc_pref_subjid_fkey" FOREIGN KEY ("subjid") REFERENCES "cc_subjs" ("id") ON DELETE CASCADE;
ALTER TABLE "cc_schedule" ADD CONSTRAINT "cc_show_inst_fkey" FOREIGN KEY ("instance_id") REFERENCES "cc_show_instances" ("id") ON DELETE CASCADE;