From 27d911dedeb1abb226e7f03ed8dc87e8607b4e29 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 1 Nov 2021 13:58:31 +0100
Subject: [PATCH] [jOOQ/jOOQ#12583] Generate DAO.fetchOptionalBy[Column]
 methods

---
 .../src/main/java/org/jooq/codegen/JavaGenerator.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

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 39a0410e32..9c15a01853 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -77,6 +77,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.function.BiConsumer;
@@ -4392,6 +4393,14 @@ public class JavaGenerator extends AbstractGenerator {
                             out.println("%s%s fetchOneBy%s(%s value) {", visibility(), pType, colClass, colType);
                             out.println("return fetchOne(%s, value);", colIdentifier);
                             out.println("}");
+
+                            if (!printDeprecationIfUnknownType(out, colTypeFull))
+                                out.javadoc("Fetch a unique record that has <code>%s = value</code>", colName);
+
+                            printNonnullAnnotation(out);
+                            out.println("%s%s<%s> fetchOptionalBy%s(%s value) {", visibility(), Optional.class, pType, colClass, colType);
+                            out.println("return fetchOptional(%s, value);", colIdentifier);
+                            out.println("}");
                         }
 
                         break ukLoop;