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

[#4856] Simplified unionParenthesis logic

Browse Source
This commit is contained in:
lukaseder 2017-04-20 12:35:25 +02:00
parent 6811484f8b
commit 43fe58b187
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,7 @@ import java.sql.ResultSetMetaData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -1473,6 +1474,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
private static final EnumSet<SQLDialect> UNION_PARENTHESIS = EnumSet.of(DERBY, MARIADB, MYSQL, SQLITE);
private final void unionParenthesis(Context<?> ctx, String parenthesis) {
if (")".equals(parenthesis)) {
@ -1482,23 +1485,13 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
// [#3579] Nested set operators aren't supported in some databases. Emulate them via derived tables...
else if ("(".equals(parenthesis)) {
switch (ctx.family()) {
case DERBY:
case SQLITE:
case MARIADB:
case MYSQL:
ctx.formatNewLine()
.visit(K_SELECT)
.sql(" *")
.formatSeparator()
.visit(K_FROM)
.sql(' ');
break;
}
if (UNION_PARENTHESIS.contains(ctx.family()))
ctx.formatNewLine()
.visit(K_SELECT)
.sql(" *")
.formatSeparator()
.visit(K_FROM)
.sql(' ');
}
// [#3579] ... but don't use derived tables to emulate nested set operators for Firebird, as that
@ -1522,18 +1515,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
}
else if (")".equals(parenthesis)) {
switch (ctx.family()) {
case DERBY:
case SQLITE:
case MARIADB:
case MYSQL:
ctx.sql(" x");
break;
}
if (UNION_PARENTHESIS.contains(ctx.family()))
ctx.sql(" x");
}
}