Merge remote-tracking branch 'sf/2.2.x' into cc-4585

This commit is contained in:
Rudi Grinberg 2012-11-02 16:00:09 -04:00
commit 5cb83909d8
24 changed files with 116 additions and 45 deletions

View file

@ -251,7 +251,7 @@
<parameter name="foreign_table" value="cc_blockcontents" />
<parameter name="expression" value="SUM(cliplength)" />
</behavior>
<foreign-key foreignTable="cc_subjs" name="cc_block_createdby_fkey">
<foreign-key foreignTable="cc_subjs" name="cc_block_createdby_fkey" onDelete="CASCADE">
<reference local="creator_id" foreign="id"/>
</foreign-key>
</table>