dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10116
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-03-10 21:20:48 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/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-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-03-01 14:09:05 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-03-10 14:20:48 +0000
@@ -175,12 +175,13 @@
         executeSql( "UPDATE patientattribute SET valueType='number' WHERE valueType='NUMBER'" );
         executeSql( "UPDATE patientattribute SET valueType='bool' WHERE valueType='YES/NO'" );
         executeSql( "UPDATE patientattribute SET valueType='combo' WHERE valueType='COMBO'" );
-        executeSql( "UPDATE patientattribute SET valueType='calculated' WHERE valueType='CALCULATED'" );
         executeSql( "UPDATE patientidentifiertype SET type='string' WHERE type='text'" );
 
         executeSql( "UPDATE program SET onlyEnrollOnce='false' WHERE onlyEnrollOnce is null" );
         executeSql( "UPDATE programStage SET captureCoordinates='false' WHERE captureCoordinates is null" );
         
+        executeSql( "update caseaggregationcondition set \"operator\"='times' where \"operator\"='SUM'" );
+        
         updateUid();
     }
 
@@ -208,9 +209,7 @@
 
             executeSql( "ALTER TABLE patientdatavalue DROP COLUMN organisationUnitid" );
             executeSql( "ALTER TABLE patientdatavalue DROP COLUMN providedByAnotherFacility" );
-            executeSql( "ALTER TABLE patientdatavalue ADD PRIMARY KEY ( programstageinstanceid, dataelementid )" );
-            
-            executeSql( "update caseaggregationcondition set \"operator\"='times' where \"operator\"='SUM'" );
+            executeSql( "ALTER TABLE patientdatavalue ADD PRIMARY KEY ( programstageinstanceid, dataelementid )" );            
         }
         catch ( Exception ex )
         {