From 2f9f6cc57318231f9b94af2fdedce405148cb3f0 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Wed, 12 Jul 2017 11:41:20 +0200
Subject: [PATCH] [#5720] Convert doesn't correctly convert Strings to EnumType

---
 .../src/main/java/org/jooq/tools/Convert.java | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java
index 4025ad38f9..63ea9fbff3 100644
--- a/jOOQ/src/main/java/org/jooq/tools/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java
@@ -968,15 +968,28 @@ public final class Convert {
                 }
 
 
-                // [#1448] [#6255] To Enum conversion
+                // [#1448] [#6255] [#5720] To Enum conversion
                 else if (java.lang.Enum.class.isAssignableFrom(toClass) && (fromClass == String.class || from instanceof Enum || from instanceof EnumType)) {
                     try {
-                        if (fromClass == String.class)
-                            return (U) java.lang.Enum.valueOf((Class) toClass, (String) from);
-                        else if (from instanceof EnumType)
-                            return (U) java.lang.Enum.valueOf((Class) toClass, ((EnumType) from).getLiteral());
-                        else
-                            return (U) java.lang.Enum.valueOf((Class) toClass, ((Enum) from).name());
+                        String fromString =
+                            (fromClass == String.class) ? (String) from
+                          : (from instanceof EnumType)  ? ((EnumType) from).getLiteral()
+                          : ((Enum) from).name();
+
+                        if (fromString == null)
+                            return null;
+
+                        if (EnumType.class.isAssignableFrom(toClass)) {
+                            for (Object value : toClass.getEnumConstants())
+                                if (fromString.equals(((EnumType) value).getLiteral()))
+                                    return (U) value;
+
+                            return null;
+                        }
+                        else {
+                            return (U) java.lang.Enum.valueOf((Class) toClass, fromString);
+                        }
+
                     }
                     catch (IllegalArgumentException e) {
                         return null;