From 42d7e21983e180bcda34cdbca1b22d56fce4e7b6 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 9 Dec 2022 17:58:35 +0100
Subject: [PATCH] [jOOQ/jOOQ#13640] Add QOM.HintedTable

---
 .../jooq/impl/AbstractDelegatingTable.java    |  2 +-
 .../main/java/org/jooq/impl/HintedTable.java  | 53 +++++++++++++++++--
 jOOQ/src/main/java/org/jooq/impl/QOM.java     |  5 ++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingTable.java
index c722641dac..32dc566952 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingTable.java
@@ -58,7 +58,7 @@ abstract class AbstractDelegatingTable<R extends Record> extends AbstractTable<R
         this.delegate = delegate;
     }
 
-    abstract AbstractDelegatingTable<R> construct(AbstractTable<R> newDelegate);
+    abstract <O extends Record> AbstractDelegatingTable<O> construct(AbstractTable<O> newDelegate);
 
     @Override
     public final boolean declaresTables() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/HintedTable.java b/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
index 10e87f48bd..fb584de7e8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
@@ -40,13 +40,21 @@ package org.jooq.impl;
 import org.jooq.Context;
 import org.jooq.Keyword;
 import org.jooq.Name;
+import org.jooq.QueryPart;
 import org.jooq.Record;
-import org.jooq.impl.QOM.UNotYetImplemented;
+// ...
+import org.jooq.Table;
+// ...
 
 /**
  * @author Lukas Eder
  */
-final class HintedTable<R extends Record> extends AbstractDelegatingTable<R> implements UNotYetImplemented {
+final class HintedTable<R extends Record>
+extends
+    AbstractDelegatingTable<R>
+implements
+    QOM.HintedTable<R>
+{
 
     private final Keyword             keywords;
     private final QueryPartList<Name> arguments;
@@ -71,10 +79,14 @@ final class HintedTable<R extends Record> extends AbstractDelegatingTable<R> imp
     }
 
     @Override
-    final AbstractDelegatingTable<R> construct(AbstractTable<R> newDelegate) {
-        return new HintedTable<R>(newDelegate, keywords, arguments);
+    final <O extends Record> HintedTable<O> construct(AbstractTable<O> newDelegate) {
+        return new HintedTable<>(newDelegate, keywords, arguments);
     }
 
+    // ------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // ------------------------------------------------------------------------
+
     @Override
     public final void accept(Context<?> ctx) {
         ctx.visit(delegate)
@@ -82,4 +94,37 @@ final class HintedTable<R extends Record> extends AbstractDelegatingTable<R> imp
             .sql(" (").visit(arguments)
             .sql(')');
     }
+
+    // -------------------------------------------------------------------------
+    // XXX: Query Object Model
+    // -------------------------------------------------------------------------
+
+
+    @Override
+    public final Table<R> $table() {
+        return delegate;
+    }
+
+    @Override
+    public final <O extends Record> HintedTable<O> $table(Table<O> newTable) {
+        return construct((AbstractTable<O>) newTable);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java
index 8605c3d2b8..59ccfdb41f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QOM.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java
@@ -611,6 +611,11 @@ public final class QOM {
 
 
 
+    public interface HintedTable<R extends Record> extends Table<R> {
+        @NotNull Table<R> $table();
+        @NotNull <O extends Record> HintedTable<O> $table(Table<O> newTable);
+    }
+
     public interface PrimaryKey extends Constraint {
         @NotNull UnmodifiableList<? extends Field<?>> $fields();
     }