From b7401aaaa79bfcc83a11039975599e5a68fbaaec Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 23 Feb 2022 15:01:33 +0100
Subject: [PATCH] [jOOQ/jOOQ#13069] Finish support for <rowConvenienceToOne/>
 in Java

---
 jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/RowAsField.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index f0b469053c..aec73e880b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -3754,7 +3754,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
                     return pgNewRecord(ctx, dataType.getType(), (AbstractRow<Record>) dataType.getRow(), ctx.resultSet().getObject(ctx.index()));
 
                 default:
-                    if (dataType.isUDT())
+                    if (UDTRecord.class.isAssignableFrom(dataType.getType()))
                         return localExecuteContext(ctx.executeContext(), () -> (Record) ctx.resultSet().getObject(ctx.index(), typeMap(dataType.getType(), ctx)));
                     else
                         return readMultiset(ctx, dataType);
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowAsField.java b/jOOQ/src/main/java/org/jooq/impl/RowAsField.java
index 32c1d1a77c..13e0a61219 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowAsField.java
@@ -91,7 +91,7 @@ final class RowAsField<ROW extends Row, REC extends Record> extends AbstractRowA
     final ROW                    row;
 
     RowAsField(ROW row) {
-        this(row, DSL.name("row"));
+        this(row, DSL.name("r"));
     }
 
     RowAsField(ROW row, Name as) {