schema confflicts resolution 4

This commit is contained in:
Dante
2015-06-17 16:58:43 -04:00
parent fce7dcbc0a
commit 645bb86b22

View File

@@ -860,8 +860,9 @@
<column name="PRO_DEBUG" type="INTEGER" required="true" default="0"/>
<column name="PRO_DYNAFORMS" type="LONGVARCHAR" required="false"/>
<column name="PRO_DERIVATION_SCREEN_TPL" type="VARCHAR" size="128" default="" required="false"/>
<column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<column name="OWN_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<validator column="PRO_TIMEUNIT">
<rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
</validator>
@@ -3067,7 +3068,7 @@
</table>
<table name="SESSION_STORAGE">
<vendor type="mysql">
<vendor type="mysql">
<parameter name="Name" value="SESSION_STORAGE"/>
<parameter name="Engine" value="InnoDB"/>
<parameter name="Version" value="10"/>
@@ -3597,7 +3598,7 @@
</table>
<table name="BPMN_FLOW">
<vendor type="mysql">
<vendor type="mysql">
<parameter name="Name" value="BPMN_FLOW"/>
<parameter name="Engine" value="InnoDB"/>
<parameter name="Version" value="10"/>
@@ -3646,7 +3647,7 @@
</table>
<table name="BPMN_GATEWAY">
<vendor type="mysql">
<vendor type="mysql">
<parameter name="Name" value="BPMN_GATEWAY"/>
<parameter name="Engine" value="InnoDB"/>
<parameter name="Version" value="10"/>
@@ -3724,7 +3725,7 @@
</table>
<table name="BPMN_LANE">
<vendor type="mysql">
<vendor type="mysql">
<parameter name="Name" value="BPMN_LANE"/>
<parameter name="Engine" value="InnoDB"/>
<parameter name="Version" value="10"/>
@@ -3819,7 +3820,7 @@
</table>
<table name="BPMN_DOCUMENTATION">
<vendor type="mysql">
<vendor type="mysql">
<parameter name="Name" value="BPMN_DOCUMENTATION"/>
<parameter name="Engine" value="InnoDB"/>
<parameter name="Version" value="10"/>
@@ -4866,8 +4867,6 @@
<column name="CONFIGURED_TASK_TIME" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_OVERDUE" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_ON_TIME" type="DECIMAL" size="7,2" default="0" />
<column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<index name="indexReporting">
<index-column name="USR_UID"/>
<index-column name="TAS_UID"/>
@@ -4915,8 +4914,6 @@
<column name="TOTAL_CASES_OPEN" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_OVERDUE" type="DECIMAL" size="7,2" default="0" />
<column name="TOTAL_CASES_ON_TIME" type="DECIMAL" size="7,2" default="0" />
<column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
</table>
<table name="DASHBOARD">
@@ -5055,3 +5052,4 @@
</index>
</table>
</database>