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

[jOOQ/jOOQ#13048] Settings.parseRetainCommentsBetweenQueries doesn't

Browse Source 
work for the last comment
This commit is contained in:
Lukas Eder 2022-02-11 10:42:25 +01:00
parent 50353904df
commit 86913f438b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -862,15 +862,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
while (parseDelimiterIf(false))
p = positionBeforeWhitespace;
if (TRUE.equals(settings().isParseRetainCommentsBetweenQueries()) && p < position) {
for (int i = p; i < position; i++) {
if (character(i) != ' ') {
result.add(new IgnoreQuery(substring(p, position)));
break;
}
}
}
retainComments(result, p);
query = patchParsedQuery(parseQuery(false, false));
if (query == IGNORE || query == IGNORE_NO_DELIMITER)
continue;
@ -879,10 +871,22 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
}
while (parseDelimiterIf(true) && (p = positionBeforeWhitespace) >= 0 && !done());
retainComments(result, p);
return done("Unexpected token or missing query delimiter", dsl.queries(result));
});
}
private final void retainComments(List<Query> result, int p) {
if (TRUE.equals(settings().isParseRetainCommentsBetweenQueries()) && p < position) {
for (int i = p; i < position; i++) {
if (character(i) != ' ') {
result.add(new IgnoreQuery(substring(p, position)));
break;
}
}
}
}
private static final Pattern P_SEARCH_PATH = Pattern.compile("(?i:select\\s+(pg_catalog\\s*\\.\\s*)?set_config\\s*\\(\\s*'search_path'\\s*,\\s*'([^']*)'\\s*,\\s*\\w+\\s*\\))");
private final Query patchParsedQuery(Query query) {