Merge branch 'CC-3174' into devel

This commit is contained in:
Naomi Aro 2012-04-16 16:40:02 +02:00
commit a0fb607d30
16 changed files with 210 additions and 235 deletions

View file

@ -168,11 +168,6 @@
instances can be regenerated if we edit the show, which is unwanted behaviour. This column serves
to ensure that we don't regenerate the instance. -->
<column name="modified_instance" phpName="DbModifiedInstance" type="BOOLEAN" required="true" defaultValue="false" />
<behavior name="aggregate_column">
<parameter name="name" value="time_filled" />
<parameter name="foreign_table" value="cc_schedule" />
<parameter name="expression" value="SUM(clip_length)" />
</behavior>
<foreign-key foreignTable="cc_show" name="cc_show_fkey" onDelete="CASCADE">
<reference local="show_id" foreign="id"/>
</foreign-key>