From 80e81e89aab7b098752a18c14b9615aa03e97904 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 18 Aug 2020 15:20:26 +0200 Subject: [PATCH] [jOOQ/jOOQ#2530] Fixed defining/referencing column names in embeddables --- .../main/java/org/jooq/codegen/JavaGenerator.java | 4 ++-- .../jooq/meta/DefaultEmbeddableColumnDefinition.java | 12 ++++++------ .../org/jooq/meta/EmbeddableColumnDefinition.java | 4 ++-- 3 files changed, 10 insertions(+), 10 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 a069eb0161..c45d8f9cd4 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -1510,7 +1510,7 @@ public class JavaGenerator extends AbstractGenerator { TypedElementDefinition column = columns.get(i - 1); if (column instanceof EmbeddableColumnDefinition) - column = ((EmbeddableColumnDefinition) column).getColumn(); + column = ((EmbeddableColumnDefinition) column).getReferencingColumn(); final String colTypeFull = getJavaType(column.getType(resolver())); final String colType = out.ref(colTypeFull); @@ -4438,7 +4438,7 @@ public class JavaGenerator extends AbstractGenerator { final List columnIds = new ArrayList<>(); for (EmbeddableColumnDefinition column : embeddable.getColumns()) - columnIds.add(out.ref(getStrategy().getJavaIdentifier(column), colRefSegments(column))); + columnIds.add(out.ref(getStrategy().getJavaIdentifier(column.getReferencingColumn()), colRefSegments(column.getReferencingColumn()))); out.javadoc("The embeddable type %s.", embeddable.getOutputName()); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java index bf22130c3a..56833f8895 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java @@ -44,13 +44,13 @@ public class DefaultEmbeddableColumnDefinition extends AbstractTypedElementDefinition implements EmbeddableColumnDefinition { - private final ColumnDefinition column; + private final ColumnDefinition referencingColumn; private final int position; - public DefaultEmbeddableColumnDefinition(EmbeddableDefinition container, String name, ColumnDefinition column, int position) { - super(container, name, position, column.getDefinedType(), column.getComment()); + public DefaultEmbeddableColumnDefinition(EmbeddableDefinition container, String definingColumnName, ColumnDefinition referencingColumn, int position) { + super(container, definingColumnName, position, referencingColumn.getDefinedType(), referencingColumn.getComment()); - this.column = column; + this.referencingColumn = referencingColumn; this.position = position; } @@ -60,7 +60,7 @@ public class DefaultEmbeddableColumnDefinition } @Override - public final ColumnDefinition getColumn() { - return column; + public final ColumnDefinition getReferencingColumn() { + return referencingColumn; } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/EmbeddableColumnDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/EmbeddableColumnDefinition.java index 17301ad0d1..fb066ee27c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/EmbeddableColumnDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/EmbeddableColumnDefinition.java @@ -46,8 +46,8 @@ package org.jooq.meta; public interface EmbeddableColumnDefinition extends TypedElementDefinition, PositionedDefinition { /** - * The backing column definition. + * The referencing column definition. */ - ColumnDefinition getColumn(); + ColumnDefinition getReferencingColumn(); }