Formatting

h2/src/docsrc/textbase/_messages_en.prop

@@ -4,7 +4,8 @@
 08000=Error opening database: {0}
 21S02=Column count does not match
 22001=Value too long for column {0}: {1}
-22003=Numeric value out of range: {0} {1}
+22003=Numeric value out of range: {0}
+22004=Numeric value out of range: {0} in column {1}
 22007=Cannot parse {0} constant {1}
 22012=Division by zero: {0}
 22018=Data conversion error converting {0}

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

@@ -333,25 +333,19 @@ public class AlterTableAddConstraint extends SchemaCommand {
 
     // all cols must be in the index key, the order doesn't matter and there
     // must be no other fields in the index key
-    private static boolean canUseUniqueIndex(Index idx, Table table,
-        IndexColumn[] cols) {
+    private static boolean canUseUniqueIndex(Index idx, Table table, IndexColumn[] cols) {
         if (idx.getTable() != table || !idx.getIndexType().isUnique()) {
             return false;
         }
         Column[] indexCols = idx.getColumns();
-
         HashSet<Column> indexColsSet = New.hashSet();
-
         for (Column c : indexCols) {
             indexColsSet.add(c);
         }
-
         HashSet<Column> colsSet = New.hashSet();
-
         for (IndexColumn c : cols) {
             colsSet.add(c.column);
         }
-
         return colsSet.equals(indexColsSet);
     }
 

h2/src/main/org/h2/command/dml/Set.java

@@ -535,13 +535,11 @@ public class Set extends Prepared {
             database.setAllowBuiltinAliasOverride(value == 1);
             break;
         }
-            
         case SetTypes.COLUMN_NAME_RULES: {
             session.getUser().checkAdmin();
             session.getColumnNamerConfiguration().configure(expression.getColumnName());
             break;
         }
-                        
         default:
             DbException.throwInternalError("type="+type);
         }

h2/src/main/org/h2/res/_messages_cs.prop

@@ -4,7 +4,7 @@
 08000=Chyba při otevírání databáze: {0}
 21S02=Počet sloupců nesouhlasí
 22001=Příliš dlouhá hodnota pro sloupec {0}: {1}
-22003=Číselná hodnota je mimo rozsah: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Nelze zpracovat konstantu {0} {1}
 22012=Dělení nulou: {0}

h2/src/main/org/h2/res/_messages_de.prop

@@ -4,7 +4,7 @@
 08000=Fehler beim Öffnen der Datenbank: {0}
 21S02=Anzahl der Felder stimmt nicht überein
 22001=Wert zu gross / lang für Feld {0}: {1}
-22003=Zahlenwert ausserhalb des Bereichs: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Kann {0} {1} nicht umwandeln
 22012=Division durch 0: {0}

h2/src/main/org/h2/res/_messages_es.prop

@@ -4,7 +4,7 @@
 08000=Error abriendo la base de datos: {0}
 21S02=La cantidad de columnas no coincide
 22001=Valor demasiado largo para la columna {0}: {1}
-22003=Valor numerico fuera de rango: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Imposible interpretar la constante {0} {1}
 22012=División por cero: {0}

h2/src/main/org/h2/res/_messages_fr.prop

@@ -4,7 +4,8 @@
 08000=Une erreur est survenue lors de l'ouverture de la base de données: {0}
 21S02=Le nombre de colonnes ne correspond pas
 22001=Valeur trop longue pour la colonne {0}: {1}
-22003=Valeur numérique hors de portée: {0}
+22003=#Numeric value out of range: {0}
+22004=#Numeric value out of range: {0} in column {1}
 22007=Impossible d'analyser {0} constante {1}
 22012=Division par zéro: {0}
 22018=Erreur lors de la conversion de données {0}
@@ -100,7 +101,7 @@
 90066=Propriété dupliquée {0}
 90067=La connexion est cassée: {0}
 90068=L'expression Order by {0} doit être dans ce cas dans la liste des résultats
-90069Le rôle {0} existe déjà
+90069=#Role {0} already exists
 90070=Rôle {0} non trouvé
 90071=Utilisateur ou rôle {0} non trouvé
 90072=Les rôles et les droits ne peuvent être mélangés
@@ -171,7 +172,7 @@
 90140='ensemble des résultats est en lecture seule. Vous pouvez avoir besoin d'utiliser conn.createStatement(.., ResultSet.CONCUR_UPDATABLE).
 90141=Le sérialiseur ne peut être changé parce que il y a des données dans la table: {0}
 90142=La taille de l'étape ne doit pas être de 0
-90143=#Ligne {1} non trouvée dans l'index principal {0}
+90143=##Row {1} not found in primary index {0}
 HY000=Erreur générale: {0}
 HY004=Type de données inconnu: {0}
 HYC00=Fonctionnalité non supportée: {0}

h2/src/main/org/h2/res/_messages_ja.prop

@@ -4,7 +4,7 @@
 08000=データベースオープンエラー: {0}
 21S02=列番号が一致しません
 22001=列 {0} の値が長過ぎます: {1}
-22003=範囲外の数値です: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007={0} 定数 {1} を解析できません
 22012=ゼロで除算しました: {0}

h2/src/main/org/h2/res/_messages_pl.prop

@@ -4,7 +4,7 @@
 08000=Błąd otwarcia bazy danych: {0}
 21S02=Niezgodna ilość kolumn
 22001=Wartość za długa dla kolumny {0}: {1}
-22003=Wartość numeryczna poza zakresem: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Nie można odczytać {0} jako {1}
 22012=Dzielenie przez zero: {0}

h2/src/main/org/h2/res/_messages_pt_br.prop

@@ -4,7 +4,7 @@
 08000=Erro ao abrir a base de dados: {0}
 21S02=A quantidade de colunas não corresponde
 22001=Valor muito longo para a coluna {0}: {1}
-22003=Valor númerico não esta dentro do limite: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Não é possível converter {1} para {0}
 22012=Divisão por zero: {0}

h2/src/main/org/h2/res/_messages_ru.prop

@@ -4,7 +4,7 @@
 08000=Ошибка при открытии базы данных: {0}
 21S02=Неверное количество столбцов
 22001=Значение слишком длинное для поля {0}: {1}
-22003=Численное значение вне допустимого диапазона: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Невозможно преобразование строки {1} в тип {0}
 22012=Деление на ноль: {0}

h2/src/main/org/h2/res/_messages_sk.prop

@@ -4,7 +4,7 @@
 08000=Chyba otvorenia databázy: {0}
 21S02=Počet stĺpcov sa nezhoduje
 22001=Hodnota je príliš dlhá pre stĺpec {0}: {1}
-22003=Číselná hodnota mimo rozsah: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=Nemožem rozobrať {0} konštantu {1}
 22012=Delenie nulou: {0}

h2/src/main/org/h2/res/_messages_zh_cn.prop

@@ -4,7 +4,7 @@
 08000=开启数据库错误: {0}
 21S02=字段数目不匹配
 22001=字段 {0}数值太大: {1}
-22003=数值超出范围: {0}
+22003=#Numeric value out of range: {0}
 22004=Numeric value out of range: {0} in column {1}
 22007=不能解析字段 {0} 的数值 :{1}
 22012=除数为零: {0}

h2/src/main/org/h2/tools/CreateCluster.java

@@ -103,16 +103,13 @@ public class CreateCluster extends Tool {
             String user, String password, String serverList) throws SQLException {
         org.h2.Driver.load();
 
-        try (Connection connSource = DriverManager.getConnection(
         // use cluster='' so connecting is possible
         // even if the cluster is enabled
-                     urlSource + ";CLUSTER=''", user, password);
-             Statement statSource = connSource.createStatement())
-        {
+        try (Connection connSource = DriverManager.getConnection(urlSource + ";CLUSTER=''", user, password);
+                Statement statSource = connSource.createStatement()) {
             // enable the exclusive mode and close other connections,
             // so that data can't change while restoring the second database
             statSource.execute("SET EXCLUSIVE 2");
-
             try {
                 performTransfer(statSource, urlTarget, user, password, serverList);
             } finally {
@@ -122,14 +119,12 @@ public class CreateCluster extends Tool {
         }
     }
 
-    private static void performTransfer(Statement statSource, String urlTarget,
-            String user, String password, String serverList) throws SQLException {
+    private static void performTransfer(Statement statSource, String urlTarget, String user, String password,
+            String serverList) throws SQLException {
 
         // Delete the target database first.
-        try (Connection connTarget = DriverManager.getConnection(
-                     urlTarget + ";CLUSTER=''", user, password);
-             Statement statTarget = connTarget.createStatement())
-        {
+        try (Connection connTarget = DriverManager.getConnection(urlTarget + ";CLUSTER=''", user, password);
+                Statement statTarget = connTarget.createStatement()) {
             statTarget.execute("DROP ALL OBJECTS DELETE FILES");
         }
 
@@ -137,10 +132,8 @@ public class CreateCluster extends Tool {
             Future<?> threadFuture = startWriter(pipeReader, statSource);
 
             // Read data from pipe reader, restore on target.
-            try (Connection connTarget = DriverManager.getConnection(
-                         urlTarget, user, password);
-                 Statement statTarget = connTarget.createStatement())
-            {
+            try (Connection connTarget = DriverManager.getConnection(urlTarget, user, password);
+                    Statement statTarget = connTarget.createStatement()) {
                 RunScript.execute(connTarget, pipeReader);
 
                 // Check if the writer encountered any exception
@@ -170,17 +163,13 @@ public class CreateCluster extends Tool {
         Future<?> threadFuture = thread.submit(new Runnable() {
             @Override
             public void run() {
-                /*
-                 * If the creation of the piped writer fails, the reader will
-                 * throw an IOException as soon as read() is called:
-                 * IOException - if the pipe is broken, unconnected, closed,
-                 * or an I/O error occurs.
-                 * The reader's IOException will then trigger the finally{} that
-                 * releases exclusive mode on the source DB.
-                 */
+                // If the creation of the piped writer fails, the reader will
+                // throw an IOException as soon as read() is called: IOException
+                // - if the pipe is broken, unconnected, closed, or an I/O error
+                // occurs. The reader's IOException will then trigger the
+                // finally{} that releases exclusive mode on the source DB.
                 try (final PipedWriter pipeWriter = new PipedWriter(pipeReader);
-                     final ResultSet rs = statSource.executeQuery("SCRIPT"))
-                {
+                        final ResultSet rs = statSource.executeQuery("SCRIPT")) {
                     while (rs.next()) {
                         pipeWriter.write(rs.getString(1) + "\n");
                     }

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

+/*
+ * Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (http://h2database.com/html/license.html).
+ */
 package org.h2.util;
 
 import java.util.HashSet;
@@ -6,7 +10,9 @@ import java.util.regex.Matcher;
 import org.h2.engine.Session;
 import org.h2.expression.Expression;
 
-
+/**
+ * A factory for column names.
+ */
 public class ColumnNamer {
 
     private static final String DEFAULT_COLUMN_NAME = "DEFAULT";
@@ -17,14 +23,13 @@ public class ColumnNamer {
 
     public ColumnNamer(Session session) {
         this.session = session;
-        if(this.session!=null && this.session.getColumnNamerConfiguration()!=null){
+        if (this.session != null && this.session.getColumnNamerConfiguration() != null) {
             // use original from session
             this.configuration = this.session.getColumnNamerConfiguration();
-        }
-        else{
+        } else {
             // detached namer, create new
             this.configuration = ColumnNamerConfiguration.getDefault();
-            if(session!=null){
+            if (session != null) {
                 session.setColumnNamerConfiguration(this.configuration);
             }
         }
@@ -36,7 +41,7 @@ public class ColumnNamer {
      * @param indexOfColumn index of column in below array
      */
     public String getColumnName(Expression expr, int indexOfColumn) {
-        return getColumnName(expr,indexOfColumn,(String) null);
+        return getColumnName(expr, indexOfColumn, (String) null);
     }
 
     /**
@@ -64,18 +69,17 @@ public class ColumnNamer {
     public String getColumnName(Expression columnExp, int indexOfColumn, String columnNameOverride) {
         // try a name from the column name override
         String columnName = null;
-        if (columnNameOverride != null){
+        if (columnNameOverride != null) {
             columnName = columnNameOverride;
-            if(!isAllowableColumnName(columnName)){
+            if (!isAllowableColumnName(columnName)) {
                 columnName = fixColumnName(columnName);
             }
-            if(!isAllowableColumnName(columnName)){
+            if (!isAllowableColumnName(columnName)) {
                 columnName = null;
             }
         }
         // try a name from the column alias
-        if (columnName==null && columnExp.getAlias()!=null &&
-                !DEFAULT_COLUMN_NAME.equals(columnExp.getAlias())) {
+        if (columnName == null && columnExp.getAlias() != null && !DEFAULT_COLUMN_NAME.equals(columnExp.getAlias())) {
             columnName = columnExp.getAlias();
             if (!isAllowableColumnName(columnName)) {
                 columnName = fixColumnName(columnName);
@@ -85,8 +89,8 @@ public class ColumnNamer {
             }
         }
         // try a name derived from the column expression SQL
-        if (columnName == null && columnExp.getColumnName() != null &&
-                !DEFAULT_COLUMN_NAME.equals(columnExp.getColumnName())) {
+        if (columnName == null && columnExp.getColumnName() != null
+                && !DEFAULT_COLUMN_NAME.equals(columnExp.getColumnName())) {
             columnName = columnExp.getColumnName();
             if (!isAllowableColumnName(columnName)) {
                 columnName = fixColumnName(columnName);
@@ -96,8 +100,7 @@ public class ColumnNamer {
             }
         }
         // try a name derived from the column expression plan SQL
-        if (columnName == null && columnExp.getSQL() != null &&
-                !DEFAULT_COLUMN_NAME.equals(columnExp.getSQL())) {
+        if (columnName == null && columnExp.getSQL() != null && !DEFAULT_COLUMN_NAME.equals(columnExp.getSQL())) {
             columnName = columnExp.getSQL();
             if (!isAllowableColumnName(columnName)) {
                 columnName = fixColumnName(columnName);
@@ -121,7 +124,7 @@ public class ColumnNamer {
         String newColumnName = columnName;
         int loopCount = 2;
         while (existingColumnNames.contains(newColumnName)) {
-            String loopCountString = "_"+loopCount;
+            String loopCountString = "_" + loopCount;
             newColumnName = columnName.substring(0,
                     Math.min(columnName.length(), configuration.getMaxIdentiferLength() - loopCountString.length()))
                     + loopCountString;
@@ -130,10 +133,10 @@ public class ColumnNamer {
         return newColumnName;
     }
 
-    public boolean isAllowableColumnName(String proposedName){
+    public boolean isAllowableColumnName(String proposedName) {
 
         // check null
-        if (proposedName == null){
+        if (proposedName == null) {
             return false;
         }
         // check size limits
@@ -152,8 +155,8 @@ public class ColumnNamer {
         proposedName = match.replaceAll("");
 
         // check size limits - then truncate
-        if (proposedName.length() > configuration.getMaxIdentiferLength()){
-            proposedName=proposedName.substring(0, configuration.getMaxIdentiferLength());
+        if (proposedName.length() > configuration.getMaxIdentiferLength()) {
+            proposedName = proposedName.substring(0, configuration.getMaxIdentiferLength());
         }
 
         return proposedName;

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

+/*
+ * Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (http://h2database.com/html/license.html).
+ */
 package org.h2.util;
 
 import java.util.regex.Pattern;
@@ -5,7 +9,11 @@ import org.h2.engine.Mode.ModeEnum;
 import static org.h2.engine.Mode.ModeEnum.*;
 import org.h2.message.DbException;
 
+/**
+ * The configuration for the allowed column names.
+ */
 public class ColumnNamerConfiguration {
+
     private static final String DEFAULT_COMMAND = "DEFAULT";
     private static final String REGULAR_EXPRESSION_MATCH_DISALLOWED = "REGULAR_EXPRESSION_MATCH_DISALLOWED = ";
     private static final String REGULAR_EXPRESSION_MATCH_ALLOWED = "REGULAR_EXPRESSION_MATCH_ALLOWED = ";
@@ -41,7 +49,7 @@ public class ColumnNamerConfiguration {
     }
 
     public void setMaxIdentiferLength(int maxIdentiferLength) {
-        this.maxIdentiferLength = Math.max(30,maxIdentiferLength);
+        this.maxIdentiferLength = Math.max(30, maxIdentiferLength);
         if (maxIdentiferLength != getMaxIdentiferLength()) {
             throw DbException.getInvalidValueException("Illegal value (<30) in SET COLUMN_NAME_RULES",
                     "MAX_IDENTIFIER_LENGTH=" + maxIdentiferLength);
@@ -89,12 +97,11 @@ public class ColumnNamerConfiguration {
     }
 
     public void configure(String stringValue) {
-        try{
+        try {
             if (stringValue.equalsIgnoreCase(DEFAULT_COMMAND)) {
                 configure(REGULAR);
             } else if (stringValue.startsWith(EMULATE_COMMAND)) {
-                configure(ModeEnum.valueOf(
-                        unquoteString(stringValue.substring(EMULATE_COMMAND.length()))));
+                configure(ModeEnum.valueOf(unquoteString(stringValue.substring(EMULATE_COMMAND.length()))));
             } else if (stringValue.startsWith(MAX_IDENTIFIER_LENGTH)) {
                 int maxLength = Integer.parseInt(stringValue.substring(MAX_IDENTIFIER_LENGTH.length()));
                 setMaxIdentiferLength(maxLength);
@@ -113,38 +120,34 @@ public class ColumnNamerConfiguration {
             } else {
                 throw DbException.getInvalidValueException("SET COLUMN_NAME_RULES: unknown id:" + stringValue,
                         stringValue);
-
             }
-
             recompilePatterns();
         }
-        //Including NumberFormatException|PatternSyntaxException
-        catch(RuntimeException e){
-            throw DbException.getInvalidValueException("SET COLUMN_NAME_RULES:"+e.getMessage(),
-                    stringValue);
+        // Including NumberFormatException|PatternSyntaxException
+        catch (RuntimeException e) {
+            throw DbException.getInvalidValueException("SET COLUMN_NAME_RULES:" + e.getMessage(), stringValue);
 
         }
     }
 
     private void recompilePatterns() {
-        try{
+        try {
             // recompile RE patterns
             setCompiledRegularExpressionMatchAllowed(Pattern.compile(getRegularExpressionMatchAllowed()));
             setCompiledRegularExpressionMatchDisallowed(Pattern.compile(getRegularExpressionMatchDisallowed()));
-        }
-        catch(Exception e){
+        } catch (Exception e) {
             configure(REGULAR);
             throw e;
         }
     }
 
-    public static ColumnNamerConfiguration getDefault(){
-        return new ColumnNamerConfiguration(Integer.MAX_VALUE, "(?m)(?s).+", "(?m)(?s)[\\x00]", "_UNNAMED_$$",false);
+    public static ColumnNamerConfiguration getDefault() {
+        return new ColumnNamerConfiguration(Integer.MAX_VALUE, "(?m)(?s).+", "(?m)(?s)[\\x00]", "_UNNAMED_$$", false);
     }
 
-    private static String unquoteString(String s){
-        if(s.startsWith("'") && s.endsWith("'")){
-            s = s.substring(1, s.length()-1);
+    private static String unquoteString(String s) {
+        if (s.startsWith("'") && s.endsWith("'")) {
+            s = s.substring(1, s.length() - 1);
             return s;
         }
         return s;
@@ -159,7 +162,7 @@ public class ColumnNamerConfiguration {
     }
 
     public void configure(ModeEnum modeEnum) {
-        switch(modeEnum){
+        switch (modeEnum) {
         case Oracle:
             // Nonquoted identifiers can contain only alphanumeric characters
             // from your database character set and the underscore (_), dollar
@@ -174,14 +177,16 @@ public class ColumnNamerConfiguration {
         case MSSQLServer:
             // https://docs.microsoft.com/en-us/sql/sql-server/maximum-capacity-specifications-for-sql-server
             setMaxIdentiferLength(128);
-            setRegularExpressionMatchAllowed("(?m)(?s)[A-Za-z0-9_\\[\\]]+");// allows [] around names
+            // allows [] around names
+            setRegularExpressionMatchAllowed("(?m)(?s)[A-Za-z0-9_\\[\\]]+");
             setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\\[\\]]");
             setDefaultColumnNamePattern("_UNNAMED_$$");
             setGenerateUniqueColumnNames(false);
             break;
 
         case PostgreSQL:
-            setMaxIdentiferLength(63);// this default can be changed to 128 by postgres config
+            // this default can be changed to 128 by postgres config
+            setMaxIdentiferLength(63);
             setRegularExpressionMatchAllowed("(?m)(?s)[A-Za-z0-9_\\$]+");
             setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\\$]");
             setDefaultColumnNamePattern("_UNNAMED_$$");
@@ -189,7 +194,7 @@ public class ColumnNamerConfiguration {
             break;
 
         case MySQL:
-            //https://dev.mysql.com/doc/refman/5.7/en/identifiers.html
+            // https://dev.mysql.com/doc/refman/5.7/en/identifiers.html
             setMaxIdentiferLength(64);
             setRegularExpressionMatchAllowed("(?m)(?s)`?[A-Za-z0-9_`\\$]+`?");
             setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_`\\$]");

h2/src/test/org/h2/test/TestAll.java

@@ -227,10 +227,10 @@ import org.h2.test.unit.TestValueHashMap;
 import org.h2.test.unit.TestValueMemory;
 import org.h2.test.utils.OutputCatcher;
 import org.h2.test.utils.SelfDestructor;
+import org.h2.test.utils.TestColumnNamer;
 import org.h2.tools.DeleteDbFiles;
 import org.h2.tools.Server;
 import org.h2.util.AbbaLockingDetector;
-import org.h2.util.TestColumnNamer;
 import org.h2.util.New;
 import org.h2.util.Profiler;
 import org.h2.util.StringUtils;

h2/src/test/org/h2/test/bench/BenchB.java

@@ -133,6 +133,12 @@ public class BenchB implements Bench, Runnable {
 //        db.end();
     }
 
+    /**
+     * Get the number of transactions per client.
+     *
+     * @param size test size
+     * @return the transactions per client
+     */
     protected int getTransactionsPerClient(int size) {
         return size / 8;
     }

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

@@ -1417,13 +1417,9 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         assertEquals(date, ToDateParser.toDate("113029", "J"));
 
         if (Locale.getDefault() == Locale.ENGLISH) {
-          date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
-                .parse("9999-12-31T23:59:59");
-          assertEquals(date, ToDateParser.toDate("31-DEC-9999 23:59:59",
-                "DD-MON-YYYY HH24:MI:SS"));
-          assertEquals(date, ToDateParser.toDate("31-DEC-9999 23:59:59",
-                "DD-MON-RRRR HH24:MI:SS"));
-
+            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse("9999-12-31T23:59:59");
+            assertEquals(date, ToDateParser.toDate("31-DEC-9999 23:59:59", "DD-MON-YYYY HH24:MI:SS"));
+            assertEquals(date, ToDateParser.toDate("31-DEC-9999 23:59:59", "DD-MON-RRRR HH24:MI:SS"));
             SimpleDateFormat ymd = new SimpleDateFormat("yyyy-MM-dd");
             assertEquals(ymd.parse("0001-03-01"), ToDateParser.toDate("1-MAR-0001", "DD-MON-RRRR"));
             assertEquals(ymd.parse("9999-03-01"), ToDateParser.toDate("1-MAR-9999", "DD-MON-RRRR"));

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

@@ -520,18 +520,17 @@ public class TestGeneralCommonTableQueries extends TestBase {
             +"INSERT INTO C VALUES(null, 'banapple');           "
             +"INSERT INTO A VALUES('meat');                     "
             ;
-        String WITH_QUERY =
-            "WITH BB as (SELECT                        \n"
-            +"sum(1) as X,                             \n"
-            +"a                                        \n"
-            +"FROM B                                   \n"
-            +"JOIN C ON B.val=C.b                      \n"
-            +"GROUP BY a)                              \n"
-            +"SELECT                                   \n"
-            +"A.val,                                   \n"
-            +"sum(SELECT X FROM BB WHERE BB.a IS A.val)\n"//AS SUM_X
-            +"FROM A                                   \n"
-            +"GROUP BY A.val";
+        String WITH_QUERY = "WITH BB as (SELECT                        \n" +
+            "sum(1) as X,                             \n" +
+            "a                                        \n" +
+            "FROM B                                   \n" +
+            "JOIN C ON B.val=C.b                      \n" +
+            "GROUP BY a)                              \n" +
+            "SELECT                                   \n" +
+            "A.val,                                   \n" +
+            "sum(SELECT X FROM BB WHERE BB.a IS A.val)\n" +
+            // AS SUM_X
+            "FROM A                                   \n" + "GROUP BY A.val";
 
         for(int queryRunTries=1;queryRunTries<4;queryRunTries++){
             Statement stat = conn.createStatement();

h2/src/test/org/h2/test/jdbc/TestConnection.java

@@ -61,25 +61,17 @@ public class TestConnection extends TestBase {
         // Use MySQL-mode since this allows all property names
         // (apart from h2 internal names).
         Connection conn = getConnection("clientInfoMySQL;MODE=MySQL");
-
         String numServersPropertyName = "numServers";
-
         String numServers = conn.getClientInfo(numServersPropertyName);
-
         conn.setClientInfo(numServersPropertyName, numServers);
-
         assertEquals(conn.getClientInfo(numServersPropertyName), numServers);
-
         conn.close();
     }
 
-
     private void testSetUnsupportedClientInfoProperties() throws SQLException {
         Connection conn = getConnection("clientInfo");
-
         Properties properties = new Properties();
         properties.put("ClientUser", "someUser");
-
         assertThrows(SQLClientInfoException.class, conn).setClientInfo(properties);
         conn.close();
     }

h2/src/test/org/h2/util/TestColumnNamer.java → h2/src/test/org/h2/test/utils/TestColumnNamer.java

-package org.h2.util;
-
+/*
+ * Copyright 2004-2014 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (http://h2database.com/html/license.html).
+ */
+package org.h2.test.utils;
 
 import org.h2.expression.Expression;
 import org.h2.expression.ValueExpression;
 import org.h2.test.TestBase;
+import org.h2.util.ColumnNamer;
 
+/**
+ * Tests the column name factory.
+ */
 public class TestColumnNamer extends TestBase {
 
-    private String[] ids = new String[]{
-      "ABC"
-      ,"123"
-      ,"a\n2"
-      ,"a$c%d#e@f!."
-      ,null
-      ,"VERYVERYVERYVERYVERYVERYLONGVERYVERYVERYVERYVERYVERYLONGVERYVERYVERYVERYVERYVERYLONG"
-      ,"'!!!'"
-      ,"'!!!!'"
-      ,"3.1415"
-      ,"\r"
-      ,"col1"
-      ,"col1"
-      ,"col1"
-      ,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2"
-      ,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2"
-    };
-    
-    private String[] expectedColumnName= {"ABC"
-            ,"123"
-            ,"a2"
-            ,"acdef"
-            ,"colName6"
-            ,"VERYVERYVERYVERYVERYVERYLONGVE"
-            ,"colName8"
-            ,"colName9"
-            ,"31415"
-            ,"colName11"
-            ,"col1"
-            ,"col1_2"
-            ,"col1_3"
-            ,"col2col2col2col2col2col2col2co"
-            ,"col2col2col2col2col2col2col2_2"};    
-    public static void main(String[] args){
-        
+    private String[] ids = new String[] { "ABC", "123", "a\n2", "a$c%d#e@f!.", null,
+            "VERYVERYVERYVERYVERYVERYLONGVERYVERYVERYVERYVERYVERYLONGVERYVERYVERYVERYVERYVERYLONG", "'!!!'", "'!!!!'",
+            "3.1415", "\r", "col1", "col1", "col1",
+            "col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2",
+            "col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2" };
+
+    private String[] expectedColumnName = { "ABC", "123", "a2", "acdef", "colName6", "VERYVERYVERYVERYVERYVERYLONGVE",
+            "colName8", "colName9", "31415", "colName11", "col1", "col1_2", "col1_3", "col2col2col2col2col2col2col2co",
+            "col2col2col2col2col2col2col2_2" };
+
+    /**
+     * Run just this test.
+     *
+     * @param a ignored
+     */
+    public static void main(String[] args) {
         new TestColumnNamer().test();
     }
 
@@ -53,14 +41,14 @@ public class TestColumnNamer extends TestBase {
         columnNamer.getConfiguration().configure("DEFAULT_COLUMN_NAME_PATTERN = 'colName$$'");
         columnNamer.getConfiguration().configure("GENERATE_UNIQUE_COLUMN_NAMES = 1");
 
-        int index =0;
-        for(String id : ids){
+        int index = 0;
+        for (String id : ids) {
             Expression columnExp = ValueExpression.getDefault();
-            String newColumnName = columnNamer.getColumnName(columnExp , index+1, id);
-            assertTrue(newColumnName!=null);
-            assertTrue(newColumnName.length()<=30);
-            assertTrue(newColumnName.length()>=1);
-            assertEquals(newColumnName,expectedColumnName[index]);
+            String newColumnName = columnNamer.getColumnName(columnExp, index + 1, id);
+            assertTrue(newColumnName != null);
+            assertTrue(newColumnName.length() <= 30);
+            assertTrue(newColumnName.length() >= 1);
+            assertEquals(newColumnName, expectedColumnName[index]);
             index++;
         }
     }

h2/src/tools/org/h2/build/code/CheckTextFiles.java

@@ -20,8 +20,8 @@ public class CheckTextFiles {
     private static final int MAX_SOURCE_LINE_SIZE = 120;
 
     // must contain "+" otherwise this here counts as well
-    private static final String COPYRIGHT = "Copyright 2004-2014 " +
-            "H2 Group.";
+    private static final String COPYRIGHT1 = "Copyright 2004-201";
+    private static final String COPYRIGHT2 = "H2 Group.";
     private static final String LICENSE = "Multiple-Licensed " +
             "under the MPL 2.0";
 
@@ -144,10 +144,13 @@ public class CheckTextFiles {
         in.readFully(data);
         in.close();
         if (checkLicense) {
-            if (data.length > COPYRIGHT.length() + LICENSE.length()) {
+            if (data.length > COPYRIGHT1.length() + LICENSE.length()) {
                 // don't check tiny files
                 String text = new String(data);
-                if (text.indexOf(COPYRIGHT) < 0) {
+                if (text.indexOf(COPYRIGHT1) < 0) {
+                    fail(file, "copyright is missing", 0);
+                }
+                if (text.indexOf(COPYRIGHT2) < 0) {
                     fail(file, "copyright is missing", 0);
                 }
                 if (text.indexOf(LICENSE) < 0) {

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

@@ -747,3 +747,10 @@ vectorwise preparation corrupting cubrid diffing unrestricted cleanups warns
 rowspan specifically unoptimized stand emphasize cascaded exasol minimize rnum figure
 emptying goal gathers multithread amend raised iter gathered gather especially requiring
 collaboration thank essentially bunch vmlens subroutines nulled
+
+ndx quoss isn nonquoted pippin variation pierre allowable granny liberty fkey kervin veg banapple unconnected
+alphanumeric england acdef landry arun mederp detached lyderic imperator morocco sumx websphere fruit
+joaquim overides altertable novalidate udomain managed rewritten unquote identifer jake innocuous golay
+bellotti clemens donators domainusername
+veryveryveryveryveryverylongveryveryveryveryveryverylongveryveryveryveryveryverylong namer veryveryveryveryveryverylongve
+chittanoor carrot