=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2012-12-25 18:30:44 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2012-12-25 22:34:59 +0000 @@ -470,6 +470,7 @@ final List values = new ArrayList(); values.add( String.valueOf( period.getId() ) ); + values.add( period.getIsoDate() ); for ( PeriodType periodType : PeriodType.PERIOD_TYPES ) { === modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2012-12-25 18:30:44 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java 2012-12-25 22:34:59 +0000 @@ -240,7 +240,7 @@ // Do nothing, table does not exist } - String sql = "CREATE TABLE " + tableName + " (periodid INTEGER NOT NULL PRIMARY KEY"; + String sql = "CREATE TABLE " + tableName + " (periodid INTEGER NOT NULL PRIMARY KEY, iso VARCHAR(10)"; for ( PeriodType periodType : PeriodType.PERIOD_TYPES ) {