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 d7c139ea7a..1eecf02c70 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -4298,6 +4298,17 @@ public class JavaGenerator extends AbstractGenerator { else out.tab(2).println("addOutParameter(%s);", paramId); } + + + + + + + + + + + } if (routine.getOverload() != null) { diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java index eed0d733f4..600cdfaf8b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java @@ -113,6 +113,10 @@ abstract class AbstractTypedElementDefinition return type; } + DataTypeDefinition getDefinedType() { + return definedType; + } + static DataTypeDefinition mapDefinedType(Definition container, Definition child, DataTypeDefinition definedType) { DataTypeDefinition result = definedType; Database db = container.getDatabase(); diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index 648178ddeb..7ef3bfe35a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -129,6 +129,9 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro private final List> allParameters; private final List> inParameters; private final List> outParameters; + + + private final DataType type; private Parameter returnParameter; private ResultsImpl results; @@ -207,6 +210,7 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro this.allParameters = new ArrayList>(); this.inParameters = new ArrayList>(); this.outParameters = new ArrayList>(); + this.plsqlBooleanParameters = new ArrayList>(); this.results = new ResultsImpl(null); this.inValues = new HashMap, Field>(); this.inValuesDefaulted = new HashSet>(); @@ -1247,7 +1251,6 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro - } @@ -1268,6 +1271,10 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro + + + + @@ -1307,6 +1314,13 @@ public abstract class AbstractRoutine extends AbstractQueryPart implements Ro returnParameter = parameter; } + + + + + + + public final Field asField() { if (function == null) { function = new RoutineField();