Merge branch 'master' of https://github.com/h2database/h2database into Issue#645

h2/src/docsrc/help/help.csv

@@ -907,8 +907,8 @@ DROP SEQUENCE SEQ_ID
 DROP TABLE [ IF EXISTS ] tableName [,...] [ RESTRICT | CASCADE ]
 ","
 Drops an existing table, or a list of tables.
-The command will fail if dependent views exist and the RESTRICT clause is used (the default).
-All dependent views are dropped as well if the CASCADE clause is used.
+The command will fail if dependent objects exist and the RESTRICT clause is used (the default).
+All dependent views and constraints are dropped as well if the CASCADE clause is used.
 This command commits an open transaction in this connection.
 ","
 DROP TABLE TEST

h2/src/main/org/h2/command/Parser.java

@@ -1200,7 +1200,7 @@ public class Parser {
 
         // build and prepare the targetMatchQuery ready to test each rows
         // existence in the target table (using source row to match)
-        StringBuffer targetMatchQuerySQL = new StringBuffer(
+        StringBuilder targetMatchQuerySQL = new StringBuilder(
                 "SELECT _ROWID_ FROM " + command.getTargetTable().getName());
         if (command.getTargetTableFilter().getTableAlias() != null) {
             targetMatchQuerySQL.append(

h2/src/main/org/h2/command/ddl/DropTable.java

@@ -5,9 +5,12 @@
  */
 package org.h2.command.ddl;
 
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
+import org.h2.constraint.Constraint;
 import org.h2.constraint.ConstraintReferential;
 import org.h2.engine.Database;
 import org.h2.engine.Right;
@@ -73,15 +76,29 @@ public class DropTable extends SchemaCommand {
                 throw DbException.get(ErrorCode.CANNOT_DROP_TABLE_1, tableName);
             }
             if (dropAction == ConstraintReferential.RESTRICT) {
+                StatementBuilder buff = new StatementBuilder();
                 CopyOnWriteArrayList<TableView> dependentViews = table.getDependentViews();
                 if (dependentViews != null && dependentViews.size() > 0) {
-                    StatementBuilder buff = new StatementBuilder();
                     for (TableView v : dependentViews) {
                         buff.appendExceptFirst(", ");
                         buff.append(v.getName());
                     }
-                    throw DbException.get(ErrorCode.CANNOT_DROP_2, tableName, buff.toString());
                 }
+                if (session.getDatabase()
+                        .getSettings().standardDropTableRestrict) {
+                    final List<Constraint> constraints = table.getConstraints();
+                    if (constraints != null && constraints.size() > 0) {
+                        for (Constraint c : constraints) {
+                            if (c.getTable() != table) {
+                                buff.appendExceptFirst(", ");
+                                buff.append(c.getName());
+                            }
+                        }
+                    }
+                }
+                if (buff.length() > 0)
+                    throw DbException.get(ErrorCode.CANNOT_DROP_2, tableName, buff.toString());
+
             }
             table.lock(session, true, true);
         }

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

@@ -350,6 +350,17 @@ public class DbSettings extends SettingsBase {
      */
     public final boolean multiThreaded = get("MULTI_THREADED", false);
 
+    /**
+     * Database setting <code>STANDARD_DROP_TABLE_RESTRICT</code> (default:
+     * false).<br />
+     * <code>true</code> if DROP TABLE RESTRICT should fail if there's any
+     * foreign key referencing the table to be dropped. <code>false</code> if
+     * foreign keys referencing the table to be dropped should be silently
+     * dropped as well.
+     */
+    public final boolean standardDropTableRestrict = get(
+            "STANDARD_DROP_TABLE_RESTRICT", false);
+
     private DbSettings(HashMap<String, String> s) {
         super(s);
     }

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -3810,10 +3810,10 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
             int id = getNextId(TraceObject.ARRAY);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcArray(conn, value, id));
         } else if (type == Blob.class) {
-            int id = getNextId(TraceObject.ARRAY);
+            int id = getNextId(TraceObject.BLOB);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcBlob(conn, value, id));
         } else if (type == Clob.class) {
-            int id = getNextId(TraceObject.ARRAY);
+            int id = getNextId(TraceObject.CLOB);
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcClob(conn, value, id));
         } else if (type == TimestampWithTimeZone.class) {
             return type.cast(value.getObject());

h2/src/main/org/h2/store/fs/FakeFileChannel.java

+/*
+ * Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.store.fs;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+/**
+ * Fake file channel to use by in-memory and ZIP file systems.
+ */
+public class FakeFileChannel extends FileChannel {
+    @Override
+    protected void implCloseChannel() throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public FileLock lock(long position, long size, boolean shared) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public MappedByteBuffer map(MapMode mode, long position, long size) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long position() throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public FileChannel position(long newPosition) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public int read(ByteBuffer dst) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public int read(ByteBuffer dst, long position) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long read(ByteBuffer[] dsts, int offset, int length) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long size() throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long transferFrom(ReadableByteChannel src, long position, long count) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long transferTo(long position, long count, WritableByteChannel target) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public FileChannel truncate(long size) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public FileLock tryLock(long position, long size, boolean shared) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public int write(ByteBuffer src) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public int write(ByteBuffer src, long position) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public long write(ByteBuffer[] srcs, int offset, int len) throws IOException {
+        throw new IOException();
+    }
+
+    @Override
+    public void force(boolean metaData) throws IOException {
+        throw new IOException();
+    }
+}
\ No newline at end of file

h2/src/main/org/h2/store/fs/FilePathMem.java

@@ -392,8 +392,7 @@ class FileMem extends FileBase {
             }
         }
 
-        // cast to FileChannel to avoid JDK 1.7 ambiguity
-        FileLock lock = new FileLock((FileChannel) null, position, size, shared) {
+        FileLock lock = new FileLock(new FakeFileChannel(), position, size, shared) {
 
             @Override
             public boolean isValid() {

h2/src/main/org/h2/store/fs/FilePathNioMem.java

@@ -386,8 +386,7 @@ class FileNioMem extends FileBase {
             }
         }
 
-        // cast to FileChannel to avoid JDK 1.7 ambiguity
-        FileLock lock = new FileLock((FileChannel) null, position, size, shared) {
+        FileLock lock = new FileLock(new FakeFileChannel(), position, size, shared) {
 
             @Override
             public boolean isValid() {

h2/src/main/org/h2/store/fs/FilePathZip.java

@@ -354,8 +354,7 @@ class FileZip extends FileBase {
     public synchronized FileLock tryLock(long position, long size,
             boolean shared) throws IOException {
         if (shared) {
-            // cast to FileChannel to avoid JDK 1.7 ambiguity
-            return new FileLock((FileChannel) null, position, size, shared) {
+            return new FileLock(new FakeFileChannel(), position, size, shared) {
 
                 @Override
                 public boolean isValid() {

h2/src/main/org/h2/table/TableFilter.java

@@ -788,7 +788,7 @@ public class TableFilter implements ColumnResolver {
             }
         }
         if (nestedJoin != null) {
-            StringBuffer buffNested = new StringBuffer();
+            StringBuilder buffNested = new StringBuilder();
             TableFilter n = nestedJoin;
             do {
                 buffNested.append(n.getPlanSQL(n != nestedJoin));

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

@@ -271,7 +271,6 @@ public class IOUtils {
     public static void closeSilently(Writer writer) {
         if (writer != null) {
             try {
-                writer.flush();
                 writer.close();
             } catch (Exception e) {
                 // ignore

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

@@ -27,22 +27,10 @@ import org.h2.value.ValueTimestampTimeZone;
  * <p>This class is implemented using reflection so that it compiles on
  * Java 7 as well.</p>
  *
- * <p>For LocalDate and LocalTime the conversion methods provided by
- * the JDK are used. For OffsetDateTime a custom conversion method is
- * used because it has no equivalent in JDBC. For LocalDateTime a
- * custom conversion method is used instead of the one provided by the
- * JDK as well.</p>
- *
- * <p>Using the JDK provided conversion method for LocalDateTime would
- * introduces some errors in edge cases. Consider the following case:
- * at 2016-03-27 02:00 in Europe/Berlin the clocks were set to
- * 2016-03-27 03:00. This means that 2016-03-27 02:15 does not exist in
- * Europe/Berlin. Unfortunately java.sql.Timestamp is in the the time
- * zone of the JVM. That means if you run a JVM with the time zone
- * Europe/Berlin then the SQL value 'TIMESTAMP 2016-03-27 02:15:00' can
- * not be represented. java.time.LocalDateTime does not have these
- * limitations but if we convert through java.sql.Timestamp we inherit
- * its limitations. Therefore that conversion must be avoided.</p>
+ * <p>Custom conversion methods between H2 internal values and JSR-310 classes
+ * are used without intermediate conversions to java.sql classes. Direct
+ * conversion is simpler, faster, and it does not inherit limitations and
+ * issues from java.sql classes and conversion methods provided by JDK.</p>
  *
  * <p>Once the driver requires Java 8 all the reflection can be removed.</p>
  */
@@ -85,8 +73,8 @@ public class LocalDateTimeUtils {
     private static final Method LOCAL_DATE_TIME_PLUS_NANOS;
     // java.time.LocalDateTime#toLocalDate()
     private static final Method LOCAL_DATE_TIME_TO_LOCAL_DATE;
-    // java.time.LocalDateTime#truncatedTo(TemporalUnit)
-    private static final Method LOCAL_DATE_TIME_TRUNCATED_TO;
+    // java.time.LocalDateTime#toLocalTime()
+    private static final Method LOCAL_DATE_TIME_TO_LOCAL_TIME;
     // java.time.LocalDateTime#parse(CharSequence)
     private static final Method LOCAL_DATE_TIME_PARSE;
 
@@ -105,17 +93,8 @@ public class LocalDateTimeUtils {
     // java.time.ZoneOffset#getTotalSeconds()
     private static final Method ZONE_OFFSET_GET_TOTAL_SECONDS;
 
-    // java.time.Duration#between(Temporal, Temporal)
-    private static final Method DURATION_BETWEEN;
-    // java.time.Duration#toNanos()
-    private static final Method DURATION_TO_NANOS;
-
-    // java.time.temporal.ChronoUnit#DAYS
-    private static final Object CHRONO_UNIT_DAYS;
-
     private static final boolean IS_JAVA8_DATE_API_PRESENT;
 
-
     static {
         LOCAL_DATE = tryGetClass("java.time.LocalDate");
         LOCAL_TIME = tryGetClass("java.time.LocalTime");
@@ -127,12 +106,6 @@ public class LocalDateTimeUtils {
                 ZONE_OFFSET != null;
 
         if (IS_JAVA8_DATE_API_PRESENT) {
-
-            Class<?> temporalUnit = getClass("java.time.temporal.TemporalUnit");
-            Class<?> chronoUnit = getClass("java.time.temporal.ChronoUnit");
-            Class<?> duration = getClass("java.time.Duration");
-            Class<?> temporal = getClass("java.time.temporal.Temporal");
-
             LOCAL_TIME_OF_NANO = getMethod(LOCAL_TIME, "ofNanoOfDay", long.class);
 
             LOCAL_TIME_TO_NANO = getMethod(LOCAL_TIME, "toNanoOfDay");
@@ -150,7 +123,7 @@ public class LocalDateTimeUtils {
 
             LOCAL_DATE_TIME_PLUS_NANOS = getMethod(LOCAL_DATE_TIME, "plusNanos", long.class);
             LOCAL_DATE_TIME_TO_LOCAL_DATE = getMethod(LOCAL_DATE_TIME, "toLocalDate");
-            LOCAL_DATE_TIME_TRUNCATED_TO = getMethod(LOCAL_DATE_TIME, "truncatedTo", temporalUnit);
+            LOCAL_DATE_TIME_TO_LOCAL_TIME = getMethod(LOCAL_DATE_TIME, "toLocalTime");
             LOCAL_DATE_TIME_PARSE = getMethod(LOCAL_DATE_TIME, "parse", CharSequence.class);
 
             ZONE_OFFSET_OF_TOTAL_SECONDS = getMethod(ZONE_OFFSET, "ofTotalSeconds", int.class);
@@ -162,11 +135,6 @@ public class LocalDateTimeUtils {
             OFFSET_DATE_TIME_PARSE = getMethod(OFFSET_DATE_TIME, "parse", CharSequence.class);
 
             ZONE_OFFSET_GET_TOTAL_SECONDS = getMethod(ZONE_OFFSET, "getTotalSeconds");
-
-            DURATION_BETWEEN = getMethod(duration, "between", temporal, temporal);
-            DURATION_TO_NANOS = getMethod(duration, "toNanos");
-
-            CHRONO_UNIT_DAYS = getFieldValue(chronoUnit, "DAYS");
         } else {
             LOCAL_TIME_OF_NANO = null;
             LOCAL_TIME_TO_NANO = null;
@@ -179,7 +147,7 @@ public class LocalDateTimeUtils {
             LOCAL_TIME_PARSE = null;
             LOCAL_DATE_TIME_PLUS_NANOS = null;
             LOCAL_DATE_TIME_TO_LOCAL_DATE = null;
-            LOCAL_DATE_TIME_TRUNCATED_TO = null;
+            LOCAL_DATE_TIME_TO_LOCAL_TIME = null;
             LOCAL_DATE_TIME_PARSE = null;
             ZONE_OFFSET_OF_TOTAL_SECONDS = null;
             OFFSET_DATE_TIME_TO_LOCAL_DATE_TIME = null;
@@ -187,9 +155,6 @@ public class LocalDateTimeUtils {
             OFFSET_DATE_TIME_OF_LOCAL_DATE_TIME_ZONE_OFFSET = null;
             OFFSET_DATE_TIME_PARSE = null;
             ZONE_OFFSET_GET_TOTAL_SECONDS = null;
-            DURATION_BETWEEN = null;
-            DURATION_TO_NANOS = null;
-            CHRONO_UNIT_DAYS = null;
         }
     }
 
@@ -310,15 +275,6 @@ public class LocalDateTimeUtils {
         }
     }
 
-    private static Class<?> getClass(String className) {
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalStateException("Java 8 or later but class " +
-                    className + " is missing", e);
-        }
-    }
-
     private static Method getMethod(Class<?> clazz, String methodName,
             Class<?>... parameterTypes) {
         try {
@@ -330,15 +286,6 @@ public class LocalDateTimeUtils {
         }
     }
 
-    private static Object getFieldValue(Class<?> clazz, String fieldName) {
-        try {
-            return clazz.getField(fieldName).get(null);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new IllegalStateException("Java 8 or later but field " +
-                    clazz.getName() + "#" + fieldName + " is missing", e);
-        }
-    }
-
     /**
      * Checks if the given class is LocalDate.
      *
@@ -523,7 +470,7 @@ public class LocalDateTimeUtils {
         try {
             Object localDate = LOCAL_DATE_TIME_TO_LOCAL_DATE.invoke(localDateTime);
             long dateValue = dateValueFromLocalDate(localDate);
-            long timeNanos = timeNanosFromLocalDate(localDateTime);
+            long timeNanos = timeNanosFromLocalDateTime(localDateTime);
             return ValueTimestamp.fromDateValueAndNanos(dateValue, timeNanos);
         } catch (IllegalAccessException e) {
             throw DbException.convert(e);
@@ -545,7 +492,7 @@ public class LocalDateTimeUtils {
             Object zoneOffset = OFFSET_DATE_TIME_GET_OFFSET.invoke(offsetDateTime);
 
             long dateValue = dateValueFromLocalDate(localDate);
-            long timeNanos = timeNanosFromLocalDate(localDateTime);
+            long timeNanos = timeNanosFromLocalDateTime(localDateTime);
             short timeZoneOffsetMins = zoneOffsetToOffsetMinute(zoneOffset);
             return ValueTimestampTimeZone.fromDateValueAndNanos(dateValue,
                     timeNanos, timeZoneOffsetMins);
@@ -564,11 +511,10 @@ public class LocalDateTimeUtils {
         return DateTimeUtils.dateValue(year, month, day);
     }
 
-    private static long timeNanosFromLocalDate(Object localDateTime)
+    private static long timeNanosFromLocalDateTime(Object localDateTime)
                     throws IllegalAccessException, InvocationTargetException {
-        Object midnight = LOCAL_DATE_TIME_TRUNCATED_TO.invoke(localDateTime, CHRONO_UNIT_DAYS);
-        Object duration = DURATION_BETWEEN.invoke(null, midnight, localDateTime);
-        return (Long) DURATION_TO_NANOS.invoke(duration);
+        Object localTime = LOCAL_DATE_TIME_TO_LOCAL_TIME.invoke(localDateTime);
+        return (Long) LOCAL_TIME_TO_NANO.invoke(localTime);
     }
 
     private static short zoneOffsetToOffsetMinute(Object zoneOffset)

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

@@ -197,7 +197,7 @@ public class OsgiDataSourceFactory implements DataSourceFactory {
         }
 
         // Setting URL
-        StringBuffer connectionUrl = new StringBuffer();
+        StringBuilder connectionUrl = new StringBuilder();
         if (p.containsKey(DataSourceFactory.JDBC_URL)) {
             // Use URL if specified
             connectionUrl.append(p.remove(DataSourceFactory.JDBC_URL));

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

@@ -19,7 +19,6 @@ import java.sql.Timestamp;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
-
 import org.h2.api.ErrorCode;
 import org.h2.engine.Constants;
 import org.h2.store.fs.FileUtils;
@@ -54,6 +53,7 @@ public class TestCases extends TestBase {
         testGroupSubquery();
         testCountDistinctNotNull();
         testDependencies();
+        testDropTable();
         testConvertType();
         testSortedSelect();
         testMaxMemoryRows();
@@ -150,7 +150,7 @@ public class TestCases extends TestBase {
         stat.execute("alter table b add constraint x " +
                 "foreign key(a_id) references a(id)");
         stat.execute("update a set x=200");
-        stat.execute("drop table if exists a, b");
+        stat.execute("drop table if exists a, b cascade");
         conn.close();
     }
 
@@ -278,6 +278,70 @@ public class TestCases extends TestBase {
         conn.close();
     }
 
+    private void testDropTable() throws SQLException {
+        trace("testDropTable");
+        final boolean[] booleans = new boolean[] { true, false };
+        for (final boolean stdDropTableRestrict : booleans) {
+            for (final boolean restrict : booleans) {
+                testDropTableNoReference(stdDropTableRestrict, restrict);
+                testDropTableViewReference(stdDropTableRestrict, restrict);
+                testDropTableForeignKeyReference(stdDropTableRestrict, restrict);
+            }
+        }
+    }
+
+    private Statement createTable(final boolean stdDropTableRestrict) throws SQLException {
+        deleteDb("cases");
+        Connection conn = getConnection("cases;STANDARD_DROP_TABLE_RESTRICT=" + stdDropTableRestrict);
+        Statement stat = conn.createStatement();
+        stat.execute("create table test(id int)");
+        return stat;
+    }
+
+    private void dropTable(final boolean restrict, Statement stat, final boolean expectedDropSuccess)
+            throws SQLException {
+        assertThrows(expectedDropSuccess ? 0 : ErrorCode.CANNOT_DROP_2, stat)
+                .execute("drop table test " + (restrict ? "restrict" : "cascade"));
+        assertThrows(expectedDropSuccess ? ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1 : 0, stat).execute("select * from test");
+    }
+
+    private void testDropTableNoReference(final boolean stdDropTableRestrict, final boolean restrict)
+            throws SQLException {
+        Statement stat = createTable(stdDropTableRestrict);
+        // always succeed as there's no reference to the table
+        dropTable(restrict, stat, true);
+        stat.getConnection().close();
+    }
+
+    private void testDropTableViewReference(final boolean stdDropTableRestrict, final boolean restrict)
+            throws SQLException {
+        Statement stat = createTable(stdDropTableRestrict);
+        stat.execute("create view abc as select * from test");
+        // drop allowed only if cascade
+        final boolean expectedDropSuccess = !restrict;
+        dropTable(restrict, stat, expectedDropSuccess);
+        // missing view if the drop succeeded
+        assertThrows(expectedDropSuccess ? ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1 : 0, stat).execute("select * from abc");
+        stat.getConnection().close();
+    }
+
+    private void testDropTableForeignKeyReference(final boolean stdDropTableRestrict, final boolean restrict)
+            throws SQLException {
+        Statement stat = createTable(stdDropTableRestrict);
+        stat.execute("create table ref(id int, id_test int, foreign key (id_test) references test (id)) ");
+        // test table is empty, so the foreign key forces ref table to be also
+        // empty
+        assertThrows(ErrorCode.REFERENTIAL_INTEGRITY_VIOLATED_PARENT_MISSING_1, stat)
+                .execute("insert into ref values(1,2)");
+        // drop allowed if cascade or old style
+        final boolean expectedDropSuccess = !stdDropTableRestrict || !restrict;
+        dropTable(restrict, stat, expectedDropSuccess);
+        // insertion succeeds if the foreign key was dropped
+        assertThrows(expectedDropSuccess ? 0 : ErrorCode.REFERENTIAL_INTEGRITY_VIOLATED_PARENT_MISSING_1, stat)
+                .execute("insert into ref values(1,2)");
+        stat.getConnection().close();
+    }
+
     private void testConvertType() throws SQLException {
         deleteDb("cases");
         Connection conn = getConnection("cases");

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

@@ -1498,6 +1498,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         assertResult("1979-11-12 08:12:34.56", stat, "SELECT X FROM T");
         assertResult("-100-01-15 14:04:02.12", stat, "SELECT X FROM U");
         String expected = String.format("%tb", timestamp1979).toUpperCase();
+        expected = stripTrailingPeriod(expected);
         assertResult("12-" + expected + "-79 08.12.34.560000 AM", stat,
                 "SELECT TO_CHAR(X) FROM T");
         assertResult("- / , . ; : text - /", stat,
@@ -1618,6 +1619,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         assertResult("11", stat, "SELECT TO_CHAR(X, 'mM') FROM T");
         assertResult("11", stat, "SELECT TO_CHAR(X, 'mm') FROM T");
         expected = String.format("%1$tb", timestamp1979);
+        expected = stripTrailingPeriod(expected);
         expected = expected.substring(0, 1).toUpperCase() + expected.substring(1);
         assertResult(expected.toUpperCase(), stat,
                 "SELECT TO_CHAR(X, 'MON') FROM T");
@@ -1672,6 +1674,14 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         conn.close();
     }
 
+    String stripTrailingPeriod(String expected) {
+        // CLDR provider appends period on some locales
+        int l = expected.length() - 1;
+        if (expected.charAt(l) == '.')
+            expected = expected.substring(0, l);
+        return expected;
+    }
+
     private void testIfNull() throws SQLException {
         deleteDb("functions");
         Connection conn = getConnection("functions");

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

@@ -305,7 +305,7 @@ public class TestMergeUsing extends TestBase implements Trigger {
                     + expectedResultsSQL + " )");
 
             int rowCount = 0;
-            StringBuffer diffBuffer = new StringBuffer("");
+            StringBuilder diffBuffer = new StringBuilder("");
             while (rs.next()) {
                 rowCount++;
                 diffBuffer.append("|");
@@ -401,7 +401,7 @@ public class TestMergeUsing extends TestBase implements Trigger {
     }
 
     private String getCreateTriggerSQL() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("CREATE TRIGGER INS_BEFORE " + "BEFORE INSERT ON PARENT "
                 + "FOR EACH ROW NOWAIT CALL \"" + getClass().getName() + "\";");
         buf.append("CREATE TRIGGER UPD_BEFORE " + "BEFORE UPDATE ON PARENT "

h2/src/test/org/h2/test/scripts/functions/numeric/degrees.sql

@@ -9,11 +9,12 @@ create memory table test(id int primary key, name varchar(255));
 insert into test values(1, 'Hello');
 > update count: 1
 
-select degrees(null) vn, degrees(1) v1, degrees(1.1) v2, degrees(-1.1) v3, degrees(1.9) v4, degrees(-1.9) v5 from test;
-> VN   V1                V2                V3                 V4                 V5
-> ---- ----------------- ----------------- ------------------ ------------------ -------------------
-> null 57.29577951308232 63.02535746439057 -63.02535746439057 108.86198107485642 -108.86198107485642
+-- Truncate least significant digits because implementations returns slightly
+-- different results depending on Java version
+select degrees(null) vn, truncate(degrees(1), 10) v1, truncate(degrees(1.1), 10) v2,
+    truncate(degrees(-1.1), 10) v3, truncate(degrees(1.9), 10) v4,
+    truncate(degrees(-1.9), 10) v5 from test;
+> VN   V1           V2            V3             V4             V5
+> ---- ------------ ------------- -------------- -------------- ---------------
+> null 57.295779513 63.0253574643 -63.0253574643 108.8619810748 -108.8619810748
 > rows: 1
-
-
-

h2/src/test/org/h2/test/scripts/functions/numeric/radians.sql

@@ -9,11 +9,12 @@ create memory table test(id int primary key, name varchar(255));
 insert into test values(1, 'Hello');
 > update count: 1
 
-select radians(null) vn, radians(1) v1, radians(1.1) v2, radians(-1.1) v3, radians(1.9) v4, radians(-1.9) v5 from test;
-> VN   V1                   V2                   V3                    V4                  V5
-> ---- -------------------- -------------------- --------------------- ------------------- --------------------
-> null 0.017453292519943295 0.019198621771937624 -0.019198621771937624 0.03316125578789226 -0.03316125578789226
+-- Truncate least significant digits because implementations returns slightly
+-- different results depending on Java version
+select radians(null) vn, truncate(radians(1), 10) v1, truncate(radians(1.1), 10) v2,
+    truncate(radians(-1.1), 10) v3, truncate(radians(1.9), 10) v4,
+    truncate(radians(-1.9), 10) v5 from test;
+> VN   V1           V2           V3            V4           V5
+> ---- ------------ ------------ ------------- ------------ -------------
+> null 0.0174532925 0.0191986217 -0.0191986217 0.0331612557 -0.0331612557
 > rows: 1
-
-
-

h2/src/tools/org/h2/dev/fs/FilePathZip2.java

@@ -17,6 +17,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.h2.engine.Constants;
 import org.h2.message.DbException;
+import org.h2.store.fs.FakeFileChannel;
 import org.h2.store.fs.FileBase;
 import org.h2.store.fs.FileChannelInputStream;
 import org.h2.store.fs.FilePath;
@@ -426,9 +427,7 @@ class FileZip2 extends FileBase {
     public synchronized FileLock tryLock(long position, long size,
             boolean shared) throws IOException {
         if (shared) {
-
-            // cast to FileChannel to avoid JDK 1.7 ambiguity
-            return new FileLock((FileChannel) null, position, size, shared) {
+            return new FileLock(new FakeFileChannel(), position, size, shared) {
 
                 @Override
                 public boolean isValid() {

h2/src/tools/org/h2/java/Statement.java

@@ -344,7 +344,7 @@ class ForStatement extends StatementBase {
 
     @Override
     public String asString() {
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
         buff.append("for (");
         if (iterableType != null) {
             Type it = iterable.getType();