github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7171] Allow JOIN keywords as columns in SELECT

Browse Source
This commit is contained in:
lukaseder 2018-03-09 13:52:43 +01:00
parent fef4fc1716
commit 02ab3c6f9e
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -3167,7 +3167,7 @@ final class ParserImpl implements Parser {
if (parseKeywordIf(ctx, "AS"))
alias = parseIdentifier(ctx);
else if (!peekKeyword(ctx, SELECT_KEYWORDS))
else if (!peekKeyword(ctx, KEYWORDS_IN_FROM))
alias = parseIdentifierIf(ctx);
if (alias != null) {
@ -3373,7 +3373,7 @@ final class ParserImpl implements Parser {
List<SelectFieldOrAsterisk> result = new ArrayList<SelectFieldOrAsterisk>();
do {
if (peekKeyword(ctx, SELECT_KEYWORDS))
if (peekKeyword(ctx, KEYWORDS_IN_SELECT))
throw ctx.exception("Select keywords must be quoted");
QualifiedAsterisk qa;
@ -3389,7 +3389,7 @@ final class ParserImpl implements Parser {
if (parseKeywordIf(ctx, "AS"))
alias = parseIdentifier(ctx, true);
else if (!peekKeyword(ctx, SELECT_KEYWORDS))
else if (!peekKeyword(ctx, KEYWORDS_IN_SELECT))
alias = parseIdentifierIf(ctx, true);
result.add(alias == null ? field : field.as(alias));
@ -7562,7 +7562,32 @@ final class ParserImpl implements Parser {
REGR_SXY,
}
private static final String[] SELECT_KEYWORDS = {
private static final String[] KEYWORDS_IN_SELECT = {
"CONNECT",
"EXCEPT",
"FETCH",
"FOR",
"FROM",
"FULL",
"GO", // The T-SQL statement batch delimiter, not a SELECT keyword
"GROUP BY",
"HAVING",
"INTERSECT",
"INTO",
"LIMIT",
"MINUS",
"OFFSET",
"ORDER BY",
"PARTITION",
"RETURNING",
"SELECT",
"START",
"UNION",
"WHERE",
"WITH",
};
private static final String[] KEYWORDS_IN_FROM = {
"CONNECT",
"CROSS",
"EXCEPT",