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

fixed build/schema.xml conflict

Browse source 
Conflicts:
	build/schema.xml
This commit is contained in:
mkonecny 2010-12-16 16:57:50 -05:00
commit b3a0104191
39 changed files with 3946 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/build.properties
View file

@ -1,4 +1,4 @@
project.home = /home/naomiaro/dev-campcaster/campcaster
project.home = /home/naomi/dev-campcaster/campcaster
project.build = ${project.home}/build
#Database driver

34
build/schema.xml
View file

@ -150,6 +150,14 @@
<reference local="subjs_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_show_schedule" phpName="CcShowSchedule">
<column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="show_id" phpName="DbShowId" type="INTEGER" required="true"/>
<column name="group_id" phpName="DbGroupId" type="INTEGER" required="true"/>
<foreign-key foreignTable="cc_show" name="cc_perm_show_fkey" onDelete="CASCADE">
<reference local="show_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_playlist" phpName="CcPlaylist">
<column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="name" phpName="DbName" type="VARCHAR" size="255" required="true" defaultValue=""/>
@ -200,19 +208,19 @@
</index>
</table>
<table name="cc_schedule" phpName="CcSchedule">
<column name="id" phpName="Id" type="BIGINT" primaryKey="true" required="true"/>
<column name="playlist_id" phpName="PlaylistId" type="INTEGER" required="true"/>
<column name="starts" phpName="Starts" type="TIMESTAMP" required="true"/>
<column name="ends" phpName="Ends" type="TIMESTAMP" required="true"/>
<column name="group_id" phpName="GroupId" type="INTEGER" required="false"/>
<column name="file_id" phpName="FileId" type="INTEGER" required="false"/>
<column name="clip_length" phpName="ClipLength" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="fade_in" phpName="FadeIn" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="fade_out" phpName="FadeOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_in" phpName="CueIn" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_out" phpName="CueOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="schedule_group_played" phpName="ScheduleGroupPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
<column name="media_item_played" phpName="MediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
<column name="id" phpName="DbId" type="BIGINT" primaryKey="true" required="true"/>
<column name="playlist_id" phpName="DbPlaylistId" type="INTEGER" required="true"/>
<column name="starts" phpName="DbStarts" type="TIMESTAMP" required="true"/>
<column name="ends" phpName="DbEnds" type="TIMESTAMP" required="true"/>
<column name="group_id" phpName="DbGroupId" type="INTEGER" required="false"/>
<column name="file_id" phpName="DbFileId" type="INTEGER" required="false"/>
<column name="clip_length" phpName="DbClipLength" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="fade_in" phpName="DbFadeIn" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="fade_out" phpName="DbFadeOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_in" phpName="DbCueIn" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_out" phpName="DbCueOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="schedule_group_played" phpName="DbScheduleGroupPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
<column name="media_item_played" phpName="DbMediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
</table>
<table name="cc_sess" phpName="CcSess">
<column name="sessid" phpName="Sessid" type="CHAR" size="32" primaryKey="true" required="true"/>

21
build/sql/schema.sql
View file

@ -212,6 +212,25 @@ CREATE TABLE "cc_show_hosts"
COMMENT ON TABLE "cc_show_hosts" IS '';
SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_show_schedule
-----------------------------------------------------------------------------
DROP TABLE "cc_show_schedule" CASCADE;
CREATE TABLE "cc_show_schedule"
(
"id" serial NOT NULL,
"show_id" INTEGER NOT NULL,
"group_id" INTEGER NOT NULL,
PRIMARY KEY ("id")
);
COMMENT ON TABLE "cc_show_schedule" IS '';
SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_playlist
@ -445,6 +464,8 @@ ALTER TABLE "cc_show_hosts" ADD CONSTRAINT "cc_perm_show_fkey" FOREIGN KEY ("sho
ALTER TABLE "cc_show_hosts" ADD CONSTRAINT "cc_perm_host_fkey" FOREIGN KEY ("subjs_id") REFERENCES "cc_subjs" ("id") ON DELETE CASCADE;
ALTER TABLE "cc_show_schedule" ADD CONSTRAINT "cc_perm_show_fkey" FOREIGN KEY ("show_id") REFERENCES "cc_show" ("id") ON DELETE CASCADE;
ALTER TABLE "cc_playlist" ADD CONSTRAINT "cc_playlist_editedby_fkey" FOREIGN KEY ("editedby") REFERENCES "cc_subjs" ("id");
ALTER TABLE "cc_playlistcontents" ADD CONSTRAINT "cc_playlistcontents_file_id_fkey" FOREIGN KEY ("file_id") REFERENCES "cc_files" ("id") ON DELETE CASCADE;