提交 240fc045 authored 作者: Noel Grandin's avatar Noel Grandin

Fix some more potential issues with column names

that are also keywords
上级 8fbe0e15
...@@ -3886,6 +3886,8 @@ public class Parser { ...@@ -3886,6 +3886,8 @@ public class Parser {
case 'C': case 'C':
if (s.equals("CHECK")) { if (s.equals("CHECK")) {
return KEYWORD; return KEYWORD;
} if (s.equals("CONSTRAINT")) {
return KEYWORD;
} else if (s.equals("CURRENT_TIMESTAMP")) { } else if (s.equals("CURRENT_TIMESTAMP")) {
return CURRENT_TIMESTAMP; return CURRENT_TIMESTAMP;
} else if (s.equals("CURRENT_TIME")) { } else if (s.equals("CURRENT_TIME")) {
...@@ -3906,6 +3908,8 @@ public class Parser { ...@@ -3906,6 +3908,8 @@ public class Parser {
return KEYWORD; return KEYWORD;
} else if ("FOR".equals(s)) { } else if ("FOR".equals(s)) {
return KEYWORD; return KEYWORD;
} else if ("FOREIGN".equals(s)) {
return KEYWORD;
} else if ("FULL".equals(s)) { } else if ("FULL".equals(s)) {
return KEYWORD; return KEYWORD;
} else if (supportOffsetFetch && "FETCH".equals(s)) { } else if (supportOffsetFetch && "FETCH".equals(s)) {
...@@ -3917,7 +3921,9 @@ public class Parser { ...@@ -3917,7 +3921,9 @@ public class Parser {
case 'H': case 'H':
return getKeywordOrIdentifier(s, "HAVING", KEYWORD); return getKeywordOrIdentifier(s, "HAVING", KEYWORD);
case 'I': case 'I':
if ("INNER".equals(s)) { if ("INDEX".equals(s)) {
return KEYWORD;
} if ("INNER".equals(s)) {
return KEYWORD; return KEYWORD;
} else if ("INTERSECT".equals(s)) { } else if ("INTERSECT".equals(s)) {
return KEYWORD; return KEYWORD;
...@@ -3925,6 +3931,8 @@ public class Parser { ...@@ -3925,6 +3931,8 @@ public class Parser {
return getKeywordOrIdentifier(s, "IS", KEYWORD); return getKeywordOrIdentifier(s, "IS", KEYWORD);
case 'J': case 'J':
return getKeywordOrIdentifier(s, "JOIN", KEYWORD); return getKeywordOrIdentifier(s, "JOIN", KEYWORD);
case 'K':
return getKeywordOrIdentifier(s, "KEY", KEYWORD);
case 'L': case 'L':
if ("LIMIT".equals(s)) { if ("LIMIT".equals(s)) {
return KEYWORD; return KEYWORD;
...@@ -3935,6 +3943,8 @@ public class Parser { ...@@ -3935,6 +3943,8 @@ public class Parser {
case 'N': case 'N':
if ("NOT".equals(s)) { if ("NOT".equals(s)) {
return KEYWORD; return KEYWORD;
} else if ("NOCHECK".equals(s)) {
return KEYWORD;
} else if ("NATURAL".equals(s)) { } else if ("NATURAL".equals(s)) {
return KEYWORD; return KEYWORD;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论