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

[jOOQ/jOOQ#10550] Remove the Derby SelectQueryImpl.UNION_PARENTHESIS_IN_DERIVED_TABLES emulation

Browse Source
This commit is contained in:
Lukas Eder 2020-08-27 17:33:04 +02:00
parent 01d3752d47
commit 1a63f4bcd1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2277,7 +2277,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
private static final Set<SQLDialect> NO_SUPPORT_UNION_PARENTHESES = SQLDialect.supportedBy(SQLITE);
private static final Set<SQLDialect> UNION_PARENTHESIS = SQLDialect.supportedBy(DERBY, MARIADB, MYSQL);
private static final Set<SQLDialect> UNION_PARENTHESIS_IN_DERIVED_TABLES = SQLDialect.supportedBy(DERBY);
final boolean hasUnions() {
return !unionOp.isEmpty();
@ -2334,9 +2333,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
// [#2995] Ambiguity may need to be resolved when parentheses could mean both:
// Set op subqueries or insert column lists
|| TRUE.equals(ctx.data(DATA_INSERT_SELECT_WITHOUT_INSERT_COLUMN_LIST))
// [#7222] [#7711] Workaround for https://issues.apache.org/jira/browse/DERBY-6984
|| (ctx.subquery() && UNION_PARENTHESIS_IN_DERIVED_TABLES.contains(ctx.dialect()))
;
parensRequired |= derivedTable;

2
pom.xml
View File

@ -29,7 +29,7 @@
<!-- These in-memory DBs are used by jOOQ-meta-extensions and a variety of integration tests -->
<h2.version>1.4.200</h2.version>
<sqlite.version>3.30.1</sqlite.version>
<derby.version>10.14.2.0</derby.version>
<derby.version>10.15.2.0</derby.version>
<hsqldb.version>2.5.1</hsqldb.version>
<!-- From JDK 11 onwards, we need to depend on the JAXB API explicitly -->