diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 94c395e120..38538ca015 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -1646,6 +1646,7 @@ public abstract class AbstractDatabase implements Database { boolean commercialFlags = type.getVisibilityModifier() != null || !StringUtils.isBlank(type.getGenerator()) + || TRUE.equals(type.isHidden()) || TRUE.equals(type.isAuditInsertTimestamp()) || TRUE.equals(type.isAuditInsertUser()) || TRUE.equals(type.isAuditUpdateTimestamp()) @@ -1660,7 +1661,7 @@ public abstract class AbstractDatabase implements Database { continue; } else if (commercialFlags && !commercial()) { - log.warn(", , , , , and are commercial only features. Please upgrade to the jOOQ Professional Edition or jOOQ Enterprise Edition: " + type); + log.warn(", , , , , , and are commercial only features. Please upgrade to the jOOQ Professional Edition or jOOQ Enterprise Edition: " + type); it.remove(); continue; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java index 08e8584489..f605174b5d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java @@ -247,6 +247,10 @@ public abstract class AbstractTypedElementDefinition boolean r = result.isReadonly(); String g = result.getGeneratedAlwaysAs(); + + + + int l = 0; int p = 0; int s = 0; @@ -308,6 +312,7 @@ public abstract class AbstractTypedElementDefinition + // [#13791] AutoConverters profit from simplified configuration if (TRUE.equals(customType.isAutoConverter()) || AutoConverter.class.getName().equals(customType.getConverter())) { @@ -402,6 +407,13 @@ public abstract class AbstractTypedElementDefinition } + + + + + + + } return result; @@ -447,6 +459,7 @@ public abstract class AbstractTypedElementDefinition .withJsonConverter(forcedType.isJsonConverter()) .withLambdaConverter(forcedType.getLambdaConverter()) .withVisibilityModifier(forcedType.getVisibilityModifier()) + .withHidden(forcedType.isHidden()) .withGenerator(forcedType.getGenerator()) .withAuditInsertTimestamp(forcedType.isAuditInsertTimestamp()) .withAuditInsertUser(forcedType.isAuditInsertUser()) diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java index 3d93c044e7..a7673dce0c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldsImpl.java @@ -546,6 +546,11 @@ final class FieldsImpl extends AbstractQueryPart implements Re final void add(Field f) { + + + + + // TODO: [#10481] Can we replace our internal Field[] by an ArrayList>? Field[] result = new Field[fields.length + 1];