Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/models/Preference.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js
This commit is contained in:
commit
253eb811c7
42 changed files with 3966 additions and 499 deletions
|
@ -24,12 +24,21 @@
|
|||
<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"/>
|
||||
<column name="type" phpName="Type" type="VARCHAR" size="255" required="false"/>
|
||||
<unique name="cc_music_dir_unique">
|
||||
<unique-column name="directory"/>
|
||||
</unique>
|
||||
</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=""/>
|
||||
<column name="directory" phpName="DbDirectory" type="INTEGER" required="false"/>
|
||||
<column name="filepath" phpName="DbFilepath" type="LONGVARCHAR" required="false" defaultValue=""/>
|
||||
<column name="state" phpName="DbState" type="VARCHAR" size="128" required="true" defaultValue="empty"/>
|
||||
<column name="currentlyaccessing" phpName="DbCurrentlyaccessing" type="INTEGER" required="true" defaultValue="0"/>
|
||||
|
@ -82,6 +91,9 @@
|
|||
<foreign-key foreignTable="cc_subjs" name="cc_files_editedby_fkey">
|
||||
<reference local="editedby" foreign="id"/>
|
||||
</foreign-key>
|
||||
<foreign-key foreignTable="cc_music_dirs" name="cc_music_dirs_folder_fkey" onDelete="CASCADE">
|
||||
<reference local="directory" foreign="id"/>
|
||||
</foreign-key>
|
||||
<unique name="cc_files_gunid_idx">
|
||||
<unique-column name="gunid"/>
|
||||
</unique>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue