Formatting

h2/src/docsrc/html/changelog.html

@@ -21,15 +21,15 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
-<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS 
+<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS
 </li>
 <li>Issue #668: Fail of an update command on large table with ENUM column
 </li>
-<li>Issue #662: column called CONSTRAINT is not properly escaped when storing to metadata 
+<li>Issue #662: column called CONSTRAINT is not properly escaped when storing to metadata
 </li>
 <li>Issue #660: Outdated java version mentioned on http://h2database.com/html/build.html#providing_patches
 </li>
-<li>Issue #643: H2 doesn't use index when I use IN and EQUAL in one query 
+<li>Issue #643: H2 doesn't use index when I use IN and EQUAL in one query
 </li>
 <li>Reset transaction start timestamp on ROLLBACK
 </li>

h2/src/docsrc/html/history.html

@@ -90,7 +90,7 @@ Java implementations (such as Swing) are not used, or only used for optional fea
 <h2 id="supporters">Supporters</h2>
 <p>
 Many thanks for those who reported bugs, gave valuable feedback,
-spread the word, and translated this project. 
+spread the word, and translated this project.
 </p>
 <p>
 Also many thanks to the donors.

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,26 +333,20 @@ 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);
+        return colsSet.equals(indexColsSet);
     }
 
     private static boolean canUseIndex(Index existingIndex, Table table,

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

@@ -52,7 +52,7 @@ public class Delete extends Prepared {
     public void setCondition(Expression condition) {
         this.condition = condition;
     }
-    
+
     public Expression getCondition( ) {
         return this.condition;
     }
@@ -137,7 +137,7 @@ public class Delete extends Prepared {
         if (condition != null) {
             condition.mapColumns(targetTableFilter, 0);
             if(sourceTableFilter!=null){
-                condition.mapColumns(sourceTableFilter, 0);                
+                condition.mapColumns(sourceTableFilter, 0);
             }
             condition = condition.optimize(session);
             condition.createIndexConditions(session, targetTableFilter);
@@ -180,7 +180,7 @@ public class Delete extends Prepared {
     }
 
     public void setSourceTableFilter(TableFilter sourceTableFilter) {
-        this.sourceTableFilter = sourceTableFilter;        
+        this.sourceTableFilter = sourceTableFilter;
     }
 
     public TableFilter getTableFilter() {

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

@@ -49,7 +49,7 @@ public class Insert extends Prepared implements ResultTarget {
     private boolean insertFromSelect;
     /**
      * This table filter is for MERGE..USING support - not used in stand-alone DML
-     */    
+     */
     private TableFilter sourceTableFilter;
 
     /**
@@ -404,7 +404,7 @@ public class Insert extends Prepared implements ResultTarget {
     }
 
     public void setSourceTableFilter(TableFilter sourceTableFilter) {
-        this.sourceTableFilter = sourceTableFilter;        
+        this.sourceTableFilter = sourceTableFilter;
     }
 
 }

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

@@ -68,7 +68,7 @@ public class Merge extends Prepared {
     public void setQuery(Query query) {
         this.query = query;
     }
-    
+
     /**
      * Add a row to this merge statement.
      *
@@ -154,10 +154,10 @@ public class Merge extends Prepared {
             Parameter p = k.get(columns.length + i);
             p.setValue(v);
         }
-        
+
         // try and update
         int count = update.update();
-        
+
         // if update fails try an insert
         if (count == 0) {
             try {
@@ -315,11 +315,11 @@ public class Merge extends Prepared {
     public Table getTargetTable() {
         return targetTable;
     }
-    
+
     public TableFilter getTargetTableFilter() {
         return targetTableFilter;
     }
-    
+
     public void setTargetTableFilter(TableFilter targetTableFilter) {
         this.targetTableFilter = targetTableFilter;
         setTargetTable(targetTableFilter.getTable());

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

@@ -840,7 +840,7 @@ public class Select extends Query {
             sort = prepareOrder(orderList, expressions.size());
             orderList = null;
         }
-        ColumnNamer columnNamer= new ColumnNamer(session);        
+        ColumnNamer columnNamer= new ColumnNamer(session);
         for (int i = 0; i < expressions.size(); i++) {
             Expression e = expressions.get(i);
             String proposedColumnName = e.getAlias();

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

@@ -36,7 +36,7 @@ public class SelectListColumnResolver implements ColumnResolver {
         columns = new Column[columnCount];
         expressions = new Expression[columnCount];
         ArrayList<Expression> columnList = select.getExpressions();
-        ColumnNamer columnNamer= new ColumnNamer(select.getSession());                
+        ColumnNamer columnNamer= new ColumnNamer(select.getSession());
         for (int i = 0; i < columnCount; i++) {
             Expression expr = columnList.get(i);
             String columnName = columnNamer.getColumnName(expr, i, expr.getAlias());

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

@@ -330,7 +330,7 @@ public class SelectUnion extends Query {
         expressions = New.arrayList();
         ArrayList<Expression> le = left.getExpressions();
         ArrayList<Expression> re = right.getExpressions();
-        ColumnNamer columnNamer= new ColumnNamer(session);                        
+        ColumnNamer columnNamer= new ColumnNamer(session);
         for (int i = 0; i < len; i++) {
             Expression l = le.get(i);
             Expression r = re.get(i);

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;
+            break;
         }
-                        
         default:
             DbException.throwInternalError("type="+type);
         }

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

@@ -251,7 +251,7 @@ public class SetTypes {
      * The type of a SET COLUMN_NAME_RULES statement.
      */
     public static final int COLUMN_NAME_RULES = 48;
-    
+
 
     private static final ArrayList<String> TYPES = New.arrayList();
 
@@ -310,7 +310,7 @@ public class SetTypes {
         list.add(LAZY_QUERY_EXECUTION, "LAZY_QUERY_EXECUTION");
         list.add(BUILTIN_ALIAS_OVERRIDE, "BUILTIN_ALIAS_OVERRIDE");
         list.add(COLUMN_NAME_RULES, "COLUMN_NAME_RULES");
-        
+
     }
 
     /**

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

@@ -41,7 +41,7 @@ public class Update extends Prepared {
     private TableFilter targetTableFilter;// target of update
     /**
      * This table filter is for MERGE..USING support - not used in stand-alone DML
-     */    
+     */
     private TableFilter sourceTableFilter;
 
     /** The limit expression as specified in the LIMIT clause. */
@@ -61,7 +61,7 @@ public class Update extends Prepared {
     public void setCondition(Expression condition) {
         this.condition = condition;
     }
-    
+
     public Expression getCondition( ) {
         return this.condition;
     }

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

@@ -2453,10 +2453,10 @@ public class Database implements DataHandler {
      * @param closeOthers whether other sessions are closed
      */
     public void setExclusiveSession(Session session, boolean closeOthers) {
-      this.exclusiveSession.set(session);
-      if (closeOthers) {
-          closeAllSessionsException(session);
-      }
+        this.exclusiveSession.set(session);
+        if (closeOthers) {
+            closeAllSessionsException(session);
+        }
     }
 
     @Override

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,8 +172,8 @@
 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}
-HYT00=Dépassement du temps lors du vérrouillage de la table {0}
+HYT00=Dépassement du temps lors du vérrouillage de la table {0}
\ No newline at end of file

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())
-        {
+        // use cluster='' so connecting is possible
+        // even if the cluster is enabled
+        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,9 +89,9 @@ public class ColumnNamer {
             }
         }
         // try a name derived from the column expression SQL
-        if (columnName == null && columnExp.getColumnName() != null &&
-                !DEFAULT_COLUMN_NAME.equals(columnExp.getColumnName())) {
-             columnName =  columnExp.getColumnName();
+        if (columnName == null && columnExp.getColumnName() != null
+                && !DEFAULT_COLUMN_NAME.equals(columnExp.getColumnName())) {
+            columnName = columnExp.getColumnName();
             if (!isAllowableColumnName(columnName)) {
                 columnName = fixColumnName(columnName);
             }
@@ -96,9 +100,8 @@ 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())) {
-             columnName =  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

-package org.h2.util;
-
-import java.util.regex.Pattern;
-import org.h2.engine.Mode.ModeEnum;
-import static org.h2.engine.Mode.ModeEnum.*;
-import org.h2.message.DbException;
-
-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 = ";
-    private static final String DEFAULT_COLUMN_NAME_PATTERN = "DEFAULT_COLUMN_NAME_PATTERN = ";
-    private static final String MAX_IDENTIFIER_LENGTH = "MAX_IDENTIFIER_LENGTH = ";
-    private static final String EMULATE_COMMAND = "EMULATE = ";
-    private static final String GENERATE_UNIQUE_COLUMN_NAMES = "GENERATE_UNIQUE_COLUMN_NAMES = ";
-
-    private int maxIdentiferLength;
-    private String regularExpressionMatchAllowed;
-    private String regularExpressionMatchDisallowed;
-    private String defaultColumnNamePattern;
-    private boolean generateUniqueColumnNames;
-    private Pattern compiledRegularExpressionMatchAllowed;
-    private Pattern compiledRegularExpressionMatchDisallowed;
-
-    public ColumnNamerConfiguration(int maxIdentiferLength, String regularExpressionMatchAllowed,
-            String regularExpressionMatchDisallowed, String defaultColumnNamePattern,
-            boolean generateUniqueColumnNames) {
-
-        this.maxIdentiferLength = maxIdentiferLength;
-        this.regularExpressionMatchAllowed = regularExpressionMatchAllowed;
-        this.regularExpressionMatchDisallowed = regularExpressionMatchDisallowed;
-        this.defaultColumnNamePattern = defaultColumnNamePattern;
-        this.generateUniqueColumnNames = generateUniqueColumnNames;
-
-        compiledRegularExpressionMatchAllowed = Pattern.compile(regularExpressionMatchAllowed);
-        compiledRegularExpressionMatchDisallowed = Pattern.compile(regularExpressionMatchDisallowed);
-    }
-
-    public int getMaxIdentiferLength() {
-        return maxIdentiferLength;
-    }
-
-    public void setMaxIdentiferLength(int 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);
-        }
-    }
-
-    public String getRegularExpressionMatchAllowed() {
-        return regularExpressionMatchAllowed;
-    }
-
-    public void setRegularExpressionMatchAllowed(String regularExpressionMatchAllowed) {
-        this.regularExpressionMatchAllowed = regularExpressionMatchAllowed;
-    }
-
-    public String getRegularExpressionMatchDisallowed() {
-        return regularExpressionMatchDisallowed;
-    }
-
-    public void setRegularExpressionMatchDisallowed(String regularExpressionMatchDisallowed) {
-        this.regularExpressionMatchDisallowed = regularExpressionMatchDisallowed;
-    }
-
-    public String getDefaultColumnNamePattern() {
-        return defaultColumnNamePattern;
-    }
-
-    public void setDefaultColumnNamePattern(String defaultColumnNamePattern) {
-        this.defaultColumnNamePattern = defaultColumnNamePattern;
-    }
-
-    public Pattern getCompiledRegularExpressionMatchAllowed() {
-        return compiledRegularExpressionMatchAllowed;
-    }
-
-    public void setCompiledRegularExpressionMatchAllowed(Pattern compiledRegularExpressionMatchAllowed) {
-        this.compiledRegularExpressionMatchAllowed = compiledRegularExpressionMatchAllowed;
-    }
-
-    public Pattern getCompiledRegularExpressionMatchDisallowed() {
-        return compiledRegularExpressionMatchDisallowed;
-    }
-
-    public void setCompiledRegularExpressionMatchDisallowed(Pattern compiledRegularExpressionMatchDisallowed) {
-        this.compiledRegularExpressionMatchDisallowed = compiledRegularExpressionMatchDisallowed;
-    }
-
-    public void configure(String stringValue) {
-        try{
-            if (stringValue.equalsIgnoreCase(DEFAULT_COMMAND)) {
-                configure(REGULAR);
-            } else if (stringValue.startsWith(EMULATE_COMMAND)) {
-                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);
-            } else if (stringValue.startsWith(GENERATE_UNIQUE_COLUMN_NAMES)) {
-                setGenerateUniqueColumnNames(
-                        Integer.parseInt(stringValue.substring(GENERATE_UNIQUE_COLUMN_NAMES.length())) == 1);
-            } else if (stringValue.startsWith(DEFAULT_COLUMN_NAME_PATTERN)) {
-                setDefaultColumnNamePattern(
-                        unquoteString(stringValue.substring(DEFAULT_COLUMN_NAME_PATTERN.length())));
-            } else if (stringValue.startsWith(REGULAR_EXPRESSION_MATCH_ALLOWED)) {
-                setRegularExpressionMatchAllowed(
-                        unquoteString(stringValue.substring(REGULAR_EXPRESSION_MATCH_ALLOWED.length())));
-            } else if (stringValue.startsWith(REGULAR_EXPRESSION_MATCH_DISALLOWED)) {
-                setRegularExpressionMatchDisallowed(
-                        unquoteString(stringValue.substring(REGULAR_EXPRESSION_MATCH_DISALLOWED.length())));
-            } 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);
-
-        }
-    }
-
-    private void recompilePatterns() {
-        try{
-            // recompile RE patterns
-            setCompiledRegularExpressionMatchAllowed(Pattern.compile(getRegularExpressionMatchAllowed()));
-            setCompiledRegularExpressionMatchDisallowed(Pattern.compile(getRegularExpressionMatchDisallowed()));
-        }
-        catch(Exception e){
-            configure(REGULAR);
-            throw e;
-        }
-    }
-
-    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);
-            return s;
-        }
-        return s;
-    }
-
-    public boolean isGenerateUniqueColumnNames() {
-        return generateUniqueColumnNames;
-    }
-
-    public void setGenerateUniqueColumnNames(boolean generateUniqueColumnNames) {
-        this.generateUniqueColumnNames = generateUniqueColumnNames;
-    }
-
-    public void configure(ModeEnum modeEnum) {
-        switch(modeEnum){
-        case Oracle:
-            // Nonquoted identifiers can contain only alphanumeric characters
-            // from your database character set and the underscore (_), dollar
-            // sign ($), and pound sign (#).
-            setMaxIdentiferLength(128);
-            setRegularExpressionMatchAllowed("(?m)(?s)\"?[A-Za-z0-9_\\$#]+\"?");
-            setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\"\\$#]");
-            setDefaultColumnNamePattern("_UNNAMED_$$");
-            setGenerateUniqueColumnNames(false);
-            break;
-
-        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
-            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
-            setRegularExpressionMatchAllowed("(?m)(?s)[A-Za-z0-9_\\$]+");
-            setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\\$]");
-            setDefaultColumnNamePattern("_UNNAMED_$$");
-            setGenerateUniqueColumnNames(false);
-            break;
-
-        case MySQL:
-            //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_`\\$]");
-            setDefaultColumnNamePattern("_UNNAMED_$$");
-            setGenerateUniqueColumnNames(false);
-            break;
-
-        default:
-        case REGULAR:
-        case DB2:
-        case Derby:
-        case HSQLDB:
-        case Ignite:
-            setMaxIdentiferLength(Integer.MAX_VALUE);
-            setRegularExpressionMatchAllowed("(?m)(?s).+");
-            setRegularExpressionMatchDisallowed("(?m)(?s)[\\x00]");
-            setDefaultColumnNamePattern("_UNNAMED_$$");
-            setGenerateUniqueColumnNames(false);
-            break;
-        }
-        recompilePatterns();
-    }
-
+/*
+ * 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;
+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 = ";
+    private static final String DEFAULT_COLUMN_NAME_PATTERN = "DEFAULT_COLUMN_NAME_PATTERN = ";
+    private static final String MAX_IDENTIFIER_LENGTH = "MAX_IDENTIFIER_LENGTH = ";
+    private static final String EMULATE_COMMAND = "EMULATE = ";
+    private static final String GENERATE_UNIQUE_COLUMN_NAMES = "GENERATE_UNIQUE_COLUMN_NAMES = ";
+
+    private int maxIdentiferLength;
+    private String regularExpressionMatchAllowed;
+    private String regularExpressionMatchDisallowed;
+    private String defaultColumnNamePattern;
+    private boolean generateUniqueColumnNames;
+    private Pattern compiledRegularExpressionMatchAllowed;
+    private Pattern compiledRegularExpressionMatchDisallowed;
+
+    public ColumnNamerConfiguration(int maxIdentiferLength, String regularExpressionMatchAllowed,
+            String regularExpressionMatchDisallowed, String defaultColumnNamePattern,
+            boolean generateUniqueColumnNames) {
+
+        this.maxIdentiferLength = maxIdentiferLength;
+        this.regularExpressionMatchAllowed = regularExpressionMatchAllowed;
+        this.regularExpressionMatchDisallowed = regularExpressionMatchDisallowed;
+        this.defaultColumnNamePattern = defaultColumnNamePattern;
+        this.generateUniqueColumnNames = generateUniqueColumnNames;
+
+        compiledRegularExpressionMatchAllowed = Pattern.compile(regularExpressionMatchAllowed);
+        compiledRegularExpressionMatchDisallowed = Pattern.compile(regularExpressionMatchDisallowed);
+    }
+
+    public int getMaxIdentiferLength() {
+        return maxIdentiferLength;
+    }
+
+    public void setMaxIdentiferLength(int 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);
+        }
+    }
+
+    public String getRegularExpressionMatchAllowed() {
+        return regularExpressionMatchAllowed;
+    }
+
+    public void setRegularExpressionMatchAllowed(String regularExpressionMatchAllowed) {
+        this.regularExpressionMatchAllowed = regularExpressionMatchAllowed;
+    }
+
+    public String getRegularExpressionMatchDisallowed() {
+        return regularExpressionMatchDisallowed;
+    }
+
+    public void setRegularExpressionMatchDisallowed(String regularExpressionMatchDisallowed) {
+        this.regularExpressionMatchDisallowed = regularExpressionMatchDisallowed;
+    }
+
+    public String getDefaultColumnNamePattern() {
+        return defaultColumnNamePattern;
+    }
+
+    public void setDefaultColumnNamePattern(String defaultColumnNamePattern) {
+        this.defaultColumnNamePattern = defaultColumnNamePattern;
+    }
+
+    public Pattern getCompiledRegularExpressionMatchAllowed() {
+        return compiledRegularExpressionMatchAllowed;
+    }
+
+    public void setCompiledRegularExpressionMatchAllowed(Pattern compiledRegularExpressionMatchAllowed) {
+        this.compiledRegularExpressionMatchAllowed = compiledRegularExpressionMatchAllowed;
+    }
+
+    public Pattern getCompiledRegularExpressionMatchDisallowed() {
+        return compiledRegularExpressionMatchDisallowed;
+    }
+
+    public void setCompiledRegularExpressionMatchDisallowed(Pattern compiledRegularExpressionMatchDisallowed) {
+        this.compiledRegularExpressionMatchDisallowed = compiledRegularExpressionMatchDisallowed;
+    }
+
+    public void configure(String stringValue) {
+        try {
+            if (stringValue.equalsIgnoreCase(DEFAULT_COMMAND)) {
+                configure(REGULAR);
+            } else if (stringValue.startsWith(EMULATE_COMMAND)) {
+                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);
+            } else if (stringValue.startsWith(GENERATE_UNIQUE_COLUMN_NAMES)) {
+                setGenerateUniqueColumnNames(
+                        Integer.parseInt(stringValue.substring(GENERATE_UNIQUE_COLUMN_NAMES.length())) == 1);
+            } else if (stringValue.startsWith(DEFAULT_COLUMN_NAME_PATTERN)) {
+                setDefaultColumnNamePattern(
+                        unquoteString(stringValue.substring(DEFAULT_COLUMN_NAME_PATTERN.length())));
+            } else if (stringValue.startsWith(REGULAR_EXPRESSION_MATCH_ALLOWED)) {
+                setRegularExpressionMatchAllowed(
+                        unquoteString(stringValue.substring(REGULAR_EXPRESSION_MATCH_ALLOWED.length())));
+            } else if (stringValue.startsWith(REGULAR_EXPRESSION_MATCH_DISALLOWED)) {
+                setRegularExpressionMatchDisallowed(
+                        unquoteString(stringValue.substring(REGULAR_EXPRESSION_MATCH_DISALLOWED.length())));
+            } 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);
+
+        }
+    }
+
+    private void recompilePatterns() {
+        try {
+            // recompile RE patterns
+            setCompiledRegularExpressionMatchAllowed(Pattern.compile(getRegularExpressionMatchAllowed()));
+            setCompiledRegularExpressionMatchDisallowed(Pattern.compile(getRegularExpressionMatchDisallowed()));
+        } catch (Exception e) {
+            configure(REGULAR);
+            throw e;
+        }
+    }
+
+    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);
+            return s;
+        }
+        return s;
+    }
+
+    public boolean isGenerateUniqueColumnNames() {
+        return generateUniqueColumnNames;
+    }
+
+    public void setGenerateUniqueColumnNames(boolean generateUniqueColumnNames) {
+        this.generateUniqueColumnNames = generateUniqueColumnNames;
+    }
+
+    public void configure(ModeEnum modeEnum) {
+        switch (modeEnum) {
+        case Oracle:
+            // Nonquoted identifiers can contain only alphanumeric characters
+            // from your database character set and the underscore (_), dollar
+            // sign ($), and pound sign (#).
+            setMaxIdentiferLength(128);
+            setRegularExpressionMatchAllowed("(?m)(?s)\"?[A-Za-z0-9_\\$#]+\"?");
+            setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\"\\$#]");
+            setDefaultColumnNamePattern("_UNNAMED_$$");
+            setGenerateUniqueColumnNames(false);
+            break;
+
+        case MSSQLServer:
+            // https://docs.microsoft.com/en-us/sql/sql-server/maximum-capacity-specifications-for-sql-server
+            setMaxIdentiferLength(128);
+            // allows [] around names
+            setRegularExpressionMatchAllowed("(?m)(?s)[A-Za-z0-9_\\[\\]]+");
+            setRegularExpressionMatchDisallowed("(?m)(?s)[^A-Za-z0-9_\\[\\]]");
+            setDefaultColumnNamePattern("_UNNAMED_$$");
+            setGenerateUniqueColumnNames(false);
+            break;
+
+        case PostgreSQL:
+            // 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_$$");
+            setGenerateUniqueColumnNames(false);
+            break;
+
+        case MySQL:
+            // 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_`\\$]");
+            setDefaultColumnNamePattern("_UNNAMED_$$");
+            setGenerateUniqueColumnNames(false);
+            break;
+
+        default:
+        case REGULAR:
+        case DB2:
+        case Derby:
+        case HSQLDB:
+        case Ignite:
+            setMaxIdentiferLength(Integer.MAX_VALUE);
+            setRegularExpressionMatchAllowed("(?m)(?s).+");
+            setRegularExpressionMatchDisallowed("(?m)(?s)[\\x00]");
+            setDefaultColumnNamePattern("_UNNAMED_$$");
+            setGenerateUniqueColumnNames(false);
+            break;
+        }
+        recompilePatterns();
+    }
+
 }
\ No newline at end of file

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;
@@ -784,7 +784,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         addTest(new TestReplace());
         addTest(new TestSynonymForTable());
         addTest(new TestColumnNamer());
-        
+
 
         // jaqu
         addTest(new AliasMapTest());

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/TestAlter.java

@@ -124,7 +124,7 @@ public class TestAlter extends TestBase {
             execute("alter table test drop column b");
         stat.execute("alter table test drop (d)");
         stat.execute("drop table test");
-        // Test-Case: Error if dropping all columns 
+        // Test-Case: Error if dropping all columns
         stat.execute("create table test(id int, name varchar, name2 varchar)");
         assertThrows(ErrorCode.CANNOT_DROP_LAST_COLUMN, stat).
             execute("alter table test drop column id, name, name2");
@@ -218,7 +218,7 @@ public class TestAlter extends TestBase {
     }
 
 
-    
+
     // column and field names must be upper-case due to getMetaData sensitivity
     private void testAlterTableAddMultipleColumnsBefore() throws SQLException {
         stat.execute("create table T(X varchar)");
@@ -294,10 +294,10 @@ public class TestAlter extends TestBase {
         stat.execute("insert into t values('Hello')");
         stat.execute("drop table t");
     }
-    
+
     /**
-     * Test for fix "Change not-null / null -constraint to existing column" 
-     * (MySql/ORACLE - SQL style) that failed silently corrupting the changed 
+     * Test for fix "Change not-null / null -constraint to existing column"
+     * (MySql/ORACLE - SQL style) that failed silently corrupting the changed
      * column.<br/>
      * Before the change (added after v1.4.196) following was observed:
      * <pre>
@@ -311,7 +311,7 @@ public class TestAlter extends TestBase {
         stat.execute("alter table T modify C int null");
         stat.execute("insert into T values(null)");
         stat.execute("drop table T");
-        // This failed in v1.4.196 
+        // This failed in v1.4.196
         stat.execute("create table T (C int not null)");
         stat.execute("alter table T modify C null"); // Silently corrupted column C
         stat.execute("insert into T values(null)"); // <- Fixed in v1.4.196 - NULL is allowed

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

@@ -34,7 +34,7 @@ public class TestCompatibilityOracle extends TestBase {
 
     @Override
     public void test() throws Exception {
-    	testNotNullSyntax();
+        testNotNullSyntax();
         testTreatEmptyStringsAsNull();
         testDecimalScale();
         testPoundSymbolInColumnName();

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

@@ -1417,23 +1417,19 @@ 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"));
-
-          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"));
-          assertEquals(ymd.parse("2000-03-01"), ToDateParser.toDate("1-MAR-000", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("1999-03-01"), ToDateParser.toDate("1-MAR-099", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("0100-03-01"), ToDateParser.toDate("1-MAR-100", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("2000-03-01"), ToDateParser.toDate("1-MAR-00", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("2049-03-01"), ToDateParser.toDate("1-MAR-49", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("1950-03-01"), ToDateParser.toDate("1-MAR-50", "DD-MON-RRRR"));
-          assertEquals(ymd.parse("1999-03-01"), ToDateParser.toDate("1-MAR-99", "DD-MON-RRRR"));
+            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"));
+            assertEquals(ymd.parse("2000-03-01"), ToDateParser.toDate("1-MAR-000", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("1999-03-01"), ToDateParser.toDate("1-MAR-099", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("0100-03-01"), ToDateParser.toDate("1-MAR-100", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("2000-03-01"), ToDateParser.toDate("1-MAR-00", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("2049-03-01"), ToDateParser.toDate("1-MAR-49", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("1950-03-01"), ToDateParser.toDate("1-MAR-50", "DD-MON-RRRR"));
+            assertEquals(ymd.parse("1999-03-01"), ToDateParser.toDate("1-MAR-99", "DD-MON-RRRR"));
         }
     }
 
@@ -1734,22 +1730,22 @@ public class TestFunctions extends TestBase implements AggregateFunction {
                 "SELECT TO_CHAR(12345, '$9999') FROM DUAL");
         String expected = String.format("%,d", 12345);
         if (Locale.getDefault() == Locale.ENGLISH) {
-          assertResult(String.format("%5s12345", cs), stat,
+            assertResult(String.format("%5s12345", cs), stat,
                     "SELECT TO_CHAR(12345, '$99999999') FROM DUAL");
-          assertResult(String.format("%6s12,345.35", cs), stat,
+            assertResult(String.format("%6s12,345.35", cs), stat,
                     "SELECT TO_CHAR(12345.345, '$99,999,999.99') FROM DUAL");
-          assertResult(String.format("%5s%s", cs, expected), stat,
-                "SELECT TO_CHAR(12345.345, '$99g999g999') FROM DUAL");
-          assertResult("          " + cs + "123.45", stat,
-                  "SELECT TO_CHAR(123.45, 'L999.99') FROM DUAL");
-          assertResult("         -" + cs + "123.45", stat,
-                  "SELECT TO_CHAR(-123.45, 'L999.99') FROM DUAL");
-          assertResult(cs + "123.45", stat,
-                  "SELECT TO_CHAR(123.45, 'FML999.99') FROM DUAL");
-          assertResult("          " + cs + "123.45", stat,
-                  "SELECT TO_CHAR(123.45, 'U999.99') FROM DUAL");
-          assertResult("          " + cs + "123.45", stat,
-                  "SELECT TO_CHAR(123.45, 'u999.99') FROM DUAL");
+            assertResult(String.format("%5s%s", cs, expected), stat,
+                    "SELECT TO_CHAR(12345.345, '$99g999g999') FROM DUAL");
+            assertResult("          " + cs + "123.45", stat,
+                    "SELECT TO_CHAR(123.45, 'L999.99') FROM DUAL");
+            assertResult("         -" + cs + "123.45", stat,
+                    "SELECT TO_CHAR(-123.45, 'L999.99') FROM DUAL");
+            assertResult(cs + "123.45", stat,
+                    "SELECT TO_CHAR(123.45, 'FML999.99') FROM DUAL");
+            assertResult("          " + cs + "123.45", stat,
+                    "SELECT TO_CHAR(123.45, 'U999.99') FROM DUAL");
+            assertResult("          " + cs + "123.45", stat,
+                    "SELECT TO_CHAR(123.45, 'u999.99') FROM DUAL");
 
         }
         assertResult("     12,345.35", stat,
@@ -2130,12 +2126,12 @@ public class TestFunctions extends TestBase implements AggregateFunction {
                 getClass().getName() + ".currentTimestamp\"");
 
         stat.execute("set BUILTIN_ALIAS_OVERRIDE true");
-        
+
         stat.execute("create alias CURRENT_TIMESTAMP for \"" +
                 getClass().getName() + ".currentTimestampOverride\"");
-        
+
         assertCallResult("3141", stat, "CURRENT_TIMESTAMP");
-        
+
         conn.close();
     }
 
@@ -2456,7 +2452,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         }
         return new Object[] { buff.toString() };
     }
-    
+
     /**
      * This method is called via reflection from the database.
      */

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

@@ -500,7 +500,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
         ResultSet rs;
 
         String SETUP_SQL =
-             "DROP TABLE IF EXISTS A;                           "
+            "DROP TABLE IF EXISTS A;                           "
             +"DROP TABLE IF EXISTS B;                           "
             +"DROP TABLE IF EXISTS C;                           "
             +"CREATE TABLE A(VAL VARCHAR(255));                 "
@@ -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/db/TestMergeUsing.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.test.db;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.h2.api.Trigger;
-import org.h2.test.TestBase;
-
-/**
- * Test merge using syntax.
- */
-public class TestMergeUsing extends TestBase implements Trigger {
-
-    private static final String GATHER_ORDERED_RESULTS_SQL = "SELECT ID, NAME FROM PARENT ORDER BY ID ASC";
-    private static int triggerTestingUpdateCount = 0;
-
-    /**
-     * Run just this test.
-     *
-     * @param a ignored
-     */
-    public static void main(String... a) throws Exception {
-        TestBase.createCaller().init().test();
-    }
-
-    private String triggerName;
-
-    @Override
-    public void test() throws Exception {
-
-        // Simple ID,NAME inserts, target table with PK initially empty
-        testMergeUsing(
-                "CREATE TABLE PARENT(ID INT, NAME VARCHAR, PRIMARY KEY(ID) );",
-                "MERGE INTO PARENT AS P USING (SELECT X AS ID, 'Marcy'||X AS NAME " +
-                "FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID AND 1=1 AND S.ID = P.ID) " +
-                "WHEN MATCHED THEN " +
-                "UPDATE SET P.NAME = S.NAME WHERE 2 = 2 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 2);
-        // Simple NAME updates, target table missing PK
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S " +
-                "ON (P.ID = S.ID AND 1=1 AND S.ID = P.ID) " +
-                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE 1 = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(1,2)",
-                2);
-        // No NAME updates, WHERE clause is always false, insert clause missing
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE 1 = 2",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 0);
-        // No NAME updates, no WHERE clause, insert clause missing
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(1,2)",
-                2);
-        // Two delete updates done, no WHERE clause, insert clause missing
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN DELETE",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) WHERE 1=0",
-                2);
-        // One insert, one update one delete happens, target table missing PK
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 " +
-                "DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3);
-        // No updates happen: No insert defined, no update or delete happens due
-        // to ON condition failing always, target table missing PK
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID AND 1=0) " +
-                "WHEN MATCHED THEN " +
-                "UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 0);
-        // One insert, one update one delete happens, target table missing PK
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
-                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT AS P USING SOURCE AS S ON (P.ID = S.ID) WHEN MATCHED THEN " +
-                "UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3);
-        // One insert, one update one delete happens, target table missing PK,
-        // no source alias
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
-                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT AS P USING SOURCE ON (P.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET P.NAME = SOURCE.NAME||SOURCE.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1 " +
-                "WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3);
-        // One insert, one update one delete happens, target table missing PK,
-        // no source or target alias
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
-                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3);
-
-        // Only insert clause, no update or delete clauses
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );" +
-                "DELETE FROM PARENT;",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
-                "WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)", 3);
-        // no insert, no update, no delete clauses - essentially a no-op
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );"
-                        + "DELETE FROM PARENT;",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) WHERE X<0",
-                0,
-                "At least UPDATE, DELETE or INSERT embedded statement must be supplied.");
-        // Two updates to same row - update and delete together - emptying the
-        // parent table
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) )",
-                "MERGE INTO PARENT AS P USING (" +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN " +
-                "UPDATE SET P.NAME = P.NAME||S.ID WHERE P.ID = 1 DELETE WHERE P.ID = 1 AND P.NAME = 'Marcy11'",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) WHERE X<0",
-                2);
-        // Duplicate source keys but different ROWID update - so no error
-        // SQL standard says duplicate or repeated updates of same row in same
-        // statement should cause errors - but because first row is updated,
-        // deleted (on source row 1) then inserted (on source row 2)
-        // it's considered different - with respect to to ROWID - so no error
-        // One insert, one update one delete happens (on same row) , target
-        // table missing PK, no source or target alias
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );" +
-                "CREATE TABLE SOURCE AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT 1 AS ID, 'Marcy'||X||X UNION ALL SELECT 1 AS ID, 'Marcy2'",
-                2);
-
-        // Multiple update on same row: SQL standard says duplicate or repeated
-        // updates in same statement should cause errors -but because first row
-        // is updated, delete then insert it's considered different
-        // One insert, one update one delete happens (on same row, which is
-        // okay), then another update (which is illegal)target table missing PK,
-        // no source or target alias
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );"
-                        + "CREATE TABLE SOURCE AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT 1 AS ID, 'Marcy'||X||X UNION ALL SELECT 1 AS ID, 'Marcy2'",
-                3,
-                "Unique index or primary key violation: \"Merge using " +
-                "ON column expression, duplicate _ROWID_ target record " +
-                "already updated, deleted or inserted:_ROWID_=2:in:PUBLIC.PARENT:conflicting source row number:2");
-        // Duplicate key updated 3 rows at once, only 1 expected
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
-                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3, "Duplicate key updated 3 rows at once, only 1 expected");
-        // Missing target columns in ON expression
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
-                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (1 = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3, "No references to target columns found in ON clause");
-        // Missing source columns in ON expression
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
-                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = 1) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
-                3, "No references to source columns found in ON clause");
-        // Insert does not insert correct values with respect to ON condition
-        // (inserts ID value above 100, instead)
-        testMergeUsingException(
-                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(4,4) );"
-                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
-                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
-                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
-                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
-                "INSERT (ID, NAME) VALUES (SOURCE.ID+100, SOURCE.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(4,4)", 1,
-                "Expected to find key after row inserted, but none found. Insert does not match ON condition.");
-        // One insert, one update one delete happens, target table missing PK,
-        // triggers update all NAME fields
-        triggerTestingUpdateCount = 0;
-        testMergeUsing(
-                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2));"
-                        + getCreateTriggerSQL(),
-                "MERGE INTO PARENT AS P USING " +
-                "(SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,4) ) AS S ON (P.ID = S.ID) " +
-                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 " +
-                "DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
-                GATHER_ORDERED_RESULTS_SQL,
-                "SELECT 2 AS ID, 'Marcy22-updated2' AS NAME UNION ALL " +
-                "SELECT X AS ID, 'Marcy'||X||'-inserted'||X AS NAME FROM SYSTEM_RANGE(3,4)",
-                4);
-    }
-
-    /**
-     * Run a test case of the merge using syntax
-     *
-     * @param setupSQL - one or more SQL statements to setup the case
-     * @param statementUnderTest - the merge statement being tested
-     * @param gatherResultsSQL - a select which gathers the results of the merge
-     *            from the target table
-     * @param expectedResultsSQL - a select which returns the expected results
-     *            in the target table
-     * @param expectedRowUpdateCount - how many updates should be expected from
-     *            the merge using
-     */
-    private void testMergeUsing(String setupSQL, String statementUnderTest,
-            String gatherResultsSQL, String expectedResultsSQL,
-            int expectedRowUpdateCount) throws Exception {
-        deleteDb("mergeUsingQueries");
-        Connection conn = getConnection("mergeUsingQueries");
-        Statement stat;
-        PreparedStatement prep;
-        ResultSet rs;
-        int rowCountUpdate;
-
-        try {
-            stat = conn.createStatement();
-            stat.execute(setupSQL);
-
-            prep = conn.prepareStatement(statementUnderTest);
-            rowCountUpdate = prep.executeUpdate();
-
-            // compare actual results from SQL result set with expected results
-            // - by diffing (aka set MINUS operation)
-            rs = stat.executeQuery("( " + gatherResultsSQL + " ) MINUS ( "
-                    + expectedResultsSQL + " )");
-
-            int rowCount = 0;
-            StringBuffer diffBuffer = new StringBuffer("");
-            while (rs.next()) {
-                rowCount++;
-                diffBuffer.append("|");
-                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-                    diffBuffer.append(rs.getObject(i));
-                    diffBuffer.append("|\n");
-                }
-            }
-            assertEquals("Differences between expected and actual output found:"
-                    + diffBuffer, 0, rowCount);
-            assertEquals("Expected update counts differ",
-                    expectedRowUpdateCount, rowCountUpdate);
-        } finally {
-            conn.close();
-            deleteDb("mergeUsingQueries");
-        }
-    }
-
-    /**
-     * Run a test case of the merge using syntax
-     *
-     * @param setupSQL - one or more SQL statements to setup the case
-     * @param statementUnderTest - the merge statement being tested
-     * @param gatherResultsSQL - a select which gathers the results of the merge
-     *            from the target table
-     * @param expectedResultsSQL - a select which returns the expected results
-     *            in the target table
-     * @param expectedRowUpdateCount - how many updates should be expected from
-     *            the merge using
-     * @param exceptionMessage - the exception message expected
-     */
-    private void testMergeUsingException(String setupSQL,
-            String statementUnderTest, String gatherResultsSQL,
-            String expectedResultsSQL, int expectedRowUpdateCount,
-            String exceptionMessage) throws Exception {
-        try {
-            testMergeUsing(setupSQL, statementUnderTest, gatherResultsSQL,
-                    expectedResultsSQL, expectedRowUpdateCount);
-        } catch (RuntimeException | org.h2.jdbc.JdbcSQLException e) {
-            if (!e.getMessage().contains(exceptionMessage)) {
-                e.printStackTrace();
-            }
-            assertContains(e.getMessage(), exceptionMessage);
-            return;
-        }
-        fail("Failed to see exception with message:" + exceptionMessage);
-    }
-
-    @Override
-    public void fire(Connection conn, Object[] oldRow, Object[] newRow)
-            throws SQLException {
-
-        if (conn == null) {
-            throw new AssertionError("connection is null");
-        }
-        if (triggerName.startsWith("INS_BEFORE")) {
-            newRow[1] = newRow[1] + "-inserted" + (++triggerTestingUpdateCount);
-        } else if (triggerName.startsWith("UPD_BEFORE")) {
-            newRow[1] = newRow[1] + "-updated" + (++triggerTestingUpdateCount);
-        } else if (triggerName.startsWith("DEL_BEFORE")) {
-            oldRow[1] = oldRow[1] + "-deleted" + (++triggerTestingUpdateCount);
-        }
-    }
-
-    @Override
-    public void close() {
-        // ignore
-    }
-
-    @Override
-    public void remove() {
-        // ignore
-    }
-
-    @Override
-    public void init(Connection conn, String schemaName, String trigger,
-            String tableName, boolean before, int type) {
-        this.triggerName = trigger;
-        if (!"PARENT".equals(tableName)) {
-            throw new AssertionError("supposed to be PARENT");
-        }
-        if ((trigger.endsWith("AFTER") && before)
-                || (trigger.endsWith("BEFORE") && !before)) {
-            throw new AssertionError(
-                    "triggerName: " + trigger + " before:" + before);
-        }
-        if ((trigger.startsWith("UPD") && type != UPDATE)
-                || (trigger.startsWith("INS") && type != INSERT)
-                || (trigger.startsWith("DEL") && type != DELETE)) {
-            throw new AssertionError(
-                    "triggerName: " + trigger + " type:" + type);
-        }
-    }
-
-    private String getCreateTriggerSQL() {
-        StringBuffer buf = new StringBuffer();
-        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 "
-                + "FOR EACH ROW NOWAIT CALL \"" + getClass().getName() + "\";");
-        buf.append("CREATE TRIGGER DEL_BEFORE " + "BEFORE DELETE ON PARENT "
-                + "FOR EACH ROW NOWAIT CALL \"" + getClass().getName() + "\";");
-        return buf.toString();
-    }
-
-}
+/*
+ * 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.test.db;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.h2.api.Trigger;
+import org.h2.test.TestBase;
+
+/**
+ * Test merge using syntax.
+ */
+public class TestMergeUsing extends TestBase implements Trigger {
+
+    private static final String GATHER_ORDERED_RESULTS_SQL = "SELECT ID, NAME FROM PARENT ORDER BY ID ASC";
+    private static int triggerTestingUpdateCount = 0;
+
+    /**
+     * Run just this test.
+     *
+     * @param a ignored
+     */
+    public static void main(String... a) throws Exception {
+        TestBase.createCaller().init().test();
+    }
+
+    private String triggerName;
+
+    @Override
+    public void test() throws Exception {
+
+        // Simple ID,NAME inserts, target table with PK initially empty
+        testMergeUsing(
+                "CREATE TABLE PARENT(ID INT, NAME VARCHAR, PRIMARY KEY(ID) );",
+                "MERGE INTO PARENT AS P USING (SELECT X AS ID, 'Marcy'||X AS NAME " +
+                "FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID AND 1=1 AND S.ID = P.ID) " +
+                "WHEN MATCHED THEN " +
+                "UPDATE SET P.NAME = S.NAME WHERE 2 = 2 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 2);
+        // Simple NAME updates, target table missing PK
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S " +
+                "ON (P.ID = S.ID AND 1=1 AND S.ID = P.ID) " +
+                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE 1 = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(1,2)",
+                2);
+        // No NAME updates, WHERE clause is always false, insert clause missing
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE 1 = 2",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 0);
+        // No NAME updates, no WHERE clause, insert clause missing
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(1,2)",
+                2);
+        // Two delete updates done, no WHERE clause, insert clause missing
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN DELETE",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) WHERE 1=0",
+                2);
+        // One insert, one update one delete happens, target table missing PK
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 " +
+                "DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3);
+        // No updates happen: No insert defined, no update or delete happens due
+        // to ON condition failing always, target table missing PK
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID AND 1=0) " +
+                "WHEN MATCHED THEN " +
+                "UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)", 0);
+        // One insert, one update one delete happens, target table missing PK
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
+                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT AS P USING SOURCE AS S ON (P.ID = S.ID) WHEN MATCHED THEN " +
+                "UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3);
+        // One insert, one update one delete happens, target table missing PK,
+        // no source alias
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
+                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT AS P USING SOURCE ON (P.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET P.NAME = SOURCE.NAME||SOURCE.ID WHERE P.ID = 2 DELETE WHERE P.ID = 1 " +
+                "WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3);
+        // One insert, one update one delete happens, target table missing PK,
+        // no source or target alias
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2) );" +
+                "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3);
+
+        // Only insert clause, no update or delete clauses
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );" +
+                "DELETE FROM PARENT;",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
+                "WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)", 3);
+        // no insert, no update, no delete clauses - essentially a no-op
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );"
+                        + "DELETE FROM PARENT;",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) WHERE X<0",
+                0,
+                "At least UPDATE, DELETE or INSERT embedded statement must be supplied.");
+        // Two updates to same row - update and delete together - emptying the
+        // parent table
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) )",
+                "MERGE INTO PARENT AS P USING (" +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN " +
+                "UPDATE SET P.NAME = P.NAME||S.ID WHERE P.ID = 1 DELETE WHERE P.ID = 1 AND P.NAME = 'Marcy11'",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) WHERE X<0",
+                2);
+        // Duplicate source keys but different ROWID update - so no error
+        // SQL standard says duplicate or repeated updates of same row in same
+        // statement should cause errors - but because first row is updated,
+        // deleted (on source row 1) then inserted (on source row 2)
+        // it's considered different - with respect to to ROWID - so no error
+        // One insert, one update one delete happens (on same row) , target
+        // table missing PK, no source or target alias
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );" +
+                "CREATE TABLE SOURCE AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT 1 AS ID, 'Marcy'||X||X UNION ALL SELECT 1 AS ID, 'Marcy2'",
+                2);
+
+        // Multiple update on same row: SQL standard says duplicate or repeated
+        // updates in same statement should cause errors -but because first row
+        // is updated, delete then insert it's considered different
+        // One insert, one update one delete happens (on same row, which is
+        // okay), then another update (which is illegal)target table missing PK,
+        // no source or target alias
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,1) );"
+                        + "CREATE TABLE SOURCE AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT 1 AS ID, 'Marcy'||X||X UNION ALL SELECT 1 AS ID, 'Marcy2'",
+                3,
+                "Unique index or primary key violation: \"Merge using " +
+                "ON column expression, duplicate _ROWID_ target record " +
+                "already updated, deleted or inserted:_ROWID_=2:in:PUBLIC.PARENT:conflicting source row number:2");
+        // Duplicate key updated 3 rows at once, only 1 expected
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
+                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3, "Duplicate key updated 3 rows at once, only 1 expected");
+        // Missing target columns in ON expression
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
+                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (1 = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3, "No references to target columns found in ON clause");
+        // Missing source columns in ON expression
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"
+                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = 1) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3, "No references to source columns found in ON clause");
+        // Insert does not insert correct values with respect to ON condition
+        // (inserts ID value above 100, instead)
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(4,4) );"
+                        + "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN " +
+                "UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 " +
+                "DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN " +
+                "INSERT (ID, NAME) VALUES (SOURCE.ID+100, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(4,4)", 1,
+                "Expected to find key after row inserted, but none found. Insert does not match ON condition.");
+        // One insert, one update one delete happens, target table missing PK,
+        // triggers update all NAME fields
+        triggerTestingUpdateCount = 0;
+        testMergeUsing(
+                "CREATE TABLE PARENT AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,2));"
+                        + getCreateTriggerSQL(),
+                "MERGE INTO PARENT AS P USING " +
+                "(SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,4) ) AS S ON (P.ID = S.ID) " +
+                "WHEN MATCHED THEN UPDATE SET P.NAME = S.NAME||S.ID WHERE P.ID = 2 " +
+                "DELETE WHERE P.ID = 1 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (S.ID, S.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT 2 AS ID, 'Marcy22-updated2' AS NAME UNION ALL " +
+                "SELECT X AS ID, 'Marcy'||X||'-inserted'||X AS NAME FROM SYSTEM_RANGE(3,4)",
+                4);
+    }
+
+    /**
+     * Run a test case of the merge using syntax
+     *
+     * @param setupSQL - one or more SQL statements to setup the case
+     * @param statementUnderTest - the merge statement being tested
+     * @param gatherResultsSQL - a select which gathers the results of the merge
+     *            from the target table
+     * @param expectedResultsSQL - a select which returns the expected results
+     *            in the target table
+     * @param expectedRowUpdateCount - how many updates should be expected from
+     *            the merge using
+     */
+    private void testMergeUsing(String setupSQL, String statementUnderTest,
+            String gatherResultsSQL, String expectedResultsSQL,
+            int expectedRowUpdateCount) throws Exception {
+        deleteDb("mergeUsingQueries");
+        Connection conn = getConnection("mergeUsingQueries");
+        Statement stat;
+        PreparedStatement prep;
+        ResultSet rs;
+        int rowCountUpdate;
+
+        try {
+            stat = conn.createStatement();
+            stat.execute(setupSQL);
+
+            prep = conn.prepareStatement(statementUnderTest);
+            rowCountUpdate = prep.executeUpdate();
+
+            // compare actual results from SQL result set with expected results
+            // - by diffing (aka set MINUS operation)
+            rs = stat.executeQuery("( " + gatherResultsSQL + " ) MINUS ( "
+                    + expectedResultsSQL + " )");
+
+            int rowCount = 0;
+            StringBuffer diffBuffer = new StringBuffer("");
+            while (rs.next()) {
+                rowCount++;
+                diffBuffer.append("|");
+                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+                    diffBuffer.append(rs.getObject(i));
+                    diffBuffer.append("|\n");
+                }
+            }
+            assertEquals("Differences between expected and actual output found:"
+                    + diffBuffer, 0, rowCount);
+            assertEquals("Expected update counts differ",
+                    expectedRowUpdateCount, rowCountUpdate);
+        } finally {
+            conn.close();
+            deleteDb("mergeUsingQueries");
+        }
+    }
+
+    /**
+     * Run a test case of the merge using syntax
+     *
+     * @param setupSQL - one or more SQL statements to setup the case
+     * @param statementUnderTest - the merge statement being tested
+     * @param gatherResultsSQL - a select which gathers the results of the merge
+     *            from the target table
+     * @param expectedResultsSQL - a select which returns the expected results
+     *            in the target table
+     * @param expectedRowUpdateCount - how many updates should be expected from
+     *            the merge using
+     * @param exceptionMessage - the exception message expected
+     */
+    private void testMergeUsingException(String setupSQL,
+            String statementUnderTest, String gatherResultsSQL,
+            String expectedResultsSQL, int expectedRowUpdateCount,
+            String exceptionMessage) throws Exception {
+        try {
+            testMergeUsing(setupSQL, statementUnderTest, gatherResultsSQL,
+                    expectedResultsSQL, expectedRowUpdateCount);
+        } catch (RuntimeException | org.h2.jdbc.JdbcSQLException e) {
+            if (!e.getMessage().contains(exceptionMessage)) {
+                e.printStackTrace();
+            }
+            assertContains(e.getMessage(), exceptionMessage);
+            return;
+        }
+        fail("Failed to see exception with message:" + exceptionMessage);
+    }
+
+    @Override
+    public void fire(Connection conn, Object[] oldRow, Object[] newRow)
+            throws SQLException {
+
+        if (conn == null) {
+            throw new AssertionError("connection is null");
+        }
+        if (triggerName.startsWith("INS_BEFORE")) {
+            newRow[1] = newRow[1] + "-inserted" + (++triggerTestingUpdateCount);
+        } else if (triggerName.startsWith("UPD_BEFORE")) {
+            newRow[1] = newRow[1] + "-updated" + (++triggerTestingUpdateCount);
+        } else if (triggerName.startsWith("DEL_BEFORE")) {
+            oldRow[1] = oldRow[1] + "-deleted" + (++triggerTestingUpdateCount);
+        }
+    }
+
+    @Override
+    public void close() {
+        // ignore
+    }
+
+    @Override
+    public void remove() {
+        // ignore
+    }
+
+    @Override
+    public void init(Connection conn, String schemaName, String trigger,
+            String tableName, boolean before, int type) {
+        this.triggerName = trigger;
+        if (!"PARENT".equals(tableName)) {
+            throw new AssertionError("supposed to be PARENT");
+        }
+        if ((trigger.endsWith("AFTER") && before)
+                || (trigger.endsWith("BEFORE") && !before)) {
+            throw new AssertionError(
+                    "triggerName: " + trigger + " before:" + before);
+        }
+        if ((trigger.startsWith("UPD") && type != UPDATE)
+                || (trigger.startsWith("INS") && type != INSERT)
+                || (trigger.startsWith("DEL") && type != DELETE)) {
+            throw new AssertionError(
+                    "triggerName: " + trigger + " type:" + type);
+        }
+    }
+
+    private String getCreateTriggerSQL() {
+        StringBuffer buf = new StringBuffer();
+        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 "
+                + "FOR EACH ROW NOWAIT CALL \"" + getClass().getName() + "\";");
+        buf.append("CREATE TRIGGER DEL_BEFORE " + "BEFORE DELETE ON PARENT "
+                + "FOR EACH ROW NOWAIT CALL \"" + getClass().getName() + "\";");
+        return buf.toString();
+    }
+
+}

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

@@ -58,28 +58,20 @@ public class TestConnection extends TestBase {
      * This is needed when using h2 in websphere liberty.
      */
     private void testSetInternalPropertyToInitialValue() throws SQLException {
-      // 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();
-  }
-
+        // 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/test/scripts/TestScript.java

@@ -77,7 +77,7 @@ public class TestScript extends TestBase {
             return;
         }
         reconnectOften = !config.memory && config.big;
-        
+
         testScript("testScript.sql");
         testScript("altertable-index-reuse.sql");
         testScript("query-optimisations.sql");

h2/src/test/org/h2/test/scripts/altertable-index-reuse.sql

@@ -13,11 +13,11 @@ CREATE TABLE "users" ("id" bigint NOT NULL auto_increment PRIMARY KEY,"username"
 ALTER TABLE "users" ADD CONSTRAINT "domainusername_key" UNIQUE ("domain","username");
 > ok
 
+-- adds foreign key on domain - if domainusername_key didn't exist it would create unique index on domain, but it reuses the existing index
 ALTER TABLE "users"  ADD CONSTRAINT "udomain_fkey" FOREIGN KEY ("domain") REFERENCES "domains"("id") ON DELETE RESTRICT;
 > ok
 
-
+-- now we drop the domainusername_key, but domainusername_key_INDEX_xxx is used by udomain_fkey and was not being dropped
 -- this was an issue, because it's a unique index and still enforcing constraint on (domain,username)
 ALTER TABLE "users" DROP CONSTRAINT "domainusername_key";
 > ok
@@ -29,5 +29,5 @@ insert into "users" ("username","domain","desc") VALUES ('test',1,'first user');
 > update count: 1
 
 -- should work,because we dropped domainusername_key, but failed: Unique index or primary key violation
-INSERT INTO "users" ("username","domain","desc") VALUES ('test',1,'second user'); 
+INSERT INTO "users" ("username","domain","desc") VALUES ('test',1,'second user');
 > update count: 1

h2/src/test/org/h2/test/scripts/functions/system/set.sql

@@ -19,7 +19,7 @@ SET COLUMN_NAME_RULES=DEFAULT_COLUMN_NAME_PATTERN = 'noName$$';
 SET COLUMN_NAME_RULES=GENERATE_UNIQUE_COLUMN_NAMES = 1;
 > ok
 
-SELECT 1 AS VERY_VERY_VERY_LONG_ID_VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1 
+SELECT 1 AS VERY_VERY_VERY_LONG_ID_VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1
 +47, 'x' , '!!!' , '!!!!' FROM SYSTEM_RANGE(1,2);
 > VERY_VERY_VERY_LONG_ID_VERY_VE _123456789012345 SUMX1 SUMX147 x noName6 noName7
 > ------------------------------ ---------------- ----- ------- - ------- -------
@@ -28,7 +28,7 @@ SELECT 1 AS VERY_VERY_VERY_LONG_ID_VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _12345678
 SET COLUMN_NAME_RULES=EMULATE='Oracle';
 > ok
 
-SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1 
+SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1
 +47, 'x' , '!!!' , '!!!!' FROM SYSTEM_RANGE(1,2);
 > VERY_VERY_VERY_LONG_ID _123456789012345 SUMX1 SUMX147 x _UNNAMED_6 _UNNAMED_7
 > ---------------------- ---------------- ----- ------- - ---------- ----------
@@ -37,7 +37,7 @@ SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM
 SET COLUMN_NAME_RULES=EMULATE='Oracle';
 > ok
 
-SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1 
+SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1
 +47, 'x' , '!!!' , '!!!!', 'Very Long' AS _23456789012345678901234567890XXX FROM SYSTEM_RANGE(1,2);
 > VERY_VERY_VERY_LONG_ID _123456789012345 SUMX1 SUMX147 x _UNNAMED_6 _UNNAMED_7 _23456789012345678901234567890XXX
 > ---------------------- ---------------- ----- ------- - ---------- ---------- ---------------------------------
@@ -46,7 +46,7 @@ SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM
 SET COLUMN_NAME_RULES=EMULATE='PostgreSQL';
 > ok
 
-SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1 
+SELECT 1 AS VERY_VERY_VERY_LONG_ID, SUM(X)+1 AS _123456789012345, SUM(X)+1 , SUM(X)+1
 +47, 'x' , '!!!' , '!!!!', 999 AS "QuotedColumnId" FROM SYSTEM_RANGE(1,2);
 > VERY_VERY_VERY_LONG_ID _123456789012345 SUMX1 SUMX147 x _UNNAMED_6 _UNNAMED_7 QuotedColumnId
 > ---------------------- ---------------- ----- ------- - ---------- ---------- --------------

h2/src/test/org/h2/test/scripts/query-optimisations.sql

@@ -14,7 +14,7 @@ insert into person select convert(x,varchar) as firstname, (convert(x,varchar) |
 
 -- Issue #643: verify that when using an index, we use the IN part of the query, if that part of the query
 -- can directly use the index.
--- 
+--
 explain analyze SELECT * FROM person WHERE firstname IN ('FirstName1', 'FirstName2') AND lastname='LastName1';
 > PLAN
 > -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

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

-package org.h2.util;
-
-
-import org.h2.expression.Expression;
-import org.h2.expression.ValueExpression;
-import org.h2.test.TestBase;
-
-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){
-        
-        new TestColumnNamer().test();
-    }
-
-    public void test() {
-        ColumnNamer columnNamer = new ColumnNamer(null);
-        columnNamer.getConfiguration().configure("MAX_IDENTIFIER_LENGTH = 30");
-        columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_ALLOWED = '[A-Za-z0-9_]+'");
-        columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_DISALLOWED = '[^A-Za-z0-9_]+'");
-        columnNamer.getConfiguration().configure("DEFAULT_COLUMN_NAME_PATTERN = 'colName$$'");
-        columnNamer.getConfiguration().configure("GENERATE_UNIQUE_COLUMN_NAMES = 1");
-        
-        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]);
-            index++;
-        }
-    }
-}
+/*
+ * 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" };
+
+    /**
+     * Run just this test.
+     *
+     * @param a ignored
+     */
+    public static void main(String[] args) {
+        new TestColumnNamer().test();
+    }
+
+    public void test() {
+        ColumnNamer columnNamer = new ColumnNamer(null);
+        columnNamer.getConfiguration().configure("MAX_IDENTIFIER_LENGTH = 30");
+        columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_ALLOWED = '[A-Za-z0-9_]+'");
+        columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_DISALLOWED = '[^A-Za-z0-9_]+'");
+        columnNamer.getConfiguration().configure("DEFAULT_COLUMN_NAME_PATTERN = 'colName$$'");
+        columnNamer.getConfiguration().configure("GENERATE_UNIQUE_COLUMN_NAMES = 1");
+
+        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]);
+            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

@@ -746,4 +746,11 @@ rowids searchers tcnt enforcing timeanddate nullifies determines believe giving
 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
+collaboration thank essentially bunch vmlens subroutines nulled
\ No newline at end of file
+
+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