From ba9ba94ea96a788a706c7d776defed951cca27f1 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 6 Jun 2018 14:12:39 +0200 Subject: [PATCH] [#7547] Code generator should not generate "USER-DEFINED" for unknown data types --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 10 ++++------ 1 file changed, 4 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 7ff35691ed..c455f5c02c 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -4888,16 +4888,14 @@ public class JavaGenerator extends AbstractGenerator { final String paramComment = StringUtils.defaultString(parameter.getComment()); final String isDefaulted = parameter.isDefaulted() ? "true" : "false"; final String isUnnamed = parameter.isUnnamed() ? "true" : "false"; - final List converters = out.ref(list( - parameter.getType(resolver()).getConverter(), - parameter.getType(resolver()).getBinding() - )); + final List converter = out.ref(list(parameter.getType(resolver()).getConverter())); + final List binding = out.ref(list(parameter.getType(resolver()).getBinding())); if (!printDeprecationIfUnknownType(out, paramTypeFull)) out.tab(1).javadoc("The parameter %s.%s", parameter.getQualifiedOutputName(), parameterComment(paramComment)); - out.tab(1).println("val %s : %s[%s] = %s.createParameter(\"%s\", %s, %s, %s[[before=, ][new %s]])", - paramId, Parameter.class, paramType, AbstractRoutine.class, paramName, paramTypeRef, isDefaulted, isUnnamed, converters); + out.tab(1).println("val %s : %s[%s] = %s.createParameter(\"%s\", %s, %s, %s" + converterTemplate(converter) + converterTemplate(binding) + ")", + paramId, Parameter.class, paramType, AbstractRoutine.class, paramName, paramTypeRef, isDefaulted, isUnnamed, converter, binding); } out.println("}");