From 1a9e7b431f23efca71051f92253bd85b57451cfc Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@datageekery.com>
Date: Thu, 20 Feb 2025 15:03:32 +0100
Subject: [PATCH] [jOOQ/jOOQ#18033] Scala 3.5 problem when calling
 AbstractTable::getIdentity from generated code

---
 jOOQ/src/main/java/org/jooq/impl/TableImpl.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
index e0f26441b1..a01d3ff232 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java
@@ -75,6 +75,7 @@ import org.jooq.DDLQuery;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
+import org.jooq.Identity;
 import org.jooq.InverseForeignKey;
 import org.jooq.JoinType;
 import org.jooq.Name;
@@ -405,12 +406,21 @@ implements
             return fields;
     }
 
-    // [#8489] this override is necessary due to a Scala compiler bug (versions 2.10 and 2.11)
+    // [#8489] [#18033] [#12180] these overrides are necessary due to a Scala compiler bug (versions 2.10, 2.11, 3.5, 3.6)
+    // See:
+    // - https://github.com/scala/bug/issues/7936
+    // - https://github.com/scala/scala3/issues/22628
+
     @Override
     public Row fieldsRow() {
         return super.fieldsRow();
     }
 
+    @Override
+    public Identity<R, ?> getIdentity() {
+        return super.getIdentity();
+    }
+
     @Override
     public final Clause[] clauses(Context<?> ctx) {
         return alias != null ? CLAUSES_TABLE_ALIAS : CLAUSES_TABLE_REFERENCE;