From d59c72fa07f3d7da7fd2e2e6a0111d31c49f8130 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 29 Sep 2021 14:50:13 +0200 Subject: [PATCH] [jOOQ/jOOQ#12425] TableFieldImpl should be UEmpty --- jOOQ/src/main/java/org/jooq/impl/QOM.java | 4 ++-- .../main/java/org/jooq/impl/TableFieldImpl.java | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index 7a4cfe2d69..7346913203 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -446,7 +446,7 @@ public final class QOM { // ------------------------------------------------------------------------- public interface MTable extends MQueryPart {} - public interface MTableRef extends MTable, MQualified {} + public interface MTableRef extends UEmptyTable, MQualified {} public interface MDual extends MTable, UEmpty {} public interface MLateral extends MTable, UOperator1, MTable> {} public interface MDerivedTable extends MTable, UOperator1, MTable> {} @@ -678,7 +678,7 @@ public final class QOM { } public interface MInline extends MParam {} public interface MVal extends MParam {} - public interface MFieldRef extends MField, MNamed { + public interface MFieldRef extends UEmptyField, MNamed { @NotNull MTableRef $table(); } public interface MDefault extends MField, UEmpty {} diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java index 87223f54ab..c599be827e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java @@ -133,21 +133,6 @@ class TableFieldImpl extends AbstractField implements Ta // XXX: Query Object Model // ------------------------------------------------------------------------- - @Override - public final X traverse( - X init, - Predicate abort, - Predicate recurse, - BiFunction accumulate - ) { - return QOM.traverse(init, abort, recurse, accumulate, this, table); - } - - @Override - public final MQueryPart replace(Function1 replacement) { - return QOM.replace(this, table, t -> new TableFieldImpl(getQualifiedName(), getDataType(), t, getCommentPart(), getBinding()), replacement); - } - @Override public final MTableRef $table() { return (MTableRef) table;