From b0d1be0d9206e94bf3d017b30116f8debaa2c834 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 5 Sep 2023 19:51:09 +0200 Subject: [PATCH] [jOOQ/jOOQ#12083] [jOOQ/jOOQ#15546] Regression with configured comments The [jOOQ/jOOQ#9728] configured comments feature may produce empty comments, e.g. when is false. In that case, we mustn't re-introduce the schema comment! --- .../org/jooq/meta/AbstractDefinition.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDefinition.java index ddd522d919..1832fc75c8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDefinition.java @@ -163,33 +163,32 @@ public abstract class AbstractDefinition implements Definition { @Override public final String getComment() { - String c = getComment0(); - return !isEmpty(c) ? c : defaultIfNull(getDatabase().getComments().get(this), ""); + + + + + + + + + + + + + + + + + + + + + + return getSchemaComment(); } - private final String getComment0() { - - - - - - - - - - - - - - - - - - - - - - return schemaComment; + private final String getSchemaComment() { + return !isEmpty(schemaComment) ? schemaComment : defaultIfNull(getDatabase().getComments().get(this), ""); } @Override