github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#8967] Generator outputs duplicate method (not compilable)

Browse Source
This commit is contained in:
Lukas Eder 2019-11-15 13:50:41 +01:00
parent 00050d515f
commit cd71da22f9
5 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorStrategyWrapper.java
View File

@ -173,26 +173,26 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
return identifier + "_";
}
identifier = overload(definition, Mode.DEFAULT, identifier);
return identifier;
}
@Override
public String getJavaSetterName(Definition definition, Mode mode) {
return disambiguateMethod(definition,
convertToIdentifier(delegate.getJavaSetterName(definition, mode), language));
return fixMethodName(definition, mode, delegate.getJavaSetterName(definition, mode));
}
@Override
public String getJavaGetterName(Definition definition, Mode mode) {
return disambiguateMethod(definition,
convertToIdentifier(delegate.getJavaGetterName(definition, mode), language));
return fixMethodName(definition, mode, delegate.getJavaGetterName(definition, mode));
}
@Override
public String getJavaMethodName(Definition definition, Mode mode) {
String methodName;
return fixMethodName(definition, mode, delegate.getJavaMethodName(definition, mode));
}
methodName = delegate.getJavaMethodName(definition, mode);
private String fixMethodName(Definition definition, Mode mode, String methodName) {
methodName = overload(definition, mode, methodName);
methodName = convertToIdentifier(methodName, language);
@ -203,9 +203,8 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
* [#1358] Add an overload suffix if needed
*/
private String overload(Definition definition, Mode mode, String identifier) {
if (!StringUtils.isBlank(definition.getOverload())) {
if (!StringUtils.isBlank(definition.getOverload()))
identifier += getOverloadSuffix(definition, mode, definition.getOverload());
}
return identifier;
}

10
jOOQ-examples/jOOQ-jpa-example/pom.xml
View File

@ -3,13 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jooq</groupId>
<artifactId>jooq-examples</artifactId>
<version>3.13.0-SNAPSHOT</version>
</parent>
<groupId>org.jooq</groupId>
<artifactId>jooq-jpa-example</artifactId>
<version>3.13.0-SNAPSHOT</version>
<name>jOOQ JPA Example</name>
<licenses>
@ -22,7 +18,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.h2.version>1.4.199</org.h2.version>
<org.h2.version>1.4.200</org.h2.version>
<org.hibernate.version>5.4.4.Final</org.hibernate.version>
<org.springframework.version>5.0.7.RELEASE</org.springframework.version>
</properties>

7
jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java
View File

@ -73,10 +73,15 @@ public abstract class AbstractTypedElementDefinition<T extends Definition>
private transient DataTypeDefinition resolvedType;
public AbstractTypedElementDefinition(T container, String name, int position, DataTypeDefinition definedType, String comment) {
this(container, name, position, definedType, comment, null);
}
public AbstractTypedElementDefinition(T container, String name, int position, DataTypeDefinition definedType, String comment, String overload) {
super(container.getDatabase(),
container.getSchema(),
protectName(container, name, position),
comment);
comment,
overload);
this.container = container;
this.definedType = definedType;

6
jOOQ-meta/src/main/java/org/jooq/meta/DefaultParameterDefinition.java
View File

@ -64,7 +64,11 @@ public class DefaultParameterDefinition
}
public DefaultParameterDefinition(RoutineDefinition routine, String name, int position, DataTypeDefinition type, boolean isDefaulted, boolean isUnnamed, String comment) {
super(routine, name, position, type, comment);
this(routine, name, position, type, isDefaulted, isUnnamed, comment, null);
}
public DefaultParameterDefinition(RoutineDefinition routine, String name, int position, DataTypeDefinition type, boolean isDefaulted, boolean isUnnamed, String comment, String overload) {
super(routine, name, position, type, comment, overload);
this.isDefaulted = isDefaulted;
this.isUnnamed = isUnnamed;

80
jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresRoutineDefinition.java
View File

@ -38,14 +38,17 @@
package org.jooq.meta.postgres;
import static org.jooq.impl.DSL.count;
import static org.jooq.impl.DSL.inline;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.DSL.partitionBy;
import static org.jooq.meta.postgres.information_schema.Tables.PARAMETERS;
import static org.jooq.meta.postgres.information_schema.Tables.ROUTINES;
import java.sql.SQLException;
import java.util.Arrays;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.meta.AbstractRoutineDefinition;
import org.jooq.meta.DataTypeDefinition;
@ -55,6 +58,8 @@ import org.jooq.meta.DefaultParameterDefinition;
import org.jooq.meta.InOutDefinition;
import org.jooq.meta.ParameterDefinition;
import org.jooq.meta.SchemaDefinition;
import org.jooq.meta.postgres.information_schema.tables.Parameters;
import org.jooq.tools.JooqLogger;
import org.jooq.tools.StringUtils;
/**
@ -64,7 +69,8 @@ import org.jooq.tools.StringUtils;
*/
public class PostgresRoutineDefinition extends AbstractRoutineDefinition {
private final String specificName;
private static final JooqLogger log = JooqLogger.getLogger(PostgresRoutineDefinition.class);
private final String specificName;
public PostgresRoutineDefinition(Database database, Record record) {
super(database.getSchema(record.get(ROUTINES.ROUTINE_SCHEMA)),
@ -113,54 +119,64 @@ public class PostgresRoutineDefinition extends AbstractRoutineDefinition {
@Override
protected void init0() throws SQLException {
for (Record record : create().select(
PARAMETERS.PARAMETER_NAME,
PARAMETERS.DATA_TYPE,
PARAMETERS.CHARACTER_MAXIMUM_LENGTH,
PARAMETERS.NUMERIC_PRECISION,
PARAMETERS.NUMERIC_SCALE,
PARAMETERS.UDT_SCHEMA,
PARAMETERS.UDT_NAME,
PARAMETERS.ORDINAL_POSITION,
PARAMETERS.PARAMETER_MODE,
((PostgresDatabase) getDatabase()).is94()
? PARAMETERS.PARAMETER_DEFAULT
: inline((String) null).as(PARAMETERS.PARAMETER_DEFAULT))
.from(PARAMETERS)
.where(PARAMETERS.SPECIFIC_SCHEMA.equal(getSchema().getName()))
.and(PARAMETERS.SPECIFIC_NAME.equal(specificName))
.orderBy(PARAMETERS.ORDINAL_POSITION.asc())
.fetch()) {
Parameters p = PARAMETERS;
Field<Integer> count = count()
.filterWhere(p.PARAMETER_NAME.ne(inline("")))
.over(partitionBy(p.SPECIFIC_NAME, p.PARAMETER_NAME));
Field<Integer> c = count.as("c");
String inOut = record.get(PARAMETERS.PARAMETER_MODE);
for (Record record : create().select(
p.PARAMETER_NAME,
p.DATA_TYPE,
p.CHARACTER_MAXIMUM_LENGTH,
p.NUMERIC_PRECISION,
p.NUMERIC_SCALE,
p.UDT_SCHEMA,
p.UDT_NAME,
p.ORDINAL_POSITION,
p.PARAMETER_MODE,
((PostgresDatabase) getDatabase()).is94()
? p.PARAMETER_DEFAULT
: inline((String) null).as(p.PARAMETER_DEFAULT),
c
)
.from(p)
.where(p.SPECIFIC_SCHEMA.equal(getSchema().getName()))
.and(p.SPECIFIC_NAME.equal(specificName))
.orderBy(p.ORDINAL_POSITION.asc())) {
String parameterName = record.get(p.PARAMETER_NAME);
String inOut = record.get(p.PARAMETER_MODE);
SchemaDefinition typeSchema = null;
String schemaName = record.get(PARAMETERS.UDT_SCHEMA);
String schemaName = record.get(p.UDT_SCHEMA);
if (schemaName != null)
typeSchema = getDatabase().getSchema(schemaName);
DataTypeDefinition type = new DefaultDataTypeDefinition(
getDatabase(),
typeSchema,
record.get(PARAMETERS.DATA_TYPE),
record.get(PARAMETERS.CHARACTER_MAXIMUM_LENGTH),
record.get(PARAMETERS.NUMERIC_PRECISION),
record.get(PARAMETERS.NUMERIC_SCALE),
record.get(p.DATA_TYPE),
record.get(p.CHARACTER_MAXIMUM_LENGTH),
record.get(p.NUMERIC_PRECISION),
record.get(p.NUMERIC_SCALE),
null,
record.get(PARAMETERS.PARAMETER_DEFAULT),
record.get(p.PARAMETER_DEFAULT),
name(
record.get(PARAMETERS.UDT_SCHEMA),
record.get(PARAMETERS.UDT_NAME)
record.get(p.UDT_SCHEMA),
record.get(p.UDT_NAME)
)
);
ParameterDefinition parameter = new DefaultParameterDefinition(
this,
record.get(PARAMETERS.PARAMETER_NAME),
record.get(PARAMETERS.ORDINAL_POSITION),
parameterName,
record.get(p.ORDINAL_POSITION),
type,
record.get(PARAMETERS.PARAMETER_DEFAULT) != null,
StringUtils.isBlank(record.get(PARAMETERS.PARAMETER_NAME))
record.get(p.PARAMETER_DEFAULT) != null,
StringUtils.isBlank(parameterName),
"",
record.get(c) > 1 ? record.get(p.ORDINAL_POSITION, String.class) : null
);
addParameter(InOutDefinition.getFromString(inOut), parameter);