Standard no-arg datetime value functions don't have parentheses

h2/src/docsrc/help/help.csv

@@ -4493,17 +4493,17 @@ CALL TRANSLATE('Hello world', 'eo', 'EO')
 "
 
 "Functions (Time and Date)","CURRENT_DATE","
-{ CURRENT_DATE [ () ] | CURDATE() | SYSDATE | TODAY }
+{ CURRENT_DATE | CURDATE() | SYSDATE | TODAY }
 ","
 Returns the current date.
 These methods always return the same value within a transaction (default)
 or within a command depending on database mode.
 ","
-CURRENT_DATE()
+CURRENT_DATE
 "
 
 "Functions (Time and Date)","CURRENT_TIME","
-{ CURRENT_TIME [ ( [ int ] ) ] | LOCALTIME [ ( [ int ] ) ] | CURTIME() }
+{ CURRENT_TIME [ (int) ] | LOCALTIME [ (int) ] | CURTIME([ int ]) }
 ","
 Returns the current time.
 If fractional seconds precision is specified it should be from 0 to 9, 0 is default.
@@ -4513,11 +4513,13 @@ Higher precision is not available before Java 9.
 These methods always return the same value within a transaction (default)
 or within a command depending on database mode.
 ","
-CURRENT_TIME()
+CURRENT_TIME
+LOCALTIME
+LOCALTIME(9)
 "
 
 "Functions (Time and Date)","CURRENT_TIMESTAMP","
-CURRENT_TIMESTAMP [ ( [ int ] ) ]
+CURRENT_TIMESTAMP [ (int) ]
 ","
 Returns the current timestamp with time zone.
 Time zone offset is set to a current time zone offset
@@ -4528,11 +4530,12 @@ Higher precision is not available before Java 9.
 This method always returns the same value within a transaction (default)
 or within a command depending on database mode.
 ","
-CURRENT_TIMESTAMP()
+CURRENT_TIMESTAMP
+CURRENT_TIMESTAMP(9)
 "
 
 "Functions (Time and Date)","LOCALTIMESTAMP","
-{ LOCALTIMESTAMP [ ( [ int ] ) ] | NOW( [ int ] ) }
+{ LOCALTIMESTAMP [ (int) ] | NOW( [ int ] ) }
 ","
 Returns the current timestamp.
 If fractional seconds precision is specified it should be from 0 to 9, 6 is default.
@@ -4542,7 +4545,8 @@ Higher precision is not available before Java 9.
 These methods always return the same value within a transaction (default)
 or within a command depending on database mode.
 ","
-LOCALTIMESTAMP()
+LOCALTIMESTAMP
+LOCALTIMESTAMP(9)
 "
 
 "Functions (Time and Date)","DATEADD","

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

@@ -45,6 +45,11 @@ public final class FunctionInfo {
      */
     final boolean bufferResultSetToLocalTemp;
 
+    /**
+     * Should the no-arg function require parentheses.
+     */
+    final boolean requireParentheses;
+
     /**
      * Creates new instance of built-in function information.
      *
@@ -65,9 +70,11 @@ public final class FunctionInfo {
      * @param bufferResultSetToLocalTemp
      *            should the return value ResultSet be buffered in a local
      *            temporary file?
+     * @param requireParentheses
+     *            should the no-arg function require parentheses
      */
     public FunctionInfo(String name, int type, int parameterCount, int returnDataType, boolean nullIfParameterIsNull,
-            boolean deterministic, boolean bufferResultSetToLocalTemp) {
+            boolean deterministic, boolean bufferResultSetToLocalTemp, boolean requireParentheses) {
         this.name = name;
         this.type = type;
         this.parameterCount = parameterCount;
@@ -75,10 +82,12 @@ public final class FunctionInfo {
         this.nullIfParameterIsNull = nullIfParameterIsNull;
         this.deterministic = deterministic;
         this.bufferResultSetToLocalTemp = bufferResultSetToLocalTemp;
+        this.requireParentheses = requireParentheses;
     }
 
     /**
-     * Creates a copy of built-in function information with a different name.
+     * Creates a copy of built-in function information with a different name. A
+     * copy will require parentheses.
      *
      * @param source
      *            the source information
@@ -93,6 +102,7 @@ public final class FunctionInfo {
         nullIfParameterIsNull = source.nullIfParameterIsNull;
         deterministic = source.deterministic;
         bufferResultSetToLocalTemp = source.bufferResultSetToLocalTemp;
+        requireParentheses = true;
     }
 
 }

h2/src/main/org/h2/mode/FunctionsMySQL.java

@@ -38,11 +38,11 @@ public class FunctionsMySQL extends FunctionsBase {
 
     static {
         FUNCTIONS.put("UNIX_TIMESTAMP", new FunctionInfo("UNIX_TIMESTAMP", UNIX_TIMESTAMP,
-                VAR_ARGS, Value.INT, false, false, false));
+                VAR_ARGS, Value.INT, false, false, false, true));
         FUNCTIONS.put("FROM_UNIXTIME", new FunctionInfo("FROM_UNIXTIME", FROM_UNIXTIME,
-                VAR_ARGS, Value.STRING, false, true, false));
+                VAR_ARGS, Value.STRING, false, true, false, true));
         FUNCTIONS.put("DATE", new FunctionInfo("DATE", DATE,
-                1, Value.DATE, false, true, false));
+                1, Value.DATE, false, true, false, true));
     }
 
     /**

h2/src/test/org/h2/test/scripts/default-and-on_update.sql

@@ -88,10 +88,10 @@ ALTER TABLE TEST ALTER COLUMN V SET ON UPDATE NULL;
 
 SELECT COLUMN_NAME, COLUMN_DEFAULT, COLUMN_ON_UPDATE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'TEST' ORDER BY COLUMN_NAME;
 > COLUMN_NAME COLUMN_DEFAULT              COLUMN_ON_UPDATE
-> ----------- --------------------------- -------------------
+> ----------- --------------------------- -----------------
 > ID          null                        null
 > V           (NEXT VALUE FOR PUBLIC.SEQ) NULL
-> V2          null                        CURRENT_TIMESTAMP()
+> V2          null                        CURRENT_TIMESTAMP
 > rows (ordered): 3
 
 ALTER TABLE TEST ALTER COLUMN V DROP ON UPDATE;
@@ -99,10 +99,10 @@ ALTER TABLE TEST ALTER COLUMN V DROP ON UPDATE;
 
 SELECT COLUMN_NAME, COLUMN_DEFAULT, COLUMN_ON_UPDATE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'TEST' ORDER BY COLUMN_NAME;
 > COLUMN_NAME COLUMN_DEFAULT              COLUMN_ON_UPDATE
-> ----------- --------------------------- -------------------
+> ----------- --------------------------- -----------------
 > ID          null                        null
 > V           (NEXT VALUE FOR PUBLIC.SEQ) null
-> V2          null                        CURRENT_TIMESTAMP()
+> V2          null                        CURRENT_TIMESTAMP
 > rows (ordered): 3
 
 DROP TABLE TEST;