The INSERT optimizations (INSERT ... DIRECT SORTED SELECT) were not parsed…

The INSERT optimizations (INSERT ... DIRECT SORTED SELECT) were not parsed correctly when using a column list.

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

@@ -921,12 +921,6 @@ public class Parser {
         read("INTO");
         Table table = readTableOrView();
         command.setTable(table);
-        if (readIf("DIRECT")) {
-            command.setInsertFromSelect(true);
-        }
-        if (readIf("SORTED")) {
-            command.setSortedInsertMode(true);
-        }
         if (readIf("(")) {
             if (isSelect()) {
                 command.setQuery(parseSelect());
@@ -936,6 +930,12 @@ public class Parser {
             Column[] columns = parseColumnList(table);
             command.setColumns(columns);
         }
+        if (readIf("DIRECT")) {
+            command.setInsertFromSelect(true);
+        }
+        if (readIf("SORTED")) {
+            command.setSortedInsertMode(true);
+        }
         if (readIf("DEFAULT")) {
             read("VALUES");
             Expression[] expr = { };

h2/src/test/org/h2/test/test-1.3.txt

 --- special grammar and test cases ---------------------------------------------------------------------------------------------
+create table test(id int primary key);
+> ok
+
+insert into test(id) direct sorted select x from system_range(1, 100);
+> update count: 100
+
+explain insert into test(id) direct sorted select x from system_range(1, 100);
+> PLAN
+> -----------------------------------------------------------------------------------------------------
+> INSERT INTO PUBLIC.TEST(ID) DIRECT SORTED SELECT X FROM SYSTEM_RANGE(1, 100) /* PUBLIC.RANGE_INDEX */
+> rows: 1
+
+drop table test;
+> ok
+
 create table test(d date, t time, ts timestamp);
 > ok