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

[jOOQ/jOOQ#14387] Table::useIndex and similar table wrapping methods

Browse Source 
break joins using onKey()
This commit is contained in:
Lukas Eder 2022-12-09 17:37:32 +01:00
parent d5ecfa9140
commit fa7f31d3cb
7 changed files with 125 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingTable.java Normal file
View File

@ -0,0 +1,106 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: https://www.jooq.org/legal/licensing
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.impl;
import java.util.List;
import org.jooq.ForeignKey;
import org.jooq.Name;
import org.jooq.Record;
import org.jooq.Table;
import org.jooq.impl.QOM.Aliasable;
/**
* @author Lukas Eder
*/
abstract class AbstractDelegatingTable<R extends Record> extends AbstractTable<R> {
final AbstractTable<R> delegate;
AbstractDelegatingTable(AbstractTable<R> delegate) {
super(delegate.getOptions(), delegate.getQualifiedName(), delegate.getSchema());
this.delegate = delegate;
}
abstract AbstractDelegatingTable<R> construct(AbstractTable<R> newDelegate);
@Override
public final boolean declaresTables() {
return true;
}
@Override
public final Class<? extends R> getRecordType() {
return delegate.getRecordType();
}
@Override
public final Table<R> as(Name alias) {
return construct(new TableAlias<>(delegate, alias));
}
@Override
public final Table<R> as(Name alias, Name... fieldAliases) {
return construct(new TableAlias<>(delegate, alias, fieldAliases));
}
@Override
public final List<ForeignKey<R, ?>> getReferences() {
return delegate.getReferences();
}
@Override
final FieldsImpl<R> fields0() {
return delegate.fields0();
}
// -------------------------------------------------------------------------
// XXX: Query Object Model
// -------------------------------------------------------------------------
@Override
public final Table<R> $aliased() {
return construct((AbstractTable<R>) ((Aliasable<Table<R>>) delegate).$aliased());
}
@Override
public final Name $alias() {
return ((Aliasable<Table<R>>) delegate).$alias();
}
}

14
jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
View File

@ -64,6 +64,7 @@ import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.EMPTY_NAME;
import static org.jooq.impl.Tools.map;
import static org.jooq.impl.Tools.traverseJoins;
import static org.jooq.impl.Tools.unwrap;
import java.sql.Timestamp;
import java.util.ArrayList;
@ -598,17 +599,10 @@ implements
for (ForeignKey<R, ?> reference : getReferences()) {
traverseJoins(other, o -> {
if (o.equals(reference.getKey().getTable())) {
// [#1460] [#6304] [#14387] In case the other table was aliased or otherwise wrapped
if (unwrap(o).equals(reference.getKey().getTable()))
result.add((ForeignKey<R, O>) reference);
}
// [#1460] [#6304] In case the other table was aliased
else {
Table<?> aliased = Tools.aliased(o);
if (aliased != null && aliased.equals(reference.getKey().getTable()))
result.add((ForeignKey<R, O>) reference);
}
});
}

46
jOOQ/src/main/java/org/jooq/impl/HintedTable.java
View File

@ -41,16 +41,13 @@ import org.jooq.Context;
import org.jooq.Keyword;
import org.jooq.Name;
import org.jooq.Record;
import org.jooq.Table;
import org.jooq.impl.QOM.Aliasable;
import org.jooq.impl.QOM.UNotYetImplemented;
/**
* @author Lukas Eder
*/
final class HintedTable<R extends Record> extends AbstractTable<R> implements UNotYetImplemented {
final class HintedTable<R extends Record> extends AbstractDelegatingTable<R> implements UNotYetImplemented {
private final AbstractTable<R> delegate;
private final Keyword keywords;
private final QueryPartList<Name> arguments;
@ -67,16 +64,15 @@ final class HintedTable<R extends Record> extends AbstractTable<R> implements UN
}
HintedTable(AbstractTable<R> delegate, Keyword keywords, QueryPartList<Name> arguments) {
super(delegate.getOptions(), delegate.getQualifiedName(), delegate.getSchema());
super(delegate);
this.delegate = delegate;
this.keywords = keywords;
this.arguments = arguments;
}
@Override
public final boolean declaresTables() {
return true;
final AbstractDelegatingTable<R> construct(AbstractTable<R> newDelegate) {
return new HintedTable<R>(newDelegate, keywords, arguments);
}
@Override
@ -86,38 +82,4 @@ final class HintedTable<R extends Record> extends AbstractTable<R> implements UN
.sql(" (").visit(arguments)
.sql(')');
}
@Override
public final Class<? extends R> getRecordType() {
return delegate.getRecordType();
}
@Override
public final Table<R> as(Name alias) {
return new HintedTable<>(new TableAlias<>(delegate, alias), keywords, arguments);
}
@Override
public final Table<R> as(Name alias, Name... fieldAliases) {
return new HintedTable<>(new TableAlias<>(delegate, alias, fieldAliases), keywords, arguments);
}
@Override
final FieldsImpl<R> fields0() {
return delegate.fields0();
}
// -------------------------------------------------------------------------
// XXX: Query Object Model
// -------------------------------------------------------------------------
@Override
public final Table<R> $aliased() {
return new HintedTable<R>((AbstractTable<R>) ((Aliasable<Table<R>>) delegate).$aliased(), keywords, arguments);
}
@Override
public final Name $alias() {
return ((Aliasable<Table<R>>) delegate).$alias();
}
}

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

@ -109,10 +109,6 @@ package org.jooq.impl;

26
jOOQ/src/main/java/org/jooq/impl/PeriodTable.java
View File

@ -40,32 +40,6 @@ package org.jooq.impl;
import static org.jooq.SQLDialect.HSQLDB;
// ...

11
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -6106,6 +6106,17 @@ final class Tools {
return field instanceof Coerce<?> f ? f.field : field;
}
static final <R extends Record> Table<R> unwrap(Table<R> table) {
Table<R> r;
if (table instanceof AbstractDelegatingTable<R> t)
return unwrap(t.delegate);
else if ((r = unalias(table)) != table)
return unwrap(r);
else
return r;
}
static final <R extends Record> Table<R> aliased(Table<R> table) {
if (table instanceof TableImpl<R> t)
return t.getAliasedTable();

36
jOOQ/src/main/java/org/jooq/impl/WithTable.java
View File

@ -63,42 +63,6 @@ package org.jooq.impl;