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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source 
Conflicts:
	airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
	airtime_mvc/build/schema.xml
	airtime_mvc/build/sql/schema.sql
This commit is contained in:
James 2012-07-26 14:54:47 -04:00
commit 8f2339f109
52 changed files with 4441 additions and 1009 deletions
Download patch file Download diff file Expand all files Collapse all files

45
airtime_mvc/build/schema.xml
View file

@ -1,29 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Autogenerated by PropelSchemaReverseTask class.-->
<database name="airtime" defaultIdMethod="native">
<table name="cc_access" phpName="CcAccess">
<column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="gunid" phpName="Gunid" type="CHAR" size="32" required="false"/>
<column name="token" phpName="Token" type="BIGINT" required="false"/>
<column name="chsum" phpName="Chsum" type="CHAR" size="32" required="true" defaultValue=""/>
<column name="ext" phpName="Ext" type="VARCHAR" size="128" required="true" defaultValue=""/>
<column name="type" phpName="Type" type="VARCHAR" size="20" required="true" defaultValue=""/>
<column name="parent" phpName="Parent" type="BIGINT" required="false"/>
<column name="owner" phpName="Owner" type="INTEGER" required="false"/>
<column name="ts" phpName="Ts" type="TIMESTAMP" required="false"/>
<foreign-key foreignTable="cc_subjs" name="cc_access_owner_fkey">
<reference local="owner" foreign="id"/>
</foreign-key>
<index name="cc_access_gunid_idx">
<index-column name="gunid"/>
</index>
<index name="cc_access_parent_idx">
<index-column name="parent"/>
</index>
<index name="cc_access_token_idx">
<index-column name="token"/>
</index>
</table>
<table name="cc_music_dirs" phpName="CcMusicDirs">
<column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="directory" phpName="Directory" type="LONGVARCHAR" required="false"/>
@ -36,7 +13,6 @@
</table>
<table name="cc_files" phpName="CcFiles">
<column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="gunid" phpName="DbGunid" type="char" size="32" required="true"/>
<column name="name" phpName="DbName" type="VARCHAR" size="255" required="true" defaultValue=""/>
<column name="mime" phpName="DbMime" type="VARCHAR" size="255" required="true" defaultValue=""/>
<column name="ftype" phpName="DbFtype" type="VARCHAR" size="128" required="true" defaultValue=""/>
@ -105,9 +81,6 @@
<foreign-key foreignTable="cc_music_dirs" name="cc_music_dirs_folder_fkey">
<reference local="directory" foreign="id"/>
</foreign-key>
<unique name="cc_files_gunid_idx">
<unique-column name="gunid"/>
</unique>
<index name="cc_files_md5_idx">
<index-column name="md5"/>
</index>
@ -243,6 +216,7 @@
0: audiotrack
1: webstream
2: block
1: webstream
-->
<column name="type" phpName="DbType" type="SMALLINT" required="true" default="0"/>
<column name="position" phpName="DbPosition" type="INTEGER" required="false"/>
@ -331,6 +305,7 @@
<column name="starts" phpName="DbStarts" type="TIMESTAMP" required="true"/>
<column name="ends" phpName="DbEnds" type="TIMESTAMP" required="true"/>
<column name="file_id" phpName="DbFileId" type="INTEGER" required="false"/>
<column name="stream_id" phpName="DbStreamId" type="INTEGER" required="false"/>
<column name="clip_length" phpName="DbClipLength" type="VARCHAR" sqlType="interval" 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"/>
@ -350,7 +325,10 @@
<foreign-key foreignTable="cc_files" name="cc_show_file_fkey" onDelete="CASCADE">
<reference local="file_id" foreign="id"/>
</foreign-key>
</table>
<foreign-key foreignTable="cc_webstream" name="cc_show_stream_fkey" onDelete="CASCADE">
<reference local="stream_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_sess" phpName="CcSess">
<column name="sessid" phpName="Sessid" type="CHAR" size="32" primaryKey="true" required="true"/>
<column name="userid" phpName="Userid" type="INTEGER" required="false"/>
@ -433,4 +411,15 @@
<column name="start_time" phpName="DbStartTime" type="TIMESTAMP" required="true" />
<column name="end_time" phpName="DbEndTime" type="TIMESTAMP" required="false"/>
</table>
<table name="cc_webstream" phpName="CcWebstream">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="name" phpName="DbName" type="VARCHAR" size="255" required="true" />
<!-- TODO, remove hardlimit on this column length? -->
<column name="description" phpName="DbDescription" type="VARCHAR" size="255" required="true" />
<column name="url" phpName="DbUrl" type="VARCHAR" size="255" required="true" />
<column name="length" phpName="DbLength" type="VARCHAR" sqlType="interval" required="true" defaultValue="00:00:00"/>
<column name="login" phpName="DbLogin" type="VARCHAR" size="255" required="true" />
<column name="mtime" phpName="DbMtime" type="TIMESTAMP" size="6" required="true" />
<column name="utime" phpName="DbUtime" type="TIMESTAMP" size="6" required="true" />
</table>
</database>