dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22045
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-02-25 17:07:30 -0500
message:
  Fixed bug with upgrade routine related to programs / program stages
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java


--
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/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2016-02-12 16:15:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2016-02-25 22:07:30 +0000
@@ -845,15 +845,15 @@
         executeSql( "update eventreport set completedonly = false where completedonly is null" );
         executeSql( "update eventchart set completedonly = false where completedonly is null" );
 
-        executeSql( "update program set enrollmentdatelabel = dateofenrollmentdescription where enrollmentdatelabel is not null" );
-        executeSql( "update program set incidentdatelabel = dateofincidentdescription where incidentdatelabel is not null" );
-        executeSql( "update programinstance set incidentdate = dateofincident where incidentdate is not null" );
+        executeSql( "update program set enrollmentdatelabel = dateofenrollmentdescription where enrollmentdatelabel is null" );
+        executeSql( "update program set incidentdatelabel = dateofincidentdescription where incidentdatelabel is null" );
+        executeSql( "update programinstance set incidentdate = dateofincident where incidentdate is null" );
         executeSql( "alter table programinstance alter column incidentdate set not null" );
         executeSql( "alter table program drop column dateofenrollmentdescription" );
         executeSql( "alter table program drop column dateofincidentdescription" );
         executeSql( "alter table programinstance drop column dateofincident" );
 
-        executeSql( "update programstage set excecutiondatelabel = reportdatedescription where excecutiondatelabel is not null" );
+        executeSql( "update programstage set excecutiondatelabel = reportdatedescription where excecutiondatelabel is null" );
         executeSql( "alter table programstage drop column reportdatedescription" );
         executeSql( "update programstage set reportdatetouse = 'indicentDate' where reportdatetouse='dateOfIncident'" );
         executeSql( "update programstage set repeatable = false where repeatable is null" );