diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java index 35edc12e65..cb87e4d84f 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java @@ -212,10 +212,6 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy { result.append("Dao"); } - if (!StringUtils.isBlank(definition.getOverload())) { - result.append(definition.getOverload()); - } - return result.toString(); } @@ -257,4 +253,9 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy { // Default always to the main package return ""; } + + @Override + public String getOverloadSuffix(Definition definition, Mode mode, String overloadIndex) { + return overloadIndex; + } } diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java index 3fe1ddca52..3ad99714c1 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java @@ -302,6 +302,13 @@ public interface GeneratorStrategy { */ File getFile(Definition definition, Mode mode); + /** + * @return The overload suffix to be applied when generating overloaded + * routine artefacts, e.g. + * "_OverloadIndex_" + overloadIndex + */ + String getOverloadSuffix(Definition definition, Mode mode, String overloadIndex); + /** * The "mode" by which an artefact should be named */ diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java index b54e4cb890..858ef006e6 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java @@ -135,8 +135,24 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy { @Override public String getJavaMethodName(Definition definition, Mode mode) { - return disambiguateMethod(definition, - convertToJavaIdentifier(delegate.getJavaMethodName(definition, mode))); + String methodName; + + methodName = delegate.getJavaMethodName(definition, mode); + methodName = overload(definition, mode, methodName); + methodName = convertToJavaIdentifier(methodName); + + return disambiguateMethod(definition, methodName); + } + + /** + * [#1358] Add an overload suffix if needed + */ + private String overload(Definition definition, Mode mode, String identifier) { + if (!StringUtils.isBlank(definition.getOverload())) { + identifier += getOverloadSuffix(definition, mode, definition.getOverload()); + } + + return identifier; } /** @@ -237,7 +253,11 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy { return Record.class.getSimpleName(); } - String className = convertToJavaIdentifier(delegate.getJavaClassName(definition, mode)); + String className; + + className = delegate.getJavaClassName(definition, mode); + className = overload(definition, mode, className); + className = convertToJavaIdentifier(className); if (mode == Mode.FACTORY) { String alternative = convertToJavaIdentifier(delegate.getJavaClassName(definition, Mode.DEFAULT)); @@ -272,4 +292,9 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy { public String getJavaMemberName(Definition definition, Mode mode) { return convertToJavaIdentifier(delegate.getJavaMemberName(definition, mode)); } + + @Override + public String getOverloadSuffix(Definition definition, Mode mode, String overloadIndex) { + return delegate.getOverloadSuffix(definition, mode, overloadIndex); + } } diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java index c2101690c9..b4fc9af2fa 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/Oracle3Strategy.java @@ -122,4 +122,9 @@ public class Oracle3Strategy extends DefaultGeneratorStrategy { public String getJavaMemberName(Definition definition, Mode mode) { return definition.getOutputName(); } + + @Override + public String getOverloadSuffix(Definition definition, Mode mode, String overloadIndex) { + return "______ABC_" + overloadIndex; + } } diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml index 96c119e541..71fb3ac5d1 100644 --- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml +++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml @@ -11,7 +11,7 @@ org.jooq.util.oracle.OracleDatabase .* - T_BOOK_DETAILS,S_TRIGGERS_SEQUENCE,.*976.* + T_BOOK_DETAILS,S_TRIGGERS_SEQUENCE,.*976.*,.*1358.* false true diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java deleted file mode 100644 index 68da19f5cf..0000000000 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.test.oracle.generatedclasses.test.packages; - -/** - * This class is generated by jOOQ. - * - * Convenience access to all stored procedures and functions in PKG_1358 - */ -public final class Pkg_1358 extends org.jooq.impl.PackageImpl { - - private static final long serialVersionUID = -781964650; - - /** - * The singleton instance of TEST.PKG_1358 - */ - public static final org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358 PKG_1358 = new org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358(); - - /** - * Call TEST.PKG_1358.P - * - * @param i IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p1(org.jooq.Configuration configuration, java.lang.String i) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P1 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P1(); - p.setI(i); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P - * - * @param j IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p2(org.jooq.Configuration configuration, java.lang.String j) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P2 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P2(); - p.setJ(j); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P - * - * @param k IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p3(org.jooq.Configuration configuration, java.lang.String k) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3(); - p.setK(k); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P2 - * - * @param i IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p21(org.jooq.Configuration configuration, java.lang.String i) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21(); - p.setI(i); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P2 - * - * @param j IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p22(org.jooq.Configuration configuration, java.lang.String j) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P22 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P22(); - p.setJ(j); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P21 - * - * @param i IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p21(org.jooq.Configuration configuration, java.lang.String i) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21(); - p.setI(i); - - p.execute(configuration); - } - - /** - * Call TEST.PKG_1358.P3 - * - * @param k IN parameter - * @throws org.jooq.exception.DataAccessException if something went wrong executing the query - */ - public static void p3(org.jooq.Configuration configuration, java.lang.String k) { - org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3(); - p.setK(k); - - p.execute(configuration); - } - /** - * No further instances allowed - */ - private Pkg_1358() { - super("PKG_1358", org.jooq.test.oracle.generatedclasses.test.Test.TEST); - } -} diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/LIBRARY.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/LIBRARY.java index d82a200177..dd625b4acd 100644 --- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/LIBRARY.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/LIBRARY.java @@ -10,7 +10,7 @@ package org.jooq.test.oracle3.generatedclasses.packages; */ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io.Serializable, java.lang.Cloneable { - private static final long serialVersionUID = 277161264; + private static final long serialVersionUID = -1707209763; /** * The singleton instance of TEST.LIBRARY @@ -23,8 +23,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param AUTHOR_NAME * @throws org.jooq.exception.DataAccessException if something went wrong executing the query */ - public static java.math.BigDecimal call_PKG_F_AUTHOR_EXISTS(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static java.math.BigDecimal call_PKG_F_AUTHOR_EXISTS______ABC_1(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1(); f.setAUTHOR_NAME(AUTHOR_NAME); f.execute(configuration); @@ -36,8 +36,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * * @param AUTHOR_NAME */ - public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS(java.lang.String AUTHOR_NAME) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS______ABC_1(java.lang.String AUTHOR_NAME) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1(); f.setAUTHOR_NAME(AUTHOR_NAME); return f.asField(); @@ -48,8 +48,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * * @param AUTHOR_NAME */ - public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS(org.jooq.Field AUTHOR_NAME) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS______ABC_1(org.jooq.Field AUTHOR_NAME) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_1(); f.setAUTHOR_NAME(AUTHOR_NAME); return f.asField(); @@ -62,8 +62,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param UNUSED * @throws org.jooq.exception.DataAccessException if something went wrong executing the query */ - public static java.math.BigDecimal call_PKG_F_AUTHOR_EXISTS(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static java.math.BigDecimal call_PKG_F_AUTHOR_EXISTS______ABC_2(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2(); f.setAUTHOR_NAME(AUTHOR_NAME); f.setUNUSED(UNUSED); @@ -77,8 +77,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param AUTHOR_NAME * @param UNUSED */ - public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS(java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS______ABC_2(java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2(); f.setAUTHOR_NAME(AUTHOR_NAME); f.setUNUSED(UNUSED); @@ -91,8 +91,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param AUTHOR_NAME * @param UNUSED */ - public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS(org.jooq.Field AUTHOR_NAME, org.jooq.Field UNUSED) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS(); + public static org.jooq.Field call_PKG_F_AUTHOR_EXISTS______ABC_2(org.jooq.Field AUTHOR_NAME, org.jooq.Field UNUSED) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2 f = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_F_AUTHOR_EXISTS______ABC_2(); f.setAUTHOR_NAME(AUTHOR_NAME); f.setUNUSED(UNUSED); @@ -146,8 +146,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param RESULT OUT parameter * @throws org.jooq.exception.DataAccessException if something went wrong executing the query */ - public static java.math.BigDecimal call_PKG_P_AUTHOR_EXISTS(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS p = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS(); + public static java.math.BigDecimal call_PKG_P_AUTHOR_EXISTS______ABC_1(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS______ABC_1 p = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS______ABC_1(); p.setAUTHOR_NAME(AUTHOR_NAME); p.execute(configuration); @@ -162,8 +162,8 @@ public final class LIBRARY extends org.jooq.impl.PackageImpl implements java.io. * @param UNUSED IN OUT parameter * @throws org.jooq.exception.DataAccessException if something went wrong executing the query */ - public static org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS call_PKG_P_AUTHOR_EXISTS(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { - org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS p = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS(); + public static org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS______ABC_2 call_PKG_P_AUTHOR_EXISTS______ABC_2(org.jooq.Configuration configuration, java.lang.String AUTHOR_NAME, java.lang.Number UNUSED) { + org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS______ABC_2 p = new org.jooq.test.oracle3.generatedclasses.packages.library.PKG_P_AUTHOR_EXISTS______ABC_2(); p.setAUTHOR_NAME(AUTHOR_NAME); p.setUNUSED(UNUSED); diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/PKG_1358.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/PKG_1358.java new file mode 100644 index 0000000000..dfbd0ca8a2 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/PKG_1358.java @@ -0,0 +1,116 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.oracle3.generatedclasses.packages; + +/** + * This class is generated by jOOQ. + * + * Convenience access to all stored procedures and functions in PKG_1358 + */ +public final class PKG_1358 extends org.jooq.impl.PackageImpl implements java.lang.Cloneable { + + private static final long serialVersionUID = -1389765455; + + /** + * The singleton instance of TEST.PKG_1358 + */ + public static final org.jooq.test.oracle3.generatedclasses.packages.PKG_1358 PKG_1358 = new org.jooq.test.oracle3.generatedclasses.packages.PKG_1358(); + + /** + * Call TEST.PKG_1358.P + * + * @param I IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P______ABC_1(org.jooq.Configuration configuration, java.lang.String I) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_1 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_1(); + p.setI(I); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P + * + * @param J IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P______ABC_2(org.jooq.Configuration configuration, java.lang.String J) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_2 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_2(); + p.setJ(J); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P + * + * @param K IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P______ABC_3(org.jooq.Configuration configuration, java.lang.String K) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_3 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P______ABC_3(); + p.setK(K); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P2 + * + * @param I IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P2______ABC_1(org.jooq.Configuration configuration, java.lang.String I) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P2______ABC_1 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P2______ABC_1(); + p.setI(I); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P2 + * + * @param J IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P2______ABC_2(org.jooq.Configuration configuration, java.lang.String J) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P2______ABC_2 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P2______ABC_2(); + p.setJ(J); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P21 + * + * @param I IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P21(org.jooq.Configuration configuration, java.lang.String I) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P21 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P21(); + p.setI(I); + + p.execute(configuration); + } + + /** + * Call TEST.PKG_1358.P3 + * + * @param K IN parameter + * @throws org.jooq.exception.DataAccessException if something went wrong executing the query + */ + public static void call_P3(org.jooq.Configuration configuration, java.lang.String K) { + org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P3 p = new org.jooq.test.oracle3.generatedclasses.packages.pkg_1358.P3(); + p.setK(K); + + p.execute(configuration); + } + /** + * No further instances allowed + */ + private PKG_1358() { + super("PKG_1358", org.jooq.test.oracle3.generatedclasses.TEST.TEST); + } +} diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_1.java new file mode 100644 index 0000000000..d2a6fcfb8c --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_1.java @@ -0,0 +1,50 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.oracle3.generatedclasses.packages.library; + +/** + * This class is generated by jOOQ. + */ +public class PKG_F_AUTHOR_EXISTS______ABC_1 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { + + private static final long serialVersionUID = -152974922; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter RETURN_VALUE = createParameter("RETURN_VALUE", org.jooq.impl.SQLDataType.NUMERIC); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter AUTHOR_NAME = createParameter("AUTHOR_NAME", org.jooq.impl.SQLDataType.VARCHAR); + + /** + * Create a new routine call instance + */ + public PKG_F_AUTHOR_EXISTS______ABC_1() { + super("PKG_F_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY, org.jooq.impl.SQLDataType.NUMERIC); + + setReturnParameter(RETURN_VALUE); + addInParameter(AUTHOR_NAME); + setOverloaded(true); + } + + /** + * Set the AUTHOR_NAME parameter to the routine + */ + public void setAUTHOR_NAME(java.lang.String value) { + setValue(AUTHOR_NAME, value); + } + + /** + * Set the AUTHOR_NAME parameter to the function + *

+ * Use this method only, if the function is called as a {@link org.jooq.Field} in a {@link org.jooq.Select} statement! + */ + public void setAUTHOR_NAME(org.jooq.Field field) { + setField(AUTHOR_NAME, field); + } +} diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_2.java similarity index 89% rename from jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_2.java index f9001ebc90..cff5ee407c 100644 --- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_F_AUTHOR_EXISTS______ABC_2.java @@ -6,9 +6,9 @@ package org.jooq.test.oracle3.generatedclasses.packages.library; /** * This class is generated by jOOQ. */ -public class PKG_F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { +public class PKG_F_AUTHOR_EXISTS______ABC_2 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 990614819; + private static final long serialVersionUID = 199364083; /** @@ -29,7 +29,7 @@ public class PKG_F_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { + + private static final long serialVersionUID = -142341308; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter AUTHOR_NAME = createParameter("AUTHOR_NAME", org.jooq.impl.SQLDataType.VARCHAR); + + /** + * An uncommented item + */ + public static final org.jooq.Parameter RESULT = createParameter("RESULT", org.jooq.impl.SQLDataType.NUMERIC); + + /** + * Create a new routine call instance + */ + public PKG_P_AUTHOR_EXISTS______ABC_1() { + super("PKG_P_AUTHOR_EXISTS", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.LIBRARY.LIBRARY); + + addInParameter(AUTHOR_NAME); + addOutParameter(RESULT); + setOverloaded(true); + } + + /** + * Set the AUTHOR_NAME parameter to the routine + */ + public void setAUTHOR_NAME(java.lang.String value) { + setValue(AUTHOR_NAME, value); + } + + public java.math.BigDecimal getRESULT() { + return getValue(RESULT); + } +} diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS______ABC_2.java similarity index 86% rename from jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS______ABC_2.java index 9bcab99a0e..b9fde8f636 100644 --- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/library/PKG_P_AUTHOR_EXISTS______ABC_2.java @@ -6,9 +6,9 @@ package org.jooq.test.oracle3.generatedclasses.packages.library; /** * This class is generated by jOOQ. */ -public class PKG_P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { +public class PKG_P_AUTHOR_EXISTS______ABC_2 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 416895860; + private static final long serialVersionUID = 1639153610; /** @@ -29,7 +29,7 @@ public class PKG_P_AUTHOR_EXISTS extends org.jooq.impl.AbstractRoutine { +public class P21 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 1974612037; + private static final long serialVersionUID = 602076661; /** @@ -20,7 +20,7 @@ public class P21 extends org.jooq.impl.AbstractRoutine { * Create a new routine call instance */ public P21() { - super("P21", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358); + super("P21", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); addInParameter(I); } diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_1.java new file mode 100644 index 0000000000..b483097b86 --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_1.java @@ -0,0 +1,35 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; + +/** + * This class is generated by jOOQ. + */ +public class P2______ABC_1 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { + + private static final long serialVersionUID = 1152730725; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter I = createParameter("I", org.jooq.impl.SQLDataType.VARCHAR); + + /** + * Create a new routine call instance + */ + public P2______ABC_1() { + super("P2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); + + addInParameter(I); + setOverloaded(true); + } + + /** + * Set the I parameter to the routine + */ + public void setI(java.lang.String value) { + setValue(I, value); + } +} diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_2.java similarity index 54% rename from jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_2.java index 8da09cb37d..99d28af34c 100644 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P2______ABC_2.java @@ -1,14 +1,14 @@ /** * This class is generated by jOOQ */ -package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358; +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; /** * This class is generated by jOOQ. */ -public class P2 extends org.jooq.impl.AbstractRoutine { +public class P2______ABC_2 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 1856555895; + private static final long serialVersionUID = -1956300541; /** @@ -19,8 +19,8 @@ public class P2 extends org.jooq.impl.AbstractRoutine { /** * Create a new routine call instance */ - public P2() { - super("P", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358); + public P2______ABC_2() { + super("P2", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); addInParameter(J); setOverloaded(true); diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P3.java similarity index 64% rename from jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P3.java index e50b1b6e4f..49e73042b1 100644 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P3.java @@ -1,14 +1,14 @@ /** * This class is generated by jOOQ */ -package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358; +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; /** * This class is generated by jOOQ. */ -public class P3 extends org.jooq.impl.AbstractRoutine { +public class P3 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = -713948441; + private static final long serialVersionUID = 85538313; /** @@ -20,7 +20,7 @@ public class P3 extends org.jooq.impl.AbstractRoutine { * Create a new routine call instance */ public P3() { - super("P3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358); + super("P3", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); addInParameter(K); } diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_1.java similarity index 54% rename from jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_1.java index 2bd8c06d87..d7d6abbde6 100644 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_1.java @@ -1,14 +1,14 @@ /** * This class is generated by jOOQ */ -package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358; +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; /** * This class is generated by jOOQ. */ -public class P1 extends org.jooq.impl.AbstractRoutine { +public class P______ABC_1 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 2129696345; + private static final long serialVersionUID = -344579495; /** @@ -19,8 +19,8 @@ public class P1 extends org.jooq.impl.AbstractRoutine { /** * Create a new routine call instance */ - public P1() { - super("P", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358); + public P______ABC_1() { + super("P", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); addInParameter(I); setOverloaded(true); diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_2.java similarity index 54% rename from jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java rename to jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_2.java index 1613b0465b..8d91ba5d8a 100644 --- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_2.java @@ -1,14 +1,14 @@ /** * This class is generated by jOOQ */ -package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358; +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; /** * This class is generated by jOOQ. */ -public class P22 extends org.jooq.impl.AbstractRoutine { +public class P______ABC_2 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { - private static final long serialVersionUID = 1497095477; + private static final long serialVersionUID = -1018607207; /** @@ -19,8 +19,8 @@ public class P22 extends org.jooq.impl.AbstractRoutine { /** * Create a new routine call instance */ - public P22() { - super("P2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358); + public P______ABC_2() { + super("P", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); addInParameter(J); setOverloaded(true); diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_3.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_3.java new file mode 100644 index 0000000000..17739fbf2a --- /dev/null +++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/packages/pkg_1358/P______ABC_3.java @@ -0,0 +1,35 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.test.oracle3.generatedclasses.packages.pkg_1358; + +/** + * This class is generated by jOOQ. + */ +public class P______ABC_3 extends org.jooq.impl.AbstractRoutine implements java.lang.Cloneable { + + private static final long serialVersionUID = -1692634919; + + + /** + * An uncommented item + */ + public static final org.jooq.Parameter K = createParameter("K", org.jooq.impl.SQLDataType.VARCHAR); + + /** + * Create a new routine call instance + */ + public P______ABC_3() { + super("P", org.jooq.test.oracle3.generatedclasses.TEST.TEST, org.jooq.test.oracle3.generatedclasses.packages.PKG_1358.PKG_1358); + + addInParameter(K); + setOverloaded(true); + } + + /** + * Set the K parameter to the routine + */ + public void setK(java.lang.String value) { + setValue(K, value); + } +} diff --git a/jOOQ-website/src/main/resources/manual.xml b/jOOQ-website/src/main/resources/manual.xml index b5d83aaeda..4c25c6417c 100644 --- a/jOOQ-website/src/main/resources/manual.xml +++ b/jOOQ-website/src/main/resources/manual.xml @@ -1858,6 +1858,18 @@ public class AsInDatabaseStrategy extends DefaultGeneratorStrategy { public List getJavaClassImplements(Definition definition, Mode mode) { return Arrays.asList(Serializable.class.getName(), Cloneable.class.getName()); } + + /** + * Override this method to define the suffix to apply to routines when + * they are overloaded. + * + * Use this to resolve compile-time conflicts in generated source code, in + * case you make heavy use of procedure overloading + */ + @Override + public String getOverloadSuffix(Definition definition, Mode mode, String overloadIndex) { + return "_OverloadIndex_" + overloadIndex; + } }]]>

jooq-meta configuration