Fix single-column row value expressions in UPDATE command

h2/src/docsrc/help/help.csv

@@ -2597,11 +2597,13 @@ COMPRESSION LZF
 "Other Grammar","Row value expression","
 ROW (expression, [,...])
     | ( [ expression, expression [,...] ] )
+    | expression
 ","
 A row value expression.
 ","
 ROW (1)
 (1, 2)
+1
 "
 
 "Other Grammar","Select Expression","

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

@@ -1175,7 +1175,7 @@ public class Parser {
             } while (readIfMore(true));
             read(EQUAL);
             Expression expression = readExpression();
-            if (columns.size() == 1) {
+            if (columns.size() == 1 && expression.getType().getValueType() != Value.ROW) {
                 // the expression is parsed as a simple value
                 command.setAssignment(columns.get(0), expression);
             } else {

h2/src/test/org/h2/test/scripts/TestScript.java

@@ -158,7 +158,7 @@ public class TestScript extends TestDb {
             testScript("ddl/" + s + ".sql");
         }
         for (String s : new String[] { "delete", "error_reporting", "insert", "insertIgnore", "merge", "mergeUsing",
-                "replace", "script", "select", "show", "table", "values", "with" }) {
+                "replace", "script", "select", "show", "table", "update", "values", "with" }) {
             testScript("dml/" + s + ".sql");
         }
         for (String s : new String[] { "help" }) {

h2/src/test/org/h2/test/scripts/dml/update.sql

+-- Copyright 2004-2019 H2 Group. Multiple-Licensed under the MPL 2.0,
+-- and the EPL 1.0 (http://h2database.com/html/license.html).
+-- Initial Developer: H2 Group
+--
+
+CREATE TABLE TEST(A INT, B INT);
+> ok
+
+INSERT INTO TEST VALUES (1, 2);
+> update count: 1
+
+UPDATE TEST SET (A, B) = (3, 4);
+> update count: 1
+
+SELECT * FROM TEST;
+> A B
+> - -
+> 3 4
+> rows: 1
+
+UPDATE TEST SET (B) = 5;
+> update count: 1
+
+SELECT B FROM TEST;
+>> 5
+
+UPDATE TEST SET (B) = ROW (6);
+> update count: 1
+
+SELECT B FROM TEST;
+>> 6
+
+UPDATE TEST SET (B) = (7);
+> update count: 1
+
+SELECT B FROM TEST;
+>> 7
+
+DROP TABLE TEST;
+> ok

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

@@ -3,10 +3,10 @@
 -- Initial Developer: H2 Group
 --
 
-select * from table(a int=(1)), table(b int=(2));
-> A B
-> - -
-> 1 2
+select * from table(a int=(1)), table(b int=2), table(c int=row(3));
+> A B C
+> - - -
+> 1 2 3
 > rows: 1
 
 create table test as select * from table(id int=(1, 2, 3));