Merge remote-tracking branch 'upstream/master' into Issue#458

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

@@ -3886,8 +3886,6 @@ public class Parser {
         case 'C':
             if (s.equals("CHECK")) {
                 return KEYWORD;
-            } if (s.equals("CONSTRAINT")) {
-                return KEYWORD;
             } else if (s.equals("CURRENT_TIMESTAMP")) {
                 return CURRENT_TIMESTAMP;
             } else if (s.equals("CURRENT_TIME")) {
@@ -3908,8 +3906,6 @@ public class Parser {
                 return KEYWORD;
             } else if ("FOR".equals(s)) {
                 return KEYWORD;
-            } else if ("FOREIGN".equals(s)) {
-                return KEYWORD;
             } else if ("FULL".equals(s)) {
                 return KEYWORD;
             } else if (supportOffsetFetch && "FETCH".equals(s)) {
@@ -3921,9 +3917,7 @@ public class Parser {
         case 'H':
             return getKeywordOrIdentifier(s, "HAVING", KEYWORD);
         case 'I':
-            if ("INDEX".equals(s)) {
-                return KEYWORD;
-            } if ("INNER".equals(s)) {
+            if ("INNER".equals(s)) {
                 return KEYWORD;
             } else if ("INTERSECT".equals(s)) {
                 return KEYWORD;
@@ -3931,8 +3925,6 @@ public class Parser {
             return getKeywordOrIdentifier(s, "IS", KEYWORD);
         case 'J':
             return getKeywordOrIdentifier(s, "JOIN", KEYWORD);
-        case 'K':
-            return getKeywordOrIdentifier(s, "KEY", KEYWORD);
         case 'L':
             if ("LIMIT".equals(s)) {
                 return KEYWORD;
@@ -3943,8 +3935,6 @@ public class Parser {
         case 'N':
             if ("NOT".equals(s)) {
                 return KEYWORD;
-            } else if ("NOCHECK".equals(s)) {
-                return KEYWORD;
             } else if ("NATURAL".equals(s)) {
                 return KEYWORD;
             }