Formatting

h2/src/docsrc/html/mvstore.html

@@ -253,7 +253,7 @@ performance characteristics) until data is persisted.
 As in all map implementations, keys need to be immutable, that means
 changing the key object after an entry has been added is not allowed.
 If a file name is specified, the value may also not be changed after
-adding an entry, because it might be serialized 
+adding an entry, because it might be serialized
 (which could happen at any time when autocommit is enabled).
 </p>
 
@@ -327,7 +327,7 @@ this should improve write performance for file systems and storage systems
 that do not efficiently support small random writes, such as Btrfs, as well as SSDs.
 (According to a test, write throughput of a common SSD increases with write block size,
 until a block size of 2 MB, and then does not further increase.)
-By default, changes are automatically written when more than a number of pages are modified, 
+By default, changes are automatically written when more than a number of pages are modified,
 and once every second in a background thread, even if only little data was changed.
 Changes can also be written explicitly by calling <code>commit()</code>.
 </p><p>

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

@@ -150,7 +150,7 @@ import org.h2.value.ValueTimestamp;
 
 /**
  * The parser is used to convert a SQL statement string to an command object.
- * 
+ *
  * @author Thomas Mueller
  * @author Noel Grandin
  * @author Nicolas Fortin, Atelier SIG, IRSTV FR CNRS 24888
@@ -211,7 +211,7 @@ public class Parser {
 
     /**
      * Parse the statement and prepare it for execution.
-     * 
+     *
      * @param sql the SQL statement to parse
      * @return the prepared object
      */
@@ -226,7 +226,7 @@ public class Parser {
 
     /**
      * Parse a statement or a list of statements, and prepare it for execution.
-     * 
+     *
      * @param sql the SQL statement to parse
      * @return the command object
      */
@@ -259,7 +259,7 @@ public class Parser {
 
     /**
      * Parse the statement, but don't prepare it for execution.
-     * 
+     *
      * @param sql the SQL statement to parse
      * @return the prepared object
      */
@@ -3575,7 +3575,7 @@ public class Parser {
 
     /**
      * Checks if this string is a SQL keyword.
-     * 
+     *
      * @param s the token to check
      * @param supportOffsetFetch if OFFSET and FETCH are keywords
      * @return true if it is a keyword
@@ -5684,7 +5684,7 @@ public class Parser {
 
     /**
      * Add double quotes around an identifier if required.
-     * 
+     *
      * @param s the identifier
      * @return the quoted identifier
      */
@@ -5715,7 +5715,7 @@ public class Parser {
 
     /**
      * Parse a SQL code snippet that represents an expression.
-     * 
+     *
      * @param sql the code snippet
      * @return the expression object
      */
@@ -5728,7 +5728,7 @@ public class Parser {
 
     /**
      * Parse a SQL code snippet that represents a table name.
-     * 
+     *
      * @param sql the code snippet
      * @return the table object
      */

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

@@ -46,9 +46,11 @@ public class CreateFunctionAlias extends SchemaCommand {
             int id = getObjectId();
             FunctionAlias functionAlias;
             if (javaClassMethod != null) {
-                functionAlias = FunctionAlias.newInstance(getSchema(), id, aliasName, javaClassMethod, force, bufferResultSetToLocalTemp);
+                functionAlias = FunctionAlias.newInstance(
+                        getSchema(), id, aliasName, javaClassMethod, force, bufferResultSetToLocalTemp);
             } else {
-                functionAlias = FunctionAlias.newInstanceFromSource(getSchema(), id, aliasName, source, force, bufferResultSetToLocalTemp);
+                functionAlias = FunctionAlias.newInstanceFromSource(
+                        getSchema(), id, aliasName, source, force, bufferResultSetToLocalTemp);
             }
             functionAlias.setDeterministic(deterministic);
             db.addSchemaObject(session, functionAlias);
@@ -83,6 +85,8 @@ public class CreateFunctionAlias extends SchemaCommand {
 
     /**
      * Should the return value ResultSet be buffered in a local temporary file?
+     *
+     * @param b the new value
      */
     public void setBufferResultSetToLocalTemp(boolean b) {
         this.bufferResultSetToLocalTemp = b;

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

@@ -48,7 +48,7 @@ public class Insert extends Prepared implements ResultTarget {
     private boolean sortedInsertMode;
     private int rowNumber;
     private boolean insertFromSelect;
-    
+
     /**
      * for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE ....
      */
@@ -81,7 +81,7 @@ public class Insert extends Prepared implements ResultTarget {
     /**
      * Keep a collection of the columns to pass to update if a duplicate key
      * happens, for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE ....
-     * 
+     *
      * @param column the column
      * @param expression the expression
      */
@@ -318,9 +318,9 @@ public class Insert extends Prepared implements ResultTarget {
             throw de;
         }
         if (duplicateKeyAssignmentMap == null || duplicateKeyAssignmentMap.isEmpty()) {
-          throw de;
+            throw de;
         }
-        
+
         ArrayList<String> variableNames = new ArrayList<String>(duplicateKeyAssignmentMap.size());
         for (int i = 0; i < columns.length; i++) {
             String key = session.getCurrentSchemaName() + "." + table.getName() + "." + columns[i].getName();
@@ -358,7 +358,7 @@ public class Insert extends Prepared implements ResultTarget {
                         if (indexColumn.getName() == insertColumn.getName()) {
                             foundIndex = index;
                             break;
-                        } 
+                        }
                         foundIndex = null;
                     }
                     if (foundIndex == null) {

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

@@ -110,9 +110,6 @@ public class Set extends Prepared {
         }
         case SetTypes.COLLATION: {
             session.getUser().checkAdmin();
-            
-            
-            
             final boolean binaryUnsigned = database.getCompareMode().isBinaryUnsigned();
             CompareMode compareMode;
             StringBuilder buff = new StringBuilder(stringValue);

h2/src/main/org/h2/constant/ErrorCode.java

@@ -1721,7 +1721,7 @@ public class ErrorCode {
     /**
      * The error with code <code>90127</code> is thrown when
      * trying to update or delete a row in a result set if the result set is
-     * not updatable. Result sets are only updatable if: 
+     * not updatable. Result sets are only updatable if:
      * the statement was created with updatable concurrency;
      * all columns of the result set are from the same table;
      * the table is a data table (not a system table or view);

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

@@ -60,9 +60,12 @@ public class FunctionAlias extends SchemaObjectBase {
      * @param name the name
      * @param javaClassMethod the class and method name
      * @param force create the object even if the class or method does not exist
+     * @param bufferResultSetToLocalTemp whether the result should be buffered
      * @return the database object
      */
-    public static FunctionAlias newInstance(Schema schema, int id, String name, String javaClassMethod, boolean force, boolean bufferResultSetToLocalTemp) {
+    public static FunctionAlias newInstance(
+            Schema schema, int id, String name, String javaClassMethod,
+            boolean force, boolean bufferResultSetToLocalTemp) {
         FunctionAlias alias = new FunctionAlias(schema, id, name);
         int paren = javaClassMethod.indexOf('(');
         int lastDot = javaClassMethod.lastIndexOf('.', paren < 0 ? javaClassMethod.length() : paren);
@@ -84,9 +87,12 @@ public class FunctionAlias extends SchemaObjectBase {
      * @param name the name
      * @param source the source code
      * @param force create the object even if the class or method does not exist
+     * @param bufferResultSetToLocalTemp whether the result should be buffered
      * @return the database object
      */
-    public static FunctionAlias newInstanceFromSource(Schema schema, int id, String name, String source, boolean force, boolean bufferResultSetToLocalTemp) {
+    public static FunctionAlias newInstanceFromSource(
+            Schema schema, int id, String name, String source, boolean force,
+            boolean bufferResultSetToLocalTemp) {
         FunctionAlias alias = new FunctionAlias(schema, id, name);
         alias.source = source;
         alias.bufferResultSetToLocalTemp = bufferResultSetToLocalTemp;
@@ -513,6 +519,8 @@ public class FunctionAlias extends SchemaObjectBase {
 
     /**
      * Should the return value ResultSet be buffered in a local temporary file?
+     *
+     * @return true if yes
      */
     public boolean isBufferResultSetToLocalTemp() {
         return bufferResultSetToLocalTemp;

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

@@ -137,7 +137,7 @@ public class Mode {
      * MySQL style INSERT ... ON DUPLICATE KEY UPDATE ...
      */
     public boolean onDuplicateKeyUpdate;
-    
+
     private final String name;
 
     static {
@@ -210,7 +210,7 @@ public class Mode {
 
     /**
      * Get the mode with the given name.
-     * 
+     *
      * @param name the name of the mode
      * @return the mode object
      */

h2/src/main/org/h2/expression/Function.java

@@ -590,7 +590,8 @@ public class Function extends Expression implements FunctionCall {
             result = ValueLong.get(16 * length(v0));
             break;
         case CHAR:
-            result = ValueString.get(String.valueOf((char) v0.getInt()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(String.valueOf((char) v0.getInt()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case CHAR_LENGTH:
         case LENGTH:
@@ -621,7 +622,8 @@ public class Function extends Expression implements FunctionCall {
                             && !StringUtils.isNullOrEmpty(tmp)) {
                         tmp = separator.concat(tmp);
                     }
-                    result = ValueString.get(result.getString().concat(tmp), database.getMode().treatEmptyStringsAsNull);
+                    result = ValueString.get(result.getString().concat(tmp),
+                            database.getMode().treatEmptyStringsAsNull);
                 }
             }
             if (info.type == CONCAT_WS) {
@@ -632,19 +634,23 @@ public class Function extends Expression implements FunctionCall {
             break;
         }
         case HEXTORAW:
-            result = ValueString.get(hexToRaw(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(hexToRaw(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case LOWER:
         case LCASE:
             // TODO this is locale specific, need to document or provide a way
             // to set the locale
-            result = ValueString.get(v0.getString().toLowerCase(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(v0.getString().toLowerCase(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case RAWTOHEX:
-            result = ValueString.get(rawToHex(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(rawToHex(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case SOUNDEX:
-            result = ValueString.get(getSoundex(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(getSoundex(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case SPACE: {
             int len = Math.max(0, v0.getInt());
@@ -652,39 +658,48 @@ public class Function extends Expression implements FunctionCall {
             for (int i = len - 1; i >= 0; i--) {
                 chars[i] = ' ';
             }
-            result = ValueString.get(new String(chars), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(new String(chars),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case UPPER:
         case UCASE:
             // TODO this is locale specific, need to document or provide a way
             // to set the locale
-            result = ValueString.get(v0.getString().toUpperCase(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(v0.getString().toUpperCase(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case STRINGENCODE:
-            result = ValueString.get(StringUtils.javaEncode(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.javaEncode(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case STRINGDECODE:
-            result = ValueString.get(StringUtils.javaDecode(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.javaDecode(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case STRINGTOUTF8:
             result = ValueBytes.getNoCopy(v0.getString().getBytes(Constants.UTF8));
             break;
         case UTF8TOSTRING:
-            result = ValueString.get(new String(v0.getBytesNoCopy(), Constants.UTF8), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(new String(v0.getBytesNoCopy(), Constants.UTF8),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case XMLCOMMENT:
-            result = ValueString.get(StringUtils.xmlComment(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.xmlComment(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case XMLCDATA:
-            result = ValueString.get(StringUtils.xmlCData(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.xmlCData(v0.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case XMLSTARTDOC:
-            result = ValueString.get(StringUtils.xmlStartDoc(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.xmlStartDoc(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case DAY_NAME: {
             SimpleDateFormat dayName = new SimpleDateFormat("EEEE", Locale.ENGLISH);
-            result = ValueString.get(dayName.format(v0.getDate()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(dayName.format(v0.getDate()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case DAY_OF_MONTH:
@@ -707,7 +722,8 @@ public class Function extends Expression implements FunctionCall {
             break;
         case MONTH_NAME: {
             SimpleDateFormat monthName = new SimpleDateFormat("MMMM", Locale.ENGLISH);
-            result = ValueString.get(monthName.format(v0.getDate()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(monthName.format(v0.getDate()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case QUARTER:
@@ -757,11 +773,13 @@ public class Function extends Expression implements FunctionCall {
             break;
         }
         case DATABASE:
-            result = ValueString.get(database.getShortName(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(database.getShortName(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case USER:
         case CURRENT_USER:
-            result = ValueString.get(session.getUser().getName(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(session.getUser().getName(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case IDENTITY:
             result = session.getLastIdentity();
@@ -777,7 +795,8 @@ public class Function extends Expression implements FunctionCall {
             break;
         case DATABASE_PATH: {
             String path = database.getDatabasePath();
-            result = path == null ? (Value) ValueNull.INSTANCE : ValueString.get(path, database.getMode().treatEmptyStringsAsNull);
+            result = path == null ? (Value) ValueNull.INSTANCE : ValueString.get(path,
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case LOCK_TIMEOUT:
@@ -807,7 +826,8 @@ public class Function extends Expression implements FunctionCall {
             result = ValueInt.get(database.getLockMode());
             break;
         case SCHEMA:
-            result = ValueString.get(session.getCurrentSchemaName(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(session.getCurrentSchemaName(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case SESSION_ID:
             result = ValueInt.get(session.getId());
@@ -1110,12 +1130,14 @@ public class Function extends Expression implements FunctionCall {
             if (v1 == ValueNull.INSTANCE || v2 == ValueNull.INSTANCE) {
                 result = v1;
             } else {
-                result = ValueString.get(insert(v0.getString(), v1.getInt(), v2.getInt(), v3.getString()), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(insert(v0.getString(), v1.getInt(), v2.getInt(), v3.getString()),
+                        database.getMode().treatEmptyStringsAsNull);
             }
             break;
         }
         case LEFT:
-            result = ValueString.get(left(v0.getString(), v1.getInt()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(left(v0.getString(), v1.getInt()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case LOCATE: {
             int start = v2 == null ? 0 : v2.getInt();
@@ -1129,27 +1151,33 @@ public class Function extends Expression implements FunctionCall {
         }
         case REPEAT: {
             int count = Math.max(0, v1.getInt());
-            result = ValueString.get(repeat(v0.getString(), count), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(repeat(v0.getString(), count),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case REPLACE: {
             String s0 = v0.getString();
             String s1 = v1.getString();
             String s2 = (v2 == null) ? "" : v2.getString();
-            result = ValueString.get(replace(s0, s1, s2), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(replace(s0, s1, s2),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case RIGHT:
-            result = ValueString.get(right(v0.getString(), v1.getInt()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(right(v0.getString(), v1.getInt()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case LTRIM:
-            result = ValueString.get(StringUtils.trim(v0.getString(), true, false, v1 == null ? " " : v1.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.trim(v0.getString(), true, false, v1 == null ? " " : v1.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case TRIM:
-            result = ValueString.get(StringUtils.trim(v0.getString(), true, true, v1 == null ? " " : v1.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.trim(v0.getString(), true, true, v1 == null ? " " : v1.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case RTRIM:
-            result = ValueString.get(StringUtils.trim(v0.getString(), false, true, v1 == null ? " " : v1.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.trim(v0.getString(), false, true, v1 == null ? " " : v1.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case SUBSTR:
         case SUBSTRING: {
@@ -1159,27 +1187,31 @@ public class Function extends Expression implements FunctionCall {
                 offset = s.length() + offset + 1;
             }
             int length = v2 == null ? s.length() : v2.getInt();
-            result = ValueString.get(substring(s, offset, length), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(substring(s, offset, length),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case POSITION:
             result = ValueInt.get(locate(v0.getString(), v1.getString(), 0));
             break;
         case XMLATTR:
-            result = ValueString.get(StringUtils.xmlAttr(v0.getString(), v1.getString()), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.xmlAttr(v0.getString(), v1.getString()),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case XMLNODE: {
             String attr = v1 == null ? null : v1 == ValueNull.INSTANCE ? null : v1.getString();
             String content = v2 == null ? null : v2 == ValueNull.INSTANCE ? null : v2.getString();
             boolean indent = v3 == null ? true : v3.getBoolean();
-            result = ValueString.get(StringUtils.xmlNode(v0.getString(), attr, content, indent), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.xmlNode(v0.getString(), attr, content, indent),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         }
         case REGEXP_REPLACE: {
             String regexp = v1.getString();
             String replacement = v2.getString();
             try {
-                result = ValueString.get(v0.getString().replaceAll(regexp, replacement), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(v0.getString().replaceAll(regexp, replacement),
+                        database.getMode().treatEmptyStringsAsNull);
             } catch (StringIndexOutOfBoundsException e) {
                 throw DbException.get(ErrorCode.LIKE_ESCAPE_ERROR_1, e, replacement);
             } catch (PatternSyntaxException e) {
@@ -1188,17 +1220,21 @@ public class Function extends Expression implements FunctionCall {
             break;
         }
         case RPAD:
-            result = ValueString.get(StringUtils.pad(v0.getString(), v1.getInt(), v2 == null ? null : v2.getString(), true), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.pad(v0.getString(), v1.getInt(), v2 == null ? null : v2.getString(), true),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case LPAD:
-            result = ValueString.get(StringUtils.pad(v0.getString(), v1.getInt(), v2 == null ? null : v2.getString(), false), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(StringUtils.pad(v0.getString(), v1.getInt(), v2 == null ? null : v2.getString(), false),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case TO_CHAR:
             switch(v0.getType()){
             case Value.TIME:
             case Value.DATE:
             case Value.TIMESTAMP:
-                result = ValueString.get(toChar(v0.getTimestamp(), v1 == null ? null : v1.getString(), v2 == null ? null : v2.getString()), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(toChar(v0.getTimestamp(),
+                        v1 == null ? null : v1.getString(), v2 == null ? null : v2.getString()),
+                        database.getMode().treatEmptyStringsAsNull);
                 break;
             case Value.SHORT:
             case Value.INT:
@@ -1206,14 +1242,18 @@ public class Function extends Expression implements FunctionCall {
             case Value.DECIMAL:
             case Value.DOUBLE:
             case Value.FLOAT:
-                result = ValueString.get(toChar(v0.getBigDecimal(), v1 == null ? null : v1.getString(), v2 == null ? null : v2.getString()), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(toChar(v0.getBigDecimal(),
+                        v1 == null ? null : v1.getString(), v2 == null ? null : v2.getString()),
+                        database.getMode().treatEmptyStringsAsNull);
                 break;
             default:
-                result = ValueString.get(v0.getString(), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(v0.getString(),
+                        database.getMode().treatEmptyStringsAsNull);
             }
             break;
         case H2VERSION:
-            result = ValueString.get(Constants.getVersion(), database.getMode().treatEmptyStringsAsNull);
+            result = ValueString.get(Constants.getVersion(),
+                    database.getMode().treatEmptyStringsAsNull);
             break;
         case DATE_ADD:
             result = ValueTimestamp.get(dateadd(v0.getString(), v1.getInt(), v2.getTimestamp()));
@@ -1232,7 +1272,9 @@ public class Function extends Expression implements FunctionCall {
             } else {
                 String locale = v2 == null ? null : v2 == ValueNull.INSTANCE ? null : v2.getString();
                 String tz = v3 == null ? null : v3 == ValueNull.INSTANCE ? null : v3.getString();
-                result = ValueString.get(DateTimeUtils.formatDateTime(v0.getTimestamp(), v1.getString(), locale, tz), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(DateTimeUtils.formatDateTime(
+                        v0.getTimestamp(), v1.getString(), locale, tz),
+                        database.getMode().treatEmptyStringsAsNull);
             }
             break;
         }
@@ -1363,13 +1405,16 @@ public class Function extends Expression implements FunctionCall {
         }
         case XMLTEXT:
             if (v1 == null) {
-                result = ValueString.get(StringUtils.xmlText(v0.getString()), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(StringUtils.xmlText(v0.getString()),
+                        database.getMode().treatEmptyStringsAsNull);
             } else {
-                result = ValueString.get(StringUtils.xmlText(v0.getString(), v1.getBoolean()), database.getMode().treatEmptyStringsAsNull);
+                result = ValueString.get(StringUtils.xmlText(v0.getString(), v1.getBoolean()),
+                        database.getMode().treatEmptyStringsAsNull);
             }
             break;
         case VALUES:
-            result = session.getVariable(args[0].getSchemaName() + "." + args[0].getTableName() + "." + args[0].getColumnName());
+            result = session.getVariable(args[0].getSchemaName() + "." +
+                    args[0].getTableName() + "." + args[0].getColumnName());
             break;
         default:
             throw DbException.throwInternalError("type=" + info.type);

h2/src/main/org/h2/index/FunctionIndex.java

@@ -46,7 +46,7 @@ public class FunctionIndex extends BaseIndex {
     @Override
     public Cursor find(Session session, SearchRow first, SearchRow last) {
         if (functionTable.isBufferResultSetToLocalTemp()) {
-          return new FunctionCursor(functionTable.getResult(session));
+            return new FunctionCursor(functionTable.getResult(session));
         }
         return new FunctionCursorResultSet(session, functionTable.getResultSet(session));
     }