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

[#2995] Deliver fix also to OSS Edition

Browse Source
This commit is contained in:
lukaseder 2016-03-01 13:28:49 +01:00
parent a3119571c7
commit a87ad782fe
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,10 +883,11 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
//
// Depending on the dialect and on various syntax elements, parts of the above must be wrapped in
// synthetic parentheses
boolean wrapQueryExpressionInDerivedTable = false;
boolean wrapQueryExpressionInDerivedTable;
boolean wrapQueryExpressionBodyInDerivedTable = false;
wrapQueryExpressionInDerivedTable = false
@ -894,15 +895,17 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
// [#2995] Prevent the generation of wrapping parentheses around the
// INSERT .. SELECT statement's SELECT because they would be
// interpreted as the (missing) INSERT column list's parens.
|| (context.data(DATA_INSERT_SELECT_WITHOUT_INSERT_COLUMN_LIST) != null && unionOpSize > 0);
if (wrapQueryExpressionInDerivedTable)
context.keyword("select").sql(" *")
.formatSeparator()
.keyword("from").sql(" (")
.formatIndentStart()
.formatNewLine();
@ -1342,12 +1345,10 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
context.end(SELECT_ORDER_BY);
if (wrapQueryExpressionInDerivedTable)
context.formatIndentEnd()
.formatNewLine()
.sql(')');
if (context.data().containsKey(DATA_RENDER_TRAILING_LIMIT_IF_APPLICABLE) && actualLimit.isApplicable())
context.visit(actualLimit);