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

[jOOQ/jOOQ#3676] Fixed formatting

Browse Source
This commit is contained in:
Lukas Eder 2020-01-28 11:19:34 +01:00
parent 3af4c5f6ec
commit e01d695e51
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -1535,7 +1535,9 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
.visit(op.toKeyword(family))
.sql(' ');
unionParenthesis(context, '(', other.getSelect().toArray(EMPTY_FIELD), unionParensRequired);
if (!unionParenthesis(context, '(', other.getSelect().toArray(EMPTY_FIELD), unionParensRequired) && !unionParensRequired)
context.formatNewLine();
context.visit(other);
unionParenthesis(context, ')', null, unionParensRequired);
}
@ -1805,7 +1807,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
return select.orderBy.size() > 0 || select.limit.isApplicable();
}
private final void unionParenthesis(Context<?> ctx, char parenthesis, Field<?>[] fields, boolean parensRequired) {
private final boolean unionParenthesis(Context<?> ctx, char parenthesis, Field<?>[] fields, boolean parensRequired) {
boolean derivedTable =
// [#3579] [#6431] [#7222] Some databases don't support nested set operations at all
@ -1877,6 +1879,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
if (derivedTable)
ctx.sql(" x");
}
return parensRequired;
}
@Override