From 1d87609c02405ffc8f06a2847e6160bec70d8ff4 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 3 Mar 2015 16:30:56 +0100 Subject: [PATCH] [#4114] Compilation error when a stored procedure has a parameter named "value" and the generator strategy generates lower case literals --- .../src/main/java/org/jooq/util/JavaGenerator.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java index 16065ad040..ca9ffeccc8 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -3502,17 +3502,18 @@ public class JavaGenerator extends AbstractGenerator { final String numberValue = parameter.getType().isGenericNumberType() ? "Number" : "Value"; final String numberField = parameter.getType().isGenericNumberType() ? "Number" : "Field"; final String paramId = getStrategy().getJavaIdentifier(parameter); + final String paramName = "value".equals(paramId) ? "value_" : "value"; out.tab(1).javadoc("Set the %s parameter IN value to the routine", parameter.getOutputName()); if (scala) { - out.tab(1).println("def %s(value : %s) : Unit = {", setter, refNumberType(out, parameter.getType())); - out.tab(2).println("set%s(%s.%s, value)", numberValue, className, paramId); + out.tab(1).println("def %s(%s : %s) : Unit = {", setter, paramName, refNumberType(out, parameter.getType())); + out.tab(2).println("set%s(%s.%s, %s)", numberValue, className, paramId, paramName); out.tab(1).println("}"); } else { - out.tab(1).println("public void %s(%s value) {", setter, refNumberType(out, parameter.getType())); - out.tab(2).println("set%s(%s, value);", numberValue, paramId); + out.tab(1).println("public void %s(%s %s) {", setter, refNumberType(out, parameter.getType()), paramName); + out.tab(2).println("set%s(%s, %s);", numberValue, paramId, paramName); out.tab(1).println("}"); }