Documentation

h2/src/docsrc/html/changelog.html

@@ -20,21 +20,21 @@ Change Log
 <h2>Next Version (unreleased)</h2>
 <ul><li>New built-in function ARRAY_CONTAINS.
 </li><li>Some DatabaseMetaData methods didn't work when using ALLOW_LITERALS NONE.
-</li><li>Trying to convert a VARCHAR to UUID will now fail if the text contains 
+</li><li>Trying to convert a VARCHAR to UUID will now fail if the text contains
     a character that is not a hex digit, '-', or not a whitespace.
 </li><li>TriggerAdapter: in "before" triggers, values can be changed using the ResultSet.updateX methods.
 </li><li>Creating a table with column data type NULL now works (even if not very useful).
 </li><li>ALTER TABLE ALTER COLUMN no longer copies the data for widening conversions
     (for example if only the precision was increased) unless necessary.
 </li><li>Multi-threaded kernel: concurrently running an online backup
-    and updating the database resulted in a broken (transactionally incorrect) 
+    and updating the database resulted in a broken (transactionally incorrect)
     backup file in some cases.
 </li><li>The script created by SCRIPT DROP did not always work if multiple views
     existed that depend on each other.
 </li><li>MathUtils.getSecureRandom could log a warning to System.err in case
     the /dev/random is very slow, and the System.getProperties().toString()
-    returned a string larger than 64 KB. 
-</li><li>The database file locking mechanism "FS" (;FILE_LOCK=FS) 
+    returned a string larger than 64 KB.
+</li><li>The database file locking mechanism "FS" (;FILE_LOCK=FS)
     did not work on Linux since version 1.3.161.
 </li><li>Sequences: the functions NEXTVAL and CURRVAL did not work as expected
     when using quoted, mixed case sequence names.

h2/src/main/org/h2/res/help.csv

@@ -1234,7 +1234,7 @@ Returns the length of an array."
 "Functions (System)","ARRAY_CONTAINS","
 ARRAY_CONTAINS(arrayExpression, value)
 ","
-Returns true if the array contains the value."
+Returns a boolean true if the array contains the value."
 "Functions (System)","AUTOCOMMIT","
 AUTOCOMMIT()
 ","

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

@@ -650,6 +650,7 @@ public class Column {
      * Check whether the new column is of the same type and not more restricted
      * than this column.
      *
+     * @param newColumn the new (target) column
      * @return true if the new column is compatible
      */
     public boolean isWideningConversion(Column newColumn) {
@@ -689,26 +690,31 @@ public class Column {
         return true;
     }
 
-    public void copy(Column newColumn) {
-        checkConstraint = newColumn.checkConstraint;
-        checkConstraintSQL = newColumn.checkConstraintSQL;
-        displaySize = newColumn.displaySize;
-        name = newColumn.name;
-        precision = newColumn.precision;
-        scale = newColumn.scale;
+    /**
+     * Copy the data of the source column into the current column.
+     *
+     * @param source the source column
+     */
+    public void copy(Column source) {
+        checkConstraint = source.checkConstraint;
+        checkConstraintSQL = source.checkConstraintSQL;
+        displaySize = source.displaySize;
+        name = source.name;
+        precision = source.precision;
+        scale = source.scale;
         // table is not set
         // columnId is not set
-        nullable = newColumn.nullable;
-        defaultExpression = newColumn.defaultExpression;
-        originalSQL = newColumn.originalSQL;
+        nullable = source.nullable;
+        defaultExpression = source.defaultExpression;
+        originalSQL = source.originalSQL;
         // autoIncrement, start, increment is not set
-        convertNullToDefault = newColumn.convertNullToDefault;
-        sequence = newColumn.sequence;
-        comment = newColumn.comment;
-        computeTableFilter = newColumn.computeTableFilter;
-        isComputed = newColumn.isComputed;
-        selectivity = newColumn.selectivity;
-        primaryKey = newColumn.primaryKey;
+        convertNullToDefault = source.convertNullToDefault;
+        sequence = source.sequence;
+        comment = source.comment;
+        computeTableFilter = source.computeTableFilter;
+        isComputed = source.isComputed;
+        selectivity = source.selectivity;
+        primaryKey = source.primaryKey;
     }
 
 }

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

@@ -137,7 +137,8 @@ public class TestAlter extends TestBase {
     }
 
     private void testAlterTableAlterColumn2() throws SQLException {
-        // ensure that increasing a VARCHAR columns length takes effect because we optimise this case
+        // ensure that increasing a VARCHAR columns length takes effect because
+        // we optimize this case
         stat.execute("create table t(x varchar(2)) as select 'x'");
         stat.execute("alter table t alter column x varchar(20)");
         stat.execute("insert into t values('Hello')");

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

@@ -128,7 +128,8 @@ public class TestBackup extends TestBase {
                 // ignore
             }
             if (x % 400 == 0) {
-                // System.out.println("state: " + state + " name: " + name + " x:" + x + "/" + max);
+                // System.out.println("state: " + state +
+                //    " name: " + name + " x:" + x + "/" + max);
             }
         }
 

h2/src/test/org/h2/test/unit/TestFileLockProcess.java

@@ -70,7 +70,7 @@ public class TestFileLockProcess extends TestBase {
         deleteDb("lock");
     }
 
-    public void test(int count, String url) throws Exception {
+    private void test(int count, String url) throws Exception {
         Connection conn = DriverManager.getConnection(url);
         String selfDestruct = SelfDestructor.getPropertyString(60);
         String[] procDef = { "java", selfDestruct,

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -696,4 +696,4 @@ pst patadia summertime jalpesh scheme compilable ski takanori dsts kawashima
 kokoci seldom jaros ciphers srcs invectorate noah nfontes fontes recoding
 minecraft videos youtube dataflyer bukkit alessio adamo jacopo angel leon frost
 deserializing eckenfelder daniel serodio dirname semicolons whose stretch
-stabilize succeeded
+stabilize succeeded widening optimise deprecate increasing