Extract Parser.parseValuesForInsert()

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

@@ -956,6 +956,20 @@ public class Parser {
         return false;
     }
 
+    private Expression[] parseValuesForInsert() {
+        ArrayList<Expression> values = Utils.newSmallArrayList();
+        if (!readIf(")")) {
+            do {
+                if (readIf("DEFAULT")) {
+                    values.add(null);
+                } else {
+                    values.add(readExpression());
+                }
+            } while (readIfMore(false));
+        }
+        return values.toArray(new Expression[0]);
+    }
+
     private Prepared parseHelp() {
         StringBuilder buff = new StringBuilder(
                 "SELECT * FROM INFORMATION_SCHEMA.HELP");
@@ -1105,18 +1119,8 @@ public class Parser {
         }
         if (readIf("VALUES")) {
             do {
-                ArrayList<Expression> values = Utils.newSmallArrayList();
                 read("(");
-                if (!readIf(")")) {
-                    do {
-                        if (readIf("DEFAULT")) {
-                            values.add(null);
-                        } else {
-                            values.add(readExpression());
-                        }
-                    } while (readIfMore(false));
-                }
-                command.addRow(values.toArray(new Expression[0]));
+                command.addRow(parseValuesForInsert());
             } while (readIf(","));
         } else {
             command.setQuery(parseSelect());
@@ -1334,17 +1338,7 @@ public class Parser {
         } else if (readIf("VALUES")) {
             read("(");
             do {
-                ArrayList<Expression> values = Utils.newSmallArrayList();
-                if (!readIf(")")) {
-                    do {
-                        if (readIf("DEFAULT")) {
-                            values.add(null);
-                        } else {
-                            values.add(readExpression());
-                        }
-                    } while (readIfMore(false));
-                }
-                command.addRow(values.toArray(new Expression[0]));
+                command.addRow(parseValuesForInsert());
                 // the following condition will allow (..),; and (..);
             } while (readIf(",") && readIf("("));
         } else if (readIf("SET")) {
@@ -1392,18 +1386,8 @@ public class Parser {
         }
         if (readIf("VALUES")) {
             do {
-                ArrayList<Expression> values = Utils.newSmallArrayList();
                 read("(");
-                if (!readIf(")")) {
-                    do {
-                        if (readIf("DEFAULT")) {
-                            values.add(null);
-                        } else {
-                            values.add(readExpression());
-                        }
-                    } while (readIfMore(false));
-                }
-                command.addRow(values.toArray(new Expression[0]));
+                command.addRow(parseValuesForInsert());
             } while (readIf(","));
         } else {
             command.setQuery(parseSelect());