From e3e76705621ca419801c759b5354048d0e7e8d19 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 1 Mar 2023 16:44:56 +0100
Subject: [PATCH] [jOOQ/jOOQ#14730] Push down ScopeMappable marker interface
 from AbstractField to AbstractWindowFunction and TableFieldImpl

---
 jOOQ/src/main/java/org/jooq/impl/AbstractField.java          | 3 +--
 jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java | 3 ++-
 jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java         | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
index 52a56b6d52..013df8d842 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
@@ -98,8 +98,7 @@ extends
     AbstractTypedNamed<T>
 implements
     Field<T>,
-    Aliasable<Field<?>>,
-    ScopeMappable
+    Aliasable<Field<?>>
 {
 
     private static final Clause[] CLAUSES = { FIELD };
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
index fd1310597d..102ac6d306 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
@@ -96,7 +96,8 @@ implements
     WindowRowsStep<T>,
     WindowRowsAndStep<T>,
     WindowExcludeStep<T>,
-    WindowFunction<T>
+    WindowFunction<T>,
+    ScopeMappable
 {
     private static final Set<SQLDialect> SUPPORT_NO_PARENS_WINDOW_REFERENCE = SQLDialect.supportedBy(MYSQL, POSTGRES, SQLITE, YUGABYTEDB);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
index b544af7143..6daecac65b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
@@ -81,7 +81,8 @@ implements
     TableField<R, T>,
     SimpleQueryPart,
     UNotYetImplemented,
-    TypedReference<T>
+    TypedReference<T>,
+    ScopeMappable
 {
 
     private static final Clause[] CLAUSES = { FIELD, FIELD_REFERENCE };