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

[jOOQ/jOOQ#8012] Get Table.where() to work with derived column lists

Browse Source
This commit is contained in:
Lukas Eder 2023-05-23 16:33:50 +02:00
parent bcff3882f2
commit 2e8c8d5493
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/impl/InlineDerivedTable.java
View File

@ -66,7 +66,14 @@ final class InlineDerivedTable<R extends Record> extends DerivedTable<R> {
@Override
final FieldsImpl<R> fields0() {
return new FieldsImpl<>(table.as(table).fields());
// [#8012] Re-use the existing fields row if this is an aliased table
if (table instanceof TableAlias)
return new FieldsImpl<>(table.fields());
// [#8012] Re-wrap fields in new TableAlias to prevent StackOverflowError
else
return new FieldsImpl<>(table.as(table).fields());
}

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

@ -2727,6 +2727,18 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
return new InlineDerivedTable<>(removeWhere(u), u.where).query().asTable(i);
}
}
else if (t instanceof TableAlias<R> a) {
if (a.$aliased() instanceof TableImpl<R> u) {
if (u.where != null) {
Select<R> q = new InlineDerivedTable<>(removeWhere(u), u.where).query();
if (a.hasFieldAliases())
return q.asTable(a.getUnqualifiedName(), a.alias.fieldAliases);
else
return q.asTable(a);
}
}
}
return null;
}

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

@ -104,7 +104,7 @@ implements
// [#13418]
List<Field<?>> result = Tools.map(this.alias.wrapped().fieldsRow().fields(), (f, i) -> new TableFieldImpl(
alias.fieldAliases != null && alias.fieldAliases.length > i
hasFieldAliases() && alias.fieldAliases.length > i
? alias.fieldAliases[i]
: f.getUnqualifiedName(), removeGenerator(CONFIG.get(), f.getDataType()), this, f.getCommentPart(), f.getBinding()
));
@ -112,10 +112,14 @@ implements
return new FieldsImpl<>(result);
}
final boolean hasFieldAliases() {
return alias.fieldAliases != null;
}
/**
* Get the aliased table wrapped by this table.
*/
Table<R> getAliasedTable() {
final Table<R> getAliasedTable() {
if (alias != null)
return alias.wrapped();