From 2f2a9b76d35c5dbb8cdd9098e176ff1972e756e2 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@datageekery.com>
Date: Wed, 11 Dec 2024 11:35:47 +0100
Subject: [PATCH] [jOOQ/jOOQ#17762] EmbeddableTableField::toString should
 render a ROW style display of the field

---
 .../java/org/jooq/codegen/JavaGenerator.java  |  2 +-
 .../org/jooq/impl/EmbeddableTableField.java   | 25 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
index 3f8397bd23..2feea65f74 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -5689,7 +5689,7 @@ public class JavaGenerator extends AbstractGenerator {
         columnLoop:
         for (Definition column : embeddablesAndUnreplacedColumns) {
             final String colName = column.getOutputName();
-            final String colMemberUC = unescapeIdentifier(StringUtils.toUC(getStrategy().getJavaMemberName(column, Mode.DAO), getStrategy().getTargetLocale()));
+            final String colMemberUC = StringUtils.toUC(unescapeIdentifier(getStrategy().getJavaMemberName(column, Mode.DAO)), getStrategy().getTargetLocale());
             final String colTypeFull = getJavaType(column, out, Mode.POJO);
             final String colTypeRecord = out.ref(getJavaType(column, out, Mode.RECORD));
             final String colType = out.ref(colTypeFull);
diff --git a/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java b/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java
index ca7e37b87a..c7fb86ddf2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java
@@ -48,6 +48,8 @@ import org.jooq.EmbeddableRecord;
 import org.jooq.Field;
 import org.jooq.Name;
 import org.jooq.Record;
+import org.jooq.RenderContext;
+import org.jooq.Row;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.impl.QOM.UNotYetImplemented;
@@ -97,8 +99,8 @@ implements
         // TODO [#12021] [#12706] ROW must consistently follow MULTISET emulation
         // [#12237] If a RowField is nested somewhere in MULTISET, we must apply
         //          the MULTISET emulation as well, here
-        if (forceMultisetContent(ctx, () -> getDataType().getRow().size() > 1))
-            acceptMultisetContent(ctx, getDataType().getRow(), this, this::acceptRow);
+        if (forceMultisetContent(ctx, () -> toRow().size() > 1))
+            acceptMultisetContent(ctx, toRow(), this, this::acceptRow);
         else if (forceRowContent(ctx))
             acceptRow(ctx);
         else
@@ -106,11 +108,15 @@ implements
     }
 
     private final void acceptRow(Context<?> ctx) {
-        ctx.visit(((AbstractRow<?>) getDataType().getRow()).rf());
+        ctx.visit(toRow().rf());
+    }
+
+    private final AbstractRow<?> toRow() {
+        return ((AbstractRow<?>) getDataType().getRow());
     }
 
     private final void acceptDefault(Context<?> ctx) {
-        ctx.data(DATA_LIST_ALREADY_INDENTED, true, c -> c.visit(wrap(getDataType().getRow().fields())));
+        ctx.data(DATA_LIST_ALREADY_INDENTED, true, c -> c.visit(wrap(toRow().fields())));
     }
 
     @Override
@@ -122,9 +128,18 @@ implements
     int projectionSize() {
         int result = 0;
 
-        for (Field<?> field : ((AbstractRow<?>) getDataType().getRow()).fields.fields)
+        for (Field<?> field : toRow().fields.fields)
             result += ((AbstractField<?>) field).projectionSize();
 
         return result;
     }
+
+    // -------------------------------------------------------------------------
+    // The Object API
+    // -------------------------------------------------------------------------
+
+    @Override
+    String toString0(RenderContext ctx) {
+        return ctx.visit(toRow()).render();
+    }
 }