dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22059
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2016-02-27 01:45:15 -0500
message:
  Table alteror fixes related to map legend
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java
  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/InitTableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java	2016-01-30 10:21:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java	2016-02-27 06:45:15 +0000
@@ -124,14 +124,11 @@
         executeSql( "update datavalueaudit set created=now() where created is null" );
         executeSql( "alter table datavalueaudit drop column timestamp" );
 
-        executeSql( "alter table trackedentitydatavalueaudit rename column timestamp to created" );
         executeSql( "update trackedentitydatavalue set created=timestamp where created is null" );
         executeSql( "update trackedentitydatavalue set lastupdated=timestamp where lastupdated is null" );
-        executeSql( "alter table trackedentitydatavalue drop column timestamp" );
-
-        executeSql( "alter table trackedentityattributevalueaudit rename column timestamp to created" );
         executeSql( "update trackedentityattributevalue set created=now() where created is null" );
         executeSql( "update trackedentityattributevalue set lastupdated=now() where lastupdated is null" );
+        executeSql( "alter table trackedentitydatavalue drop column timestamp" );
     }
 
     private void updateProgramStatus()

=== 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-26 04:26:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2016-02-27 06:45:15 +0000
@@ -184,9 +184,6 @@
         executeSql( "ALTER TABLE mapview DROP COLUMN bounds" );
         executeSql( "ALTER TABLE mapview DROP COLUMN valuetype" );
         executeSql( "ALTER TABLE mapview DROP COLUMN legendtype" );
-        executeSql( "ALTER TABLE mapview RENAME COLUMN mapvaluetype TO valuetype" );
-        executeSql( "ALTER TABLE mapview RENAME COLUMN maplegendtype TO legendtype" );
-        executeSql( "ALTER TABLE mapview RENAME COLUMN maplegendsetid TO legendsetid" );
         executeSql( "ALTER TABLE mapview ALTER COLUMN opacity TYPE double precision" );
 
         executeSql( "ALTER TABLE maplegend DROP CONSTRAINT maplegend_name_key" );
@@ -693,7 +690,6 @@
 
         executeSql( "UPDATE dataset SET dataelementdecoration=false WHERE dataelementdecoration is null" );
 
-        executeSql( "alter table validationrulegroup rename column validationgroupid to validationrulegroupid" );
         executeSql( "update sqlview set sqlviewid=viweid" );
         executeSql( "alter table sqlview drop column viewid" );
         executeSql( "update sqlview set type = 'QUERY' where query is true" );