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

[jOOQ/jOOQ#11290] Parser parses PRIMARYKEY as PRIMARY KEY

Browse Source
This commit is contained in:
Lukas Eder 2021-01-22 15:14:21 +01:00
parent 6bc294580c
commit 0cca2dc384
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6818,9 +6818,9 @@ final class ParserContext {
return currentCatalog();
else if ((parseFunctionNameIf("CURRENT_DATABASE") && parse('(') && parse(')')))
return currentCatalog();
else if ((parseKeywordIf("CURRENT_SCHEMA") || parseKeywordIf("CURRENT SCHEMA")) && (parseIf('(') && parse(')') || true))
else if ((parseKeywordIf("CURRENT_SCHEMA", "CURRENT SCHEMA")) && (parseIf('(') && parse(')') || true))
return currentSchema();
else if ((parseKeywordIf("CURRENT_USER") || parseKeywordIf("CURRENT USER")) && (parseIf('(') && parse(')') || true))
else if ((parseKeywordIf("CURRENT_USER", "CURRENT USER", "CURRENTUSER")) && (parseIf('(') && parse(')') || true))
return currentUser();
else if (parseFunctionNameIf("CHR", "CHAR"))
return chr((Field) parseFieldParenthesised(N));
@ -12023,6 +12023,9 @@ final class ParserContext {
switch (c) {
case ' ':
if (!Character.isWhitespace(sql[pos]))
return false;
skip = skip + (afterWhitespace(pos) - pos - 1);
break;
@ -12544,10 +12547,6 @@ final class ParserContext {
return character(position);
}
private final char characterUpper(int pos) {
return Character.toUpperCase(character(pos));
}
private final char character(int pos) {
return pos >= 0 && pos < sql.length ? sql[pos] : ' ';
}
@ -12592,18 +12591,6 @@ final class ParserContext {
ignoreHints = newIgnoreHints;
}
private final boolean isWhitespace() {
return Character.isWhitespace(character());
}
private final boolean isWhitespace(int pos) {
return Character.isWhitespace(character(pos));
}
private final boolean isOperatorPart() {
return isOperatorPart(character());
}
private final boolean isOperatorPart(int pos) {
return isOperatorPart(character(pos));
}