Merge branch 'master' of https://github.com/h2database/h2database

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #229: DATEDIFF does not work for 'WEEK'
+</li>
 <li>Issue #156: Add support for getGeneratedKeys() when executing commands via PreparedStatement#executeBatch
 </li>
 <li>Issue #195: The new Maven uses a .cmd file instead of a .bat file

h2/src/main/org/h2/expression/Function.java

@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.regex.PatternSyntaxException;
-
 import org.h2.api.ErrorCode;
 import org.h2.command.Command;
 import org.h2.command.Parser;
@@ -95,7 +94,7 @@ public class Function extends Expression implements FunctionCall {
             XMLATTR = 83, XMLNODE = 84, XMLCOMMENT = 85, XMLCDATA = 86,
             XMLSTARTDOC = 87, XMLTEXT = 88, REGEXP_REPLACE = 89, RPAD = 90,
             LPAD = 91, CONCAT_WS = 92, TO_CHAR = 93, TRANSLATE = 94, ORA_HASH = 95,
-            TO_DATE = 96, TO_TIMESTAMP = 97;
+            TO_DATE = 96, TO_TIMESTAMP = 97, ADD_MONTHS = 98;
 
     public static final int CURDATE = 100, CURTIME = 101, DATE_ADD = 102,
             DATE_DIFF = 103, DAY_NAME = 104, DAY_OF_MONTH = 105,
@@ -310,6 +309,7 @@ public class Function extends Expression implements FunctionCall {
                 0, Value.DATE);
         addFunction("TO_DATE", TO_DATE, VAR_ARGS, Value.STRING);
         addFunction("TO_TIMESTAMP", TO_TIMESTAMP, VAR_ARGS, Value.STRING);
+        addFunction("ADD_MONTHS", ADD_MONTHS, 2, Value.TIMESTAMP);
         // alias for MSSQLServer
         addFunctionNotDeterministic("GETDATE", CURDATE,
                 0, Value.DATE);
@@ -1441,6 +1441,9 @@ public class Function extends Expression implements FunctionCall {
             result = ValueTimestamp.get(ToDateParser.toTimestamp(v0.getString(),
                     v1 == null ? null : v1.getString()));
             break;
+        case ADD_MONTHS:
+            result = ValueTimestamp.get(DateTimeUtils.addMonths(v0.getTimestamp(), v1.getInt()));
+            break;
         case TRANSLATE: {
             String matching = v1.getString();
             String replacement = v2.getString();
@@ -1815,7 +1818,9 @@ public class Function extends Expression implements FunctionCall {
             return t2 - t1;
         case Calendar.SECOND:
         case Calendar.MINUTE:
-        case Calendar.HOUR_OF_DAY: {
+        case Calendar.HOUR_OF_DAY:
+        case Calendar.DAY_OF_YEAR:
+        case Calendar.WEEK_OF_YEAR: {
             // first 'normalize' the numbers so both are not negative
             long hour = 60 * 60 * 1000;
             long add = Math.min(t1 / hour * hour, t2 / hour * hour);
@@ -1828,6 +1833,10 @@ public class Function extends Expression implements FunctionCall {
                 return t2 / (60 * 1000) - t1 / (60 * 1000);
             case Calendar.HOUR_OF_DAY:
                 return t2 / hour - t1 / hour;
+            case Calendar.DAY_OF_YEAR:
+                return t2 / (hour * 24) - t1 / (hour * 24);
+            case Calendar.WEEK_OF_YEAR:
+                return t2 / (hour * 24 * 7) - t1 / (hour * 24 * 7);
             default:
                 throw DbException.throwInternalError("field:" + field);
             }
@@ -1845,9 +1854,12 @@ public class Function extends Expression implements FunctionCall {
         int month2 = calendar.get(Calendar.MONTH);
         int result = year2 - year1;
         if (field == Calendar.MONTH) {
-            result = 12 * result + (month2 - month1);
+            return 12 * result + (month2 - month1);
+        } else if (field == Calendar.YEAR) {
+            return result;
+        } else {
+            throw DbException.getUnsupportedException("DATEDIFF " + part);
         }
-        return result;
     }
 
     private static String substring(String s, int start, int length) {

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

@@ -905,4 +905,20 @@ public class DateTimeUtils {
         return dateValue(y, m + 3, (int) d);
     }
 
+    /**
+     * 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);
+
+        Timestamp resultDate = new Timestamp(calendar.getTimeInMillis());
+        resultDate.setNanos(refDate.getNanos());
+        return resultDate;
+    }
+
 }

h2/src/test/org/h2/samples/ToDate.java

@@ -11,7 +11,6 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
 import org.h2.tools.DeleteDbFiles;
 
 /**
@@ -36,6 +35,9 @@ public class ToDate {
 
         stat.execute("create table ToDateTest(id int primary key, " +
                 "start_date datetime, end_date datetime)");
+        stat.execute("insert into ToDateTest values(1, "
+                + "ADD_MONTHS(TO_DATE('2015-11-13', 'yyyy-MM-DD'), 1), "
+                + "TO_DATE('2015-12-15', 'YYYY-MM-DD'))");
         stat.execute("insert into ToDateTest values(1, " +
                 "TO_DATE('2015-11-13', 'yyyy-MM-DD'), " +
                 "TO_DATE('2015-12-15', 'YYYY-MM-DD'))");

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

@@ -38,7 +38,6 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.TimeZone;
 import java.util.UUID;
-
 import org.h2.api.Aggregate;
 import org.h2.api.AggregateFunction;
 import org.h2.api.ErrorCode;
@@ -49,6 +48,7 @@ import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
 import org.h2.test.ap.TestAnnotationProcessor;
 import org.h2.tools.SimpleResultSet;
+import org.h2.util.DateTimeUtils;
 import org.h2.util.IOUtils;
 import org.h2.util.New;
 import org.h2.util.StringUtils;
@@ -78,6 +78,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         deleteDb("functions");
         testToDate();
         testToDateException();
+        testAddMonths();
         testDataType();
         testVersion();
         testFunctionTable();
@@ -1408,6 +1409,31 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         date.setTime(c.getTimeInMillis());
     }
 
+    private void testAddMonths() throws ParseException {
+        Timestamp date;
+        Timestamp expected;
+
+        // 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));
+
+        // 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));
+
+        // 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));
+
+        // 21-Aug-2003 00:00:00:333 - 3 months = 21-May-2003 00:00:00:333
+        date = new Timestamp(new SimpleDateFormat("yyyy-MM-dd SSS").parse("2003-08-21 333").getTime());
+        expected = new Timestamp(new SimpleDateFormat("yyyy-MM-dd SSS").parse("2003-05-21 333").getTime());
+        assertEquals(expected, DateTimeUtils.addMonths(new Timestamp(date.getTime()), -3));
+    }
+
     private void testToCharFromDateTime() throws SQLException {
         deleteDb("functions");
         Connection conn = getConnection("functions");

h2/src/test/org/h2/test/testScript.sql

@@ -3964,6 +3964,12 @@ SELECT DATEDIFF('HOUR', '1900-01-01 01:00:00.001', '1900-01-01 01:00:01.000'), D
 > 0 0
 > rows: 1
 
+select datediff(day, '2015-12-09 23:59:00.0', '2016-01-16 23:59:00.0'), datediff(wk, '2015-12-09 23:59:00.0', '2016-01-16 23:59:00.0');
+> 38 5
+> -- -
+> 38 5
+> rows: 1
+
 create table test(id int);
 > ok