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

[jOOQ/jOOQ#11643] Emulate CTE in scalar subquery using CTE in derived table, when only the latter is supported

Browse Source
This commit is contained in:
Lukas Eder 2021-03-15 18:10:51 +01:00
parent 72b5751ca1
commit 5acd6374e1
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java
View File

@ -38,11 +38,18 @@
package org.jooq.impl;
// ...
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.impl.DSL.asterisk;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.Names.N_SELECT;
import static org.jooq.impl.Tools.visitSubquery;
import java.util.Set;
import org.jooq.Context;
import org.jooq.DataType;
import org.jooq.SQLDialect;
import org.jooq.Select;
/**
@ -50,8 +57,9 @@ import org.jooq.Select;
*/
final class ScalarSubquery<T> extends AbstractField<T> {
private static final long serialVersionUID = 3463144434073231750L;
final Select<?> query;
private static final long serialVersionUID = 3463144434073231750L;
static final Set<SQLDialect> NO_SUPPORT_WITH_IN_SCALAR_SUBQUERY = SQLDialect.supportedBy(HSQLDB);
final Select<?> query;
ScalarSubquery(Select<?> query, DataType<T> type) {
super(N_SELECT, type);
@ -61,6 +69,13 @@ final class ScalarSubquery<T> extends AbstractField<T> {
@Override
public final void accept(Context<?> ctx) {
visitSubquery(ctx, query);
SelectQueryImpl<?> q = Tools.selectQueryImpl(query);
// HSQLDB allows for using WITH inside of IN, see: https://sourceforge.net/p/hsqldb/bugs/1617/
// We'll still emulate CTE in scalar subqueries with a derived tables in all cases.
if (q != null && q.with != null && NO_SUPPORT_WITH_IN_SCALAR_SUBQUERY.contains(ctx.dialect()))
visitSubquery(ctx, select(asterisk()).from(query.asTable("t")));
else
visitSubquery(ctx, query);
}
}

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

@ -325,7 +325,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
private final WithImpl with;
final WithImpl with;
private final SelectFieldList<SelectFieldOrAsterisk> select;
private Table<?> intoTable;
private String hint;