Merge branch 'cc-4661-listener-statistics' into devel

Conflicts:
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2012-11-07 17:20:12 -05:00
commit 7300b608cf
52 changed files with 22519 additions and 14 deletions

View file

@ -438,4 +438,24 @@
<reference local="instance_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_mount_name" phpName="CcTimestamp">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="mount_name" phpName="DbMountName" type="VARCHAR" required="true" />
</table>
<table name="cc_timestamp" phpName="CcTimestamp">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="timestamp" phpName="DbTimestamp" type="TIMESTAMP" required="true" />
</table>
<table name="cc_listener_count" phpName="CcListenerCount">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="timestamp_id" phpName="DbTimestampId" type="INTEGER" required="true"/>
<column name="mount_name_id" phpName="DbMountNameId" type="INTEGER" required="true"/>
<column name="listener_count" phpName="DbListenerCount" type="INTEGER" required="true" />
<foreign-key foreignTable="cc_timestamp" name="cc_timestamp_inst_fkey" onDelete="CASCADE">
<reference local="timestamp_id" foreign="id"/>
</foreign-key>
<foreign-key foreignTable="cc_mount_name" name="cc_mount_name_inst_fkey" onDelete="CASCADE">
<reference local="mount_name_id" foreign="id"/>
</foreign-key>
</table>
</database>