=== 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 2013-12-30 09:28:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-01-06 14:13:52 +0000
@@ -1075,7 +1075,7 @@
return false;
}
- private int getDefaultOptionCombo()
+ private Integer getDefaultOptionCombo()
{
String sql =
"select coc.categoryoptioncomboid from categoryoptioncombo coc " +
@@ -1086,7 +1086,7 @@
return statementManager.getHolder().queryForInteger( sql );
}
- private int getDefaultCategoryCombo()
+ private Integer getDefaultCategoryCombo()
{
String sql = "select categorycomboid from categorycombo where name = 'default'";
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-01-02 13:36:45 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-01-06 14:13:52 +0000
@@ -850,30 +850,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -890,6 +882,14 @@
+
+
+
+
+
+
+
+
=== 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 2014-01-06 13:23:58 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2014-01-06 14:13:52 +0000
@@ -469,7 +469,7 @@
// Only execute once
if ( !resultSet.next() )
{
- int max = jdbcTemplate.queryForObject( "select max(patientattributeid) from patientattribute",
+ Integer max = jdbcTemplate.queryForObject( "select max(patientattributeid) from patientattribute",
Integer.class );
// ---------------------------------------------------------------------
@@ -487,7 +487,7 @@
+ "','Gender', 'Gender','"
+ PatientAttribute.TYPE_COMBO + "', false, false, false)" );
- int maxOpt = jdbcTemplate.queryForObject(
+ Integer maxOpt = jdbcTemplate.queryForObject(
"select max(patientattributeoptionid) from patientattributeoption", Integer.class );
maxOpt++;
executeSql( "INSERT INTO patientattributeoption (patientattributeoptionid, name, patientattributeid ) VALUES ('"