dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21354
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-12-07 13:49:42 +0100
message:
  Corrected duplicate db constraint names
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentityattributevalue/hibernate/TrackedEntityAttributeValueAudit.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentityattributevalue/hibernate/TrackedEntityAttributeValueAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentityattributevalue/hibernate/TrackedEntityAttributeValueAudit.hbm.xml	2015-12-01 04:59:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentityattributevalue/hibernate/TrackedEntityAttributeValueAudit.hbm.xml	2015-12-07 12:49:42 +0000
@@ -11,10 +11,10 @@
     </id>
 
     <many-to-one name="entityInstance" class="org.hisp.dhis.trackedentity.TrackedEntityInstance" column="trackedentityinstanceid"
-      foreign-key="fk_attributevalue_trackedentityinstanceid" />
+      foreign-key="fk_attributevalueaudit_trackedentityinstanceid" />
 
     <many-to-one name="attribute" class="org.hisp.dhis.trackedentity.TrackedEntityAttribute" column="trackedentityattributeid"
-      foreign-key="fk_attributevalue_trackedentityattributeid" />
+      foreign-key="fk_attributevalueaudit_trackedentityattributeid" />
 
     <property name="value" length="50000" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml	2015-12-01 04:59:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValueAudit.hbm.xml	2015-12-07 12:49:42 +0000
@@ -11,10 +11,10 @@
     </id>
 
     <many-to-one name="programStageInstance" class="org.hisp.dhis.program.ProgramStageInstance"
-        column="programstageinstanceid" foreign-key="fk_entityinstancedatavalue_programstageinstanceid" />
+        column="programstageinstanceid" foreign-key="fk_entityinstancedatavalueaudit_programstageinstanceid" />
     
     <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
-        foreign-key="fk_entityinstancedatavalue_dataelementid" />
+        foreign-key="fk_entityinstancedatavalueaudit_dataelementid" />
     
     <property name="value" length="50000" />