Removed deprecated functions getMonth and setMonth

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -902,9 +902,17 @@ public class DateTimeUtils {
         return dateValue(y, m + 3, (int) d);
     }
 
-    public static Timestamp addMonths(final Timestamp timestamp, final int numberMonths) {
-        timestamp.setMonth(timestamp.getMonth() + numberMonths);
-        return timestamp;
+    /**
+     * Adds the number of months to the date. If the resulting month's number of days is less than the original's day-of-month, the resulting
+     * day-of-months gets adjusted accordingly:
+     *
+     * 30.04.2007 - 2 months = 28.02.2007
+     */
+    public static Timestamp addMonths(final Timestamp refDate, final int nrOfMonthsToAdd) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(refDate);
+        calendar.add(Calendar.MONTH, nrOfMonthsToAdd);
+        return new Timestamp(calendar.getTime().getTime());
     }
 
 }

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -1398,19 +1398,23 @@ public class TestFunctions extends TestBase implements AggregateFunction {
     }
 
     private void testAddMonths() throws ParseException {
-        Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2013-01-29");
+        Timestamp date;
+        Timestamp expected;
 
-        Date expected = new SimpleDateFormat("yyyy-MM-dd").parse("2013-02-29");
-        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), 1));
-
-        expected = new SimpleDateFormat("yyyy-MM-dd").parse("2014-01-29");
-        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), 12));
+        // 01-Aug-03 + 3 months = 01-Nov-03
+        date = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-08-01").getTime());
+        expected = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-11-01").getTime());
+        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), 3));
 
-        expected = new SimpleDateFormat("yyyy-MM-dd").parse("2012-11-29");
-        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), -2));
+        // 31-Jan-03 + 1 month = 28-Feb-2003
+        date = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-01-31").getTime());
+        expected = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-02-28").getTime());
+        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), 1));
 
-        expected = new SimpleDateFormat("yyyy-MM-dd").parse("2012-01-29");
-        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), -12));
+        // 21-Aug-2003 - 3 months = 21-May-2003
+        date = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-08-21").getTime());
+        expected = new Timestamp(new SimpleDateFormat("yyyy-MM-dd").parse("2003-05-21").getTime());
+        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), -3));
     }
 
     private void testToCharFromDateTime() throws SQLException {