Merge branch 'master' into range_table

# Conflicts:
#	h2/src/main/org/h2/engine/ConnectionInfo.java

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,12 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>-
+</li>
+</ul>
+
+<h2>Version 1.4.197 (2018-03-18)</h2>
+<ul>
 <li>PR #984: Minor refactorings in Parser
 </li>
 <li>Issue #933: MVStore background writer endless loop

h2/src/main/org/h2/engine/ConnectionInfo.java

@@ -376,8 +376,10 @@ public class ConnectionInfo implements Cloneable {
         if (nameNormalized == null) {
             if (!SysProperties.IMPLICIT_RELATIVE_PATH) {
                 if (!FileUtils.isAbsolute(name)) {
-                    if (!name.contains("./") && !name.contains(".\\") && !name.contains(":/")
-                            && !name.contains(":\\")) {
+                    if (!name.contains("./") &&
+                            !name.contains(".\\") &&
+                            !name.contains(":/") &&
+                            !name.contains(":\\")) {
                         // the name could start with "./", or
                         // it could start with a prefix such as "nio:./"
                         // for Windows, the path "\test" is not considered

h2/src/main/org/h2/engine/Constants.java

@@ -15,22 +15,22 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2017-06-10";
+    public static final String BUILD_DATE = "2018-03-18";
 
     /**
      * The build date of the last stable release.
      */
-    public static final String BUILD_DATE_STABLE = "2017-04-23";
+    public static final String BUILD_DATE_STABLE = "2017-06-10";
 
     /**
      * The build id is incremented for each public release.
      */
-    public static final int BUILD_ID = 196;
+    public static final int BUILD_ID = 197;
 
     /**
      * The build id of the last stable release.
      */
-    public static final int BUILD_ID_STABLE = 195;
+    public static final int BUILD_ID_STABLE = 196;
 
     /**
      * Whether this is a snapshot version.

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

@@ -385,7 +385,7 @@ public final class DateTimeFunctions {
      * Truncate the given date to the unit specified
      *
      * @param datePartStr the time unit (e.g. 'DAY', 'HOUR', etc.)
-     * @param value the date
+     * @param valueDate the date
      * @return date truncated to 'day'
      */
     public static Value truncateDate(String datePartStr, Value valueDate) {

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

@@ -729,6 +729,13 @@ public class DateTimeUtils {
         return getDayOfWeekFromAbsolute(absoluteDayFromDateValue(dateValue), firstDayOfWeek);
     }
 
+    /**
+     * Get the day of the week from the absolute day value.
+     *
+     * @param absoluteValue the absolute day
+     * @param firstDayOfWeek the first day of the week
+     * @return the day of week
+     */
     public static int getDayOfWeekFromAbsolute(long absoluteValue, int firstDayOfWeek) {
         return absoluteValue >= 0 ? (int) ((absoluteValue - firstDayOfWeek + 11) % 7) + 1
                 : (int) ((absoluteValue - firstDayOfWeek - 2) % 7) + 7;

h2/src/test/org/h2/samples/newsfeed.sql

@@ -7,6 +7,7 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
+(147, '1.4.198', '2018-03-18'),
 (146, '1.4.197', '2017-06-10'),
 (145, '1.4.195', '2017-04-23'),
 (144, '1.4.194', '2017-03-10'),
@@ -23,7 +24,6 @@ INSERT INTO VERSION VALUES
 (133, '1.4.183', '2014-12-13'),
 (132, '1.4.182', '2014-10-17'),
 (131, '1.4.181', '2014-08-06'),
-(130, '1.4.180', '2014-07-13'),
 ;
 
 CREATE TABLE CHANNEL(TITLE VARCHAR, LINK VARCHAR, DESC VARCHAR,