← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2333: Removed modified attribute from aggregateddatavalue in batchhandler and tablecreator, it was bein...

 

------------------------------------------------------------
revno: 2333
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-12-10 19:19:17 +0100
message:
  Removed modified attribute from aggregateddatavalue in batchhandler and tablecreator, it was being removed by tablealteror
modified:
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.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-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java	2010-11-24 23:33:43 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java	2010-12-10 18:19:17 +0000
@@ -79,7 +79,6 @@
         statementBuilder.setColumn( "organisationunitid" );
         statementBuilder.setColumn( "level" );
         statementBuilder.setColumn( "value" );
-        statementBuilder.setColumn( "modified" );
     }
     
     protected void setValues( AggregatedDataValue value )
@@ -91,6 +90,5 @@
         statementBuilder.setValue( value.getOrganisationUnitId() );
         statementBuilder.setValue( value.getLevel() );
         statementBuilder.setValue( value.getValue() );
-        statementBuilder.setValue( value.getModified() );
     }    
 }

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java	2010-11-30 09:29:57 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java	2010-12-10 18:19:17 +0000
@@ -73,8 +73,7 @@
             "organisationunitid INTEGER, " +
             "periodtypeid INTEGER, " +
             "level INTEGER, " +
-            "value DOUBLE PRECISION, " +
-            "modified TIMESTAMP WITH TIME ZONE DEFAULT now() );";
+            "value DOUBLE PRECISION );";
     }
     
     public String getCreateAggregatedIndicatorTable()
@@ -90,8 +89,7 @@
             "factor DOUBLE PRECISION, " +
             "value DOUBLE PRECISION, " +
             "numeratorvalue DOUBLE PRECISION, " +
-            "denominatorvalue DOUBLE PRECISION, " +
-            "modified TIMESTAMP WITH TIME ZONE DEFAULT now());";
+            "denominatorvalue DOUBLE PRECISION );";
     }
 
     public String getCreateDataSetCompletenessTable()