From 4179d2eb421ef7c75da3c1e52ba1b220189fba8e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 19 Jan 2024 15:42:28 +0100 Subject: [PATCH] [jOOQ/jOOQ#13411] Add jOOQ and jOOQ-meta API for hidden columns --- .../main/java/org/jooq/codegen/Constants.java | 2 +- .../java/org/jooq/codegen/GenerationUtil.java | 1 + .../java/org/jooq/codegen/JavaGenerator.java | 8 ++- .../java/org/jooq/codegen/XMLGenerator.java | 1 + .../meta/AbstractTypedElementDefinition.java | 5 +- .../java/org/jooq/meta/ColumnDefinition.java | 5 ++ .../main/java/org/jooq/meta/Constants.java | 2 +- .../org/jooq/meta/DataTypeDefinition.java | 5 ++ .../jooq/meta/DefaultColumnDefinition.java | 21 ++++++++ .../jooq/meta/DefaultDataTypeDefinition.java | 16 ++++++ .../DefaultEmbeddableColumnDefinition.java | 1 + .../jooq/meta/jaxb/CatalogMappingType.java | 2 +- .../java/org/jooq/meta/jaxb/CommentType.java | 2 +- .../org/jooq/meta/jaxb/Configuration.java | 2 +- .../java/org/jooq/meta/jaxb/CustomType.java | 50 ++++++++++++++++++- .../java/org/jooq/meta/jaxb/Database.java | 2 +- .../meta/jaxb/EmbeddableDefinitionType.java | 2 +- .../org/jooq/meta/jaxb/EmbeddableField.java | 2 +- .../java/org/jooq/meta/jaxb/EnumType.java | 2 +- .../java/org/jooq/meta/jaxb/ForcedType.java | 2 +- .../java/org/jooq/meta/jaxb/Generate.java | 2 +- .../java/org/jooq/meta/jaxb/Generator.java | 2 +- .../main/java/org/jooq/meta/jaxb/Jdbc.java | 2 +- .../org/jooq/meta/jaxb/LambdaConverter.java | 2 +- .../java/org/jooq/meta/jaxb/MatcherRule.java | 2 +- .../java/org/jooq/meta/jaxb/Matchers.java | 2 +- .../jooq/meta/jaxb/MatchersAttributeType.java | 2 +- .../jooq/meta/jaxb/MatchersCatalogType.java | 2 +- .../meta/jaxb/MatchersEmbeddableType.java | 2 +- .../org/jooq/meta/jaxb/MatchersEnumType.java | 2 +- .../org/jooq/meta/jaxb/MatchersFieldType.java | 2 +- .../meta/jaxb/MatchersForeignKeyType.java | 2 +- .../org/jooq/meta/jaxb/MatchersIndexType.java | 2 +- .../meta/jaxb/MatchersPrimaryKeyType.java | 2 +- .../jooq/meta/jaxb/MatchersRoutineType.java | 2 +- .../jooq/meta/jaxb/MatchersSchemaType.java | 2 +- .../jooq/meta/jaxb/MatchersSequenceType.java | 2 +- .../org/jooq/meta/jaxb/MatchersTableType.java | 2 +- .../org/jooq/meta/jaxb/MatchersUDTType.java | 2 +- .../jooq/meta/jaxb/MatchersUniqueKeyType.java | 2 +- .../java/org/jooq/meta/jaxb/Property.java | 2 +- .../org/jooq/meta/jaxb/SchemaMappingType.java | 2 +- .../java/org/jooq/meta/jaxb/Strategy.java | 2 +- .../jooq/meta/jaxb/SyntheticColumnType.java | 2 +- .../meta/jaxb/SyntheticDaoMethodType.java | 2 +- .../org/jooq/meta/jaxb/SyntheticDaoType.java | 2 +- .../org/jooq/meta/jaxb/SyntheticEnumType.java | 2 +- .../meta/jaxb/SyntheticForeignKeyType.java | 2 +- .../jooq/meta/jaxb/SyntheticIdentityType.java | 2 +- .../jooq/meta/jaxb/SyntheticObjectsType.java | 2 +- .../meta/jaxb/SyntheticPrimaryKeyType.java | 2 +- .../jaxb/SyntheticReadonlyColumnType.java | 2 +- .../meta/jaxb/SyntheticReadonlyRowidType.java | 2 +- .../meta/jaxb/SyntheticUniqueKeyType.java | 2 +- .../org/jooq/meta/jaxb/SyntheticViewType.java | 2 +- .../main/java/org/jooq/meta/jaxb/Target.java | 2 +- .../org/jooq/meta/xml/XMLTableDefinition.java | 1 + .../org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd | 12 +++++ jOOQ/src/main/java/org/jooq/Constants.java | 2 +- jOOQ/src/main/java/org/jooq/DataType.java | 19 +++++++ .../java/org/jooq/impl/AbstractDataType.java | 7 +++ .../java/org/jooq/impl/AbstractDataTypeX.java | 35 +++++++++++++ .../java/org/jooq/impl/ArrayDataType.java | 5 +- .../java/org/jooq/impl/ConvertedDataType.java | 7 +++ .../java/org/jooq/impl/DataTypeProxy.java | 42 +++++++++++++++- .../java/org/jooq/impl/DefaultDataType.java | 17 +++++-- .../java/org/jooq/impl/DomainDataType.java | 3 ++ .../jooq/impl/InformationSchemaExport.java | 1 + .../jooq/impl/InformationSchemaMetaImpl.java | 9 ++-- .../jooq/impl/LegacyConvertedDataType.java | 2 + .../java/org/jooq/impl/MultisetDataType.java | 5 +- .../main/java/org/jooq/impl/ParserImpl.java | 17 +++++-- .../java/org/jooq/impl/RecordDataType.java | 5 +- .../java/org/jooq/util/xml/jaxb/Catalog.java | 2 +- .../jooq/util/xml/jaxb/CheckConstraint.java | 2 +- .../java/org/jooq/util/xml/jaxb/Column.java | 44 +++++++++++++++- .../java/org/jooq/util/xml/jaxb/Domain.java | 2 +- .../jooq/util/xml/jaxb/DomainConstraint.java | 2 +- .../org/jooq/util/xml/jaxb/ElementType.java | 2 +- .../java/org/jooq/util/xml/jaxb/Index.java | 2 +- .../jooq/util/xml/jaxb/IndexColumnUsage.java | 2 +- .../jooq/util/xml/jaxb/InformationSchema.java | 38 +++++++------- .../jooq/util/xml/jaxb/KeyColumnUsage.java | 2 +- .../org/jooq/util/xml/jaxb/Parameter.java | 4 +- .../util/xml/jaxb/ReferentialConstraint.java | 2 +- .../java/org/jooq/util/xml/jaxb/Routine.java | 4 +- .../java/org/jooq/util/xml/jaxb/Schema.java | 2 +- .../java/org/jooq/util/xml/jaxb/Sequence.java | 2 +- .../java/org/jooq/util/xml/jaxb/Table.java | 4 +- .../jooq/util/xml/jaxb/TableConstraint.java | 4 +- .../java/org/jooq/util/xml/jaxb/Trigger.java | 8 +-- .../java/org/jooq/util/xml/jaxb/View.java | 2 +- .../org/jooq/util/xml/jaxb/package-info.java | 2 +- ...q-meta-3.19.0.xsd => jooq-meta-3.20.0.xsd} | 5 +- 94 files changed, 420 insertions(+), 111 deletions(-) rename jOOQ/src/main/resources/org/jooq/xsd/{jooq-meta-3.19.0.xsd => jooq-meta-3.20.0.xsd} (99%) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java index 0de5dfa2b7..28cb1c3e84 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java @@ -110,7 +110,7 @@ public final class Constants { /** * The current jooq-meta XSD file name. */ - public static final String XSD_META = "jooq-meta-3.19.0.xsd"; + public static final String XSD_META = "jooq-meta-3.20.0.xsd"; /** * The current jooq-meta XML namespace. diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationUtil.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationUtil.java index 3e8a013183..521cab642a 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationUtil.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationUtil.java @@ -502,6 +502,7 @@ class GenerationUtil { type.getPrecision(), type.getScale(), type.isNullable(), + type.isHidden(), type.isReadonly(), type.getGeneratedAlwaysAs(), type.getDefaultValue(), 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 11b4c658d0..6a6d2e50ff 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -10476,6 +10476,7 @@ public class JavaGenerator extends AbstractGenerator { type.getLength(), type.isNullable(), type.isIdentity(), + type.isHidden(), type.isReadonly(), type.getGeneratedAlwaysAs(), type.getGenerationOption(), @@ -10804,6 +10805,7 @@ public class JavaGenerator extends AbstractGenerator { int l, boolean n, boolean i, + boolean h, boolean r, String g, GenerationOption go, @@ -10843,7 +10845,7 @@ public class JavaGenerator extends AbstractGenerator { db, schema, DefaultDataType.getDataType(db.getDialect(), String.class).getTypeName(), - l, p, s, n, r, g, d, i, (Name) null, ge, null, null, null + l, p, s, n, h, r, g, d, i, (Name) null, ge, null, null, null ), out)); sb.append(".asEnumDataType("); sb.append(classOf(out.ref(getStrategy().getFullJavaClassName(db.getEnum(schema, u), Mode.ENUM)))); @@ -10877,6 +10879,7 @@ public class JavaGenerator extends AbstractGenerator { + if (d != null) dataType = dataType.defaultValue((Field) DSL.field(d, dataType)); @@ -10944,6 +10947,9 @@ public class JavaGenerator extends AbstractGenerator { + + + diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java index 597d4ded3a..0fa07de442 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java @@ -206,6 +206,7 @@ public class XMLGenerator extends AbstractGenerator { column.setNumericPrecision(type.getPrecision()); column.setNumericScale(type.getScale()); column.setOrdinalPosition(co.getPosition()); + column.setHidden(co.isHidden()); column.setReadonly(co.isReadonly()); if (type.isComputed()) { 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 a2f5b19194..08e8584489 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java @@ -243,6 +243,7 @@ public abstract class AbstractTypedElementDefinition boolean n = result.isNullable(); String d = result.getDefaultValue(); boolean i = result.isIdentity(); + boolean h = result.isHidden(); boolean r = result.isReadonly(); String g = result.getGeneratedAlwaysAs(); @@ -272,7 +273,7 @@ public abstract class AbstractTypedElementDefinition // [#677] SQLDataType matches are actual type-rewrites if (forcedDataType != null) - result = new DefaultDataTypeDefinition(db, child.getSchema(), name, l, p, s, n, r, g, d, i, (Name) null, generator, converter, binding, null); + result = new DefaultDataTypeDefinition(db, child.getSchema(), name, l, p, s, n, h, r, g, d, i, (Name) null, generator, converter, binding, null); } catch (SQLDialectNotSupportedException e) { @@ -386,7 +387,7 @@ public abstract class AbstractTypedElementDefinition s = result.getScale(); String t = result.getType(); Name u = result.getQualifiedUserType(); - result = new DefaultDataTypeDefinition(db, definedType.getSchema(), t, l, p, s, n, r, g, d, i, u, generator, converter, binding, uType); + result = new DefaultDataTypeDefinition(db, definedType.getSchema(), t, l, p, s, n, h, r, g, d, i, u, generator, converter, binding, uType); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java index f2cdf64752..a38c1e36a3 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/ColumnDefinition.java @@ -75,6 +75,11 @@ public interface ColumnDefinition extends TypedElementDefinition replacedByEmbeddables; private boolean synthetic; @@ -83,16 +84,31 @@ public class DefaultColumnDefinition boolean identity, boolean readonly, String comment + ) { + this(table, name, position, type, identity, false, readonly, comment); + } + + public DefaultColumnDefinition( + TableDefinition table, + String name, + int position, + DataTypeDefinition type, + boolean identity, + boolean hidden, + boolean readonly, + String comment ) { super(table, name, position, type, comment); this.position = position; this.identity = identity || isSyntheticIdentity(this); + this.hidden = hidden; this.readonly = readonly || isSyntheticReadonlyColumn(this, this.identity); // [#6222] Copy the column's identity flag to the data type definition if (type instanceof DefaultDataTypeDefinition dd) { dd.identity(this.identity); + dd.hidden(this.hidden); dd.readonly(this.readonly); @@ -181,6 +197,11 @@ public class DefaultColumnDefinition return identity; } + @Override + public final boolean isHidden() { + return hidden; + } + @Override public final boolean isReadonly() { return readonly; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java index c1d107c664..50d352f5ed 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultDataTypeDefinition.java @@ -76,6 +76,7 @@ public class DefaultDataTypeDefinition implements DataTypeDefinition { private final String converter; private final String binding; private final boolean nullable; + private boolean hidden; private boolean readonly; private String generatedAlwaysAs; private GenerationOption generationOption; @@ -119,6 +120,10 @@ public class DefaultDataTypeDefinition implements DataTypeDefinition { } public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, boolean readonly, String generatedAlwaysAs, String defaultValue, boolean identity, Name userType, String generator, String converter, String binding, String javaType) { + this(database, schema, typeName, length, precision, scale, nullable, false, readonly, generatedAlwaysAs, defaultValue, identity, userType, generator, converter, binding, javaType); + } + + public DefaultDataTypeDefinition(Database database, SchemaDefinition schema, String typeName, Number length, Number precision, Number scale, Boolean nullable, boolean hidden, boolean readonly, String generatedAlwaysAs, String defaultValue, boolean identity, Name userType, String generator, String converter, String binding, String javaType) { this.database = database; this.schema = schema; @@ -148,6 +153,7 @@ public class DefaultDataTypeDefinition implements DataTypeDefinition { this.precision = precision == null ? 0 : precision.intValue(); this.scale = scale == null ? 0 : scale.intValue(); this.nullable = nullable == null ? true : nullable.booleanValue(); + this.hidden = hidden; this.readonly = readonly; this.generatedAlwaysAs = generatedAlwaysAs; this.defaultValue = defaultValue; @@ -176,6 +182,16 @@ public class DefaultDataTypeDefinition implements DataTypeDefinition { return nullable; } + public final DefaultDataTypeDefinition hidden(boolean h) { + this.hidden = h; + return this; + } + + @Override + public final boolean isHidden() { + return hidden; + } + public final DefaultDataTypeDefinition readonly(boolean r) { this.readonly = r; return this; 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 c85a741c00..1777296ad4 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultEmbeddableColumnDefinition.java @@ -76,6 +76,7 @@ public class DefaultEmbeddableColumnDefinition original.getPrecision(), original.getScale(), original.isNullable() || other.isNullable(), + original.isHidden(), original.isReadonly(), original.getGeneratedAlwaysAs(), original.getDefaultValue(), diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java index f1b87b2d80..0831a5272f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java @@ -32,7 +32,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class CatalogMappingType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true, defaultValue = "") @XmlJavaTypeAdapter(StringAdapter.class) protected String inputCatalog = ""; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java index 79e3e38279..aa6704b3ca 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java @@ -30,7 +30,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class CommentType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java index 9671c5879d..49e619667d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java @@ -49,7 +49,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Configuration implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlSchemaType(name = "string") protected Logging logging; @XmlElement(defaultValue = "FAIL") diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java index c626c46fd3..cde5ffc52e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java @@ -30,7 +30,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class CustomType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @@ -38,6 +38,8 @@ public class CustomType implements Serializable, XMLAppendable protected String type; @XmlSchemaType(name = "string") protected VisibilityModifier visibilityModifier; + @XmlElement(defaultValue = "false") + protected Boolean hidden = false; @XmlJavaTypeAdapter(StringAdapter.class) protected String generator; protected Boolean auditInsertTimestamp; @@ -110,6 +112,32 @@ public class CustomType implements Serializable, XMLAppendable this.visibilityModifier = value; } + /** + * @deprecated Use ForcedType only + * + * @return + * possible object is + * {@link Boolean } + * + */ + @Deprecated + public Boolean isHidden() { + return hidden; + } + + /** + * @deprecated Use ForcedType only + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + @Deprecated + public void setHidden(Boolean value) { + this.hidden = value; + } + /** * @deprecated Use ForcedType only * @@ -472,6 +500,15 @@ public class CustomType implements Serializable, XMLAppendable return this; } + /** + * @deprecated Use ForcedType only + * + */ + public CustomType withHidden(Boolean value) { + setHidden(value); + return this; + } + /** * @deprecated Use ForcedType only * @@ -607,6 +644,7 @@ public class CustomType implements Serializable, XMLAppendable builder.append("name", name); builder.append("type", type); builder.append("visibilityModifier", visibilityModifier); + builder.append("hidden", hidden); builder.append("generator", generator); builder.append("auditInsertTimestamp", auditInsertTimestamp); builder.append("auditInsertUser", auditInsertUser); @@ -669,6 +707,15 @@ public class CustomType implements Serializable, XMLAppendable return false; } } + if (hidden == null) { + if (other.hidden!= null) { + return false; + } + } else { + if (!hidden.equals(other.hidden)) { + return false; + } + } if (generator == null) { if (other.generator!= null) { return false; @@ -805,6 +852,7 @@ public class CustomType implements Serializable, XMLAppendable result = ((prime*result)+((name == null)? 0 :name.hashCode())); result = ((prime*result)+((type == null)? 0 :type.hashCode())); result = ((prime*result)+((visibilityModifier == null)? 0 :visibilityModifier.hashCode())); + result = ((prime*result)+((hidden == null)? 0 :hidden.hashCode())); result = ((prime*result)+((generator == null)? 0 :generator.hashCode())); result = ((prime*result)+((auditInsertTimestamp == null)? 0 :auditInsertTimestamp.hashCode())); result = ((prime*result)+((auditInsertUser == null)? 0 :auditInsertUser.hashCode())); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java index 990acff8e1..d0f3ccce45 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java @@ -33,7 +33,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Database implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java index daf1475c8e..94a28440a6 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java @@ -32,7 +32,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class EmbeddableDefinitionType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String catalog; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java index eefba1cb3d..bf354b7833 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java @@ -42,7 +42,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class EmbeddableField implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java index 96151fcd64..f9457fde52 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java @@ -42,7 +42,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class EnumType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String name; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java index d76c33d9e9..c4ab65eb96 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java @@ -29,7 +29,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class ForcedType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(defaultValue = "0") protected Integer priority = 0; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java index 76782dc1fc..022845503b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java @@ -29,7 +29,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Generate implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(defaultValue = "true") protected Boolean indexes = true; @XmlElement(defaultValue = "true") diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java index b7ebdaefcd..9cb4c56d6c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Generator implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(defaultValue = "org.jooq.codegen.DefaultGenerator") @XmlJavaTypeAdapter(StringAdapter.class) protected String name = "org.jooq.codegen.DefaultGenerator"; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java index 9ec442f106..89865d20fd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java @@ -32,7 +32,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Jdbc implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String driver; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java index de48248721..760f1d4a59 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class LambdaConverter implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String from; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java index e4d63435a8..4c4ad6989d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java @@ -43,7 +43,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatcherRule implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlSchemaType(name = "string") protected MatcherTransformType transform; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java index b64c44f0ce..22ebba8bf8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java @@ -43,7 +43,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Matchers implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElementWrapper(name = "catalogs") @XmlElement(name = "catalog") protected List catalogs; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersAttributeType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersAttributeType.java index ff1d39e105..ed8045b136 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersAttributeType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersAttributeType.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersAttributeType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule attributeIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java index bc3d47126e..3dd4c93109 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersCatalogType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule catalogClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java index 617260ac42..c2898bd923 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersEmbeddableType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule recordClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java index f384c66f11..e85e160733 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersEnumType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule enumClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java index e1536c219d..3d5b42787c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersFieldType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule fieldIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersForeignKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersForeignKeyType.java index 8246f60aa8..32ef04d433 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersForeignKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersForeignKeyType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersForeignKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule keyIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersIndexType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersIndexType.java index ee62d57252..736b5b05a9 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersIndexType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersIndexType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersIndexType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule keyIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersPrimaryKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersPrimaryKeyType.java index 1f438f160d..ffa0d24f7b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersPrimaryKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersPrimaryKeyType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersPrimaryKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule keyIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java index d3e64b73d4..f0f80fc949 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersRoutineType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule routineClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java index cd739bbb0c..938a25bf7f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersSchemaType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule schemaClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java index b5a28a087d..66171df15a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersSequenceType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule sequenceIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java index ac2c354226..615b2b3dae 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersTableType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule tableClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUDTType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUDTType.java index 45d5d26f88..f29d34809a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUDTType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUDTType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersUDTType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule udtClass; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUniqueKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUniqueKeyType.java index d162d40d45..25101d3017 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUniqueKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersUniqueKeyType.java @@ -27,7 +27,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class MatchersUniqueKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String expression; protected MatcherRule keyIdentifier; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java index 28f8dd4b6a..8e1e9866a8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java @@ -29,7 +29,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Property implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String key; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java index b5dd592df0..2f5c5d9156 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SchemaMappingType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true, defaultValue = "") @XmlJavaTypeAdapter(StringAdapter.class) protected String inputSchema = ""; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java index 9349430698..9f956e380c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java @@ -30,7 +30,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Strategy implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(defaultValue = "org.jooq.codegen.DefaultGeneratorStrategy") @XmlJavaTypeAdapter(StringAdapter.class) protected String name = "org.jooq.codegen.DefaultGeneratorStrategy"; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticColumnType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticColumnType.java index cf864e3d70..a0540c8de4 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticColumnType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticColumnType.java @@ -44,7 +44,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticColumnType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String tables; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoMethodType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoMethodType.java index 3c30b719b8..ea1da277de 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoMethodType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoMethodType.java @@ -44,7 +44,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticDaoMethodType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String name; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoType.java index b7fcd327e9..6975968bd5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticDaoType.java @@ -49,7 +49,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticDaoType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String catalog; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticEnumType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticEnumType.java index cfa8027242..47bdd870c2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticEnumType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticEnumType.java @@ -52,7 +52,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticEnumType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java index 8c24aa652d..069fafbfed 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java @@ -50,7 +50,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticForeignKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java index 6e2fd3b756..4ea43eb1fe 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java @@ -42,7 +42,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticIdentityType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String tables; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java index b244a7a577..c76d9d04ea 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java @@ -30,7 +30,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticObjectsType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElementWrapper(name = "readonlyColumns") @XmlElement(name = "readonlyColumn") protected List readonlyColumns; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java index fe0f6a1c39..468280b23e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java @@ -48,7 +48,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticPrimaryKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java index 8d8c81f4ce..4e6ea77f85 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java @@ -42,7 +42,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticReadonlyColumnType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String tables; @XmlElement(required = true) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java index 0cbf6c94ca..cb1f2e91fe 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java @@ -41,7 +41,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticReadonlyRowidType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java index d23c8dbd3b..29febcc997 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java @@ -47,7 +47,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticUniqueKeyType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String name; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java index 2407115b5c..296c348be6 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java @@ -45,7 +45,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class SyntheticViewType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlJavaTypeAdapter(StringAdapter.class) protected String catalog; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java index 7f17b27efb..4808e17feb 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Target implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31902L; + private final static long serialVersionUID = 32000L; @XmlElement(defaultValue = "org.jooq.generated") @XmlJavaTypeAdapter(StringAdapter.class) protected String packageName = "org.jooq.generated"; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLTableDefinition.java index cf8d328b5e..8dbdebc088 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLTableDefinition.java @@ -118,6 +118,7 @@ public class XMLTableDefinition extends AbstractTableDefinition { unbox(column.getOrdinalPosition()), type, column.getIdentityGeneration() != null, + TRUE.equals(column.isHidden()), TRUE.equals(column.isReadonly()), column.getComment() )); diff --git a/jOOQ-meta/src/main/resources/org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd b/jOOQ-meta/src/main/resources/org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd index 871543c1bb..004312e5f5 100644 --- a/jOOQ-meta/src/main/resources/org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd +++ b/jOOQ-meta/src/main/resources/org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd @@ -1933,6 +1933,18 @@ This feature is available in the commercial distribution only.]]>< + + + + + + + @java.lang.Deprecated + @java.lang.Deprecated + + + + diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index f125eb6e86..a7e997ed1a 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -109,7 +109,7 @@ public final class Constants { /** * The current jooq-meta XSD file name. */ - public static final String XSD_META = "jooq-meta-3.19.0.xsd"; + public static final String XSD_META = "jooq-meta-3.20.0.xsd"; /** * The current jooq-meta XML namespace. diff --git a/jOOQ/src/main/java/org/jooq/DataType.java b/jOOQ/src/main/java/org/jooq/DataType.java index 3cfa5b5a63..1b06459e7c 100644 --- a/jOOQ/src/main/java/org/jooq/DataType.java +++ b/jOOQ/src/main/java/org/jooq/DataType.java @@ -486,6 +486,25 @@ public interface DataType extends Named { */ boolean nullable(); + /** + * Return a new data type like this, with a new hidden attribute. + *

+ * This feature is implemented in commercial distributions only. + * + * @param readonly The new hidden attribute value. + * @return The new data type + */ + @NotNull + @Support + DataType hidden(boolean hidden); + + /** + * Get the hidden attribute of this data type. + *

+ * This feature is implemented in commercial distributions only. + */ + boolean hidden(); + /** * Return a new data type like this, with a new readonly attribute. *

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java index 4b7119f80a..2e5b14cab0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java @@ -162,6 +162,12 @@ implements return nullable(false); } + @Override + public abstract boolean hidden(); + + @Override + public abstract DataType hidden(boolean h); + @Override public abstract boolean readonly(); @@ -721,6 +727,7 @@ implements scale0(), length0(), nullability(), + hidden(), readonly(), (Generator) generatedAlwaysAsGenerator(), generationOption(), diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataTypeX.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataTypeX.java index fc66fe8d86..13ec40538d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataTypeX.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataTypeX.java @@ -72,6 +72,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -89,6 +90,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), n, + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -100,6 +102,28 @@ abstract class AbstractDataTypeX extends AbstractDataType { ); } + @Override + public final DataType hidden(boolean h) { + if (h && !CONFIG.get().commercial()) + logGeneratedAlwaysAs.info("Hidden columns", "Hidden columns are a commercial only jOOQ feature. If you wish to profit from this feature, please upgrade to the jOOQ Professional Edition"); + + return construct( + precision0(), + scale0(), + length0(), + nullability(), + h, + readonly(), + generatedAlwaysAsGenerator(), + generationOption(), + generationLocation(), + collation(), + characterSet(), + identity(), + defaultValue() + ); + } + @Override public final DataType readonly(boolean r) { if (r && !CONFIG.get().commercial()) @@ -110,6 +134,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), r, generatedAlwaysAsGenerator(), generationOption(), @@ -133,6 +158,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), g != null ? true : readonly(), g, generationOption(), @@ -154,6 +180,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), g, @@ -175,6 +202,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -193,6 +221,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -211,6 +240,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -229,6 +259,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), i ? NOT_NULL : nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -247,6 +278,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), length0(), nullability(), + hidden(), readonly(), d != null ? null : generatedAlwaysAsGenerator(), generationOption(), @@ -265,6 +297,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { s, length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -283,6 +316,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { s, length0(), nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), @@ -301,6 +335,7 @@ abstract class AbstractDataTypeX extends AbstractDataType { scale0(), l, nullability(), + hidden(), readonly(), generatedAlwaysAsGenerator(), generationOption(), diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java index 33dff99b18..6d864f6613 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java @@ -75,6 +75,7 @@ final class ArrayDataType extends DefaultDataType { Integer scale, Integer length, Nullability nullability, + boolean hidden, boolean readonly, Generator generatedAlwaysAs, GenerationOption generationOption, @@ -84,7 +85,7 @@ final class ArrayDataType extends DefaultDataType { boolean identity, Field defaultValue ) { - super(t, precision, scale, length, nullability, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); + super(t, precision, scale, length, nullability, hidden, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); this.elementType = elementType; } @@ -96,6 +97,7 @@ final class ArrayDataType extends DefaultDataType { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -112,6 +114,7 @@ final class ArrayDataType extends DefaultDataType { newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java b/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java index 123769becf..0e19631707 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java @@ -90,6 +90,7 @@ final class ConvertedDataType extends AbstractDataTypeX { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -104,6 +105,7 @@ final class ConvertedDataType extends AbstractDataTypeX { newScale, newLength, newNullability, + newHidden, newReadonly, (Generator) newGeneratedAlwaysAs, newGenerationOption, @@ -207,6 +209,11 @@ final class ConvertedDataType extends AbstractDataTypeX { return delegate.nullability(); } + @Override + public final boolean hidden() { + return delegate.hidden(); + } + @Override public final boolean readonly() { return delegate.readonly(); diff --git a/jOOQ/src/main/java/org/jooq/impl/DataTypeProxy.java b/jOOQ/src/main/java/org/jooq/impl/DataTypeProxy.java index 3ec3f215cf..2332313078 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DataTypeProxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/DataTypeProxy.java @@ -67,6 +67,7 @@ final class DataTypeProxy extends AbstractDataType { private final Integer overrideScale; private final Integer overrideLength; private final Nullability overrideNullability; + private final Boolean overrideHidden; private final Boolean overrideReadonly; private final Generator overrideGeneratedAlwaysAs; private final GenerationOption overrideGenerationOption; @@ -77,7 +78,7 @@ final class DataTypeProxy extends AbstractDataType { private final Field overrideDefaultValue; DataTypeProxy(AbstractDataType type) { - this(type, null, null, null, null, null, null, null, null, null, null, null, null); + this(type, null, null, null, null, null, null, null, null, null, null, null, null, null); } private DataTypeProxy( @@ -86,6 +87,7 @@ final class DataTypeProxy extends AbstractDataType { Integer overrideScale, Integer overrideLength, Nullability overrideNullability, + Boolean overrideHidden, Boolean overrideReadonly, Generator overrideGeneratedAlwaysAs, GenerationOption overrideGenerationOption, @@ -102,6 +104,7 @@ final class DataTypeProxy extends AbstractDataType { this.overrideScale = overrideScale; this.overrideLength = overrideLength; this.overrideNullability = overrideNullability; + this.overrideHidden = overrideHidden; this.overrideReadonly = overrideReadonly; this.overrideGeneratedAlwaysAs = overrideGeneratedAlwaysAs; this.overrideGenerationOption = overrideGenerationOption; @@ -178,6 +181,32 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, n, + overrideHidden, + overrideReadonly, + overrideGeneratedAlwaysAs, + overrideGenerationOption, + overrideGenerationLocation, + overrideCollation, + overrideCharacterSet, + overrideIdentity, + overrideDefaultValue + ); + } + + @Override + public final boolean hidden() { + return defaultIfNull(overrideHidden, type.hidden()); + } + + @Override + public final DataType hidden(boolean h) { + return new DataTypeProxy<>( + this, + overridePrecision, + overrideScale, + overrideLength, + overrideNullability, + h, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -202,6 +231,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, r, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -226,6 +256,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, g, overrideGenerationOption, @@ -250,6 +281,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, g, @@ -274,6 +306,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -298,6 +331,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -322,6 +356,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -346,6 +381,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -370,6 +406,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -424,6 +461,7 @@ final class DataTypeProxy extends AbstractDataType { s, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -448,6 +486,7 @@ final class DataTypeProxy extends AbstractDataType { s, overrideLength, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, @@ -472,6 +511,7 @@ final class DataTypeProxy extends AbstractDataType { overrideScale, l, overrideNullability, + overrideHidden, overrideReadonly, overrideGeneratedAlwaysAs, overrideGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 188ea03401..0268a8fe85 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -269,6 +269,7 @@ public class DefaultDataType extends AbstractDataTypeX { private final String typeName; private final Nullability nullability; + private final boolean hidden; private final boolean readonly; private final Generator generatedAlwaysAs; private final GenerationOption generationOption; @@ -350,10 +351,10 @@ public class DefaultDataType extends AbstractDataTypeX { } DefaultDataType(SQLDialect dialect, DataType sqlDataType, Class type, Binding binding, Name qualifiedTypeName, String typeName, String castTypeName, Integer precision, Integer scale, Integer length, Nullability nullability, Field defaultValue) { - this(dialect, sqlDataType, type, binding, qualifiedTypeName, typeName, castTypeName, precision, scale, length, nullability, false, null, GenerationOption.DEFAULT, GenerationLocation.SERVER, null, null, false, defaultValue); + this(dialect, sqlDataType, type, binding, qualifiedTypeName, typeName, castTypeName, precision, scale, length, nullability, false, false, null, GenerationOption.DEFAULT, GenerationLocation.SERVER, null, null, false, defaultValue); } - DefaultDataType(SQLDialect dialect, DataType sqlDataType, Class type, Binding binding, Name qualifiedTypeName, String typeName, String castTypeName, Integer precision, Integer scale, Integer length, Nullability nullability, boolean readonly, Generator generatedAlwaysAs, GenerationOption generationOption, GenerationLocation generationLocation, Collation collation, CharacterSet characterSet, boolean identity, Field defaultValue) { + DefaultDataType(SQLDialect dialect, DataType sqlDataType, Class type, Binding binding, Name qualifiedTypeName, String typeName, String castTypeName, Integer precision, Integer scale, Integer length, Nullability nullability, boolean hidden, boolean readonly, Generator generatedAlwaysAs, GenerationOption generationOption, GenerationLocation generationLocation, Collation collation, CharacterSet characterSet, boolean identity, Field defaultValue) { super(qualifiedTypeName, NO_COMMENT); // [#13934] Patch parameters @@ -376,6 +377,7 @@ public class DefaultDataType extends AbstractDataTypeX { this.castTypeSuffix = split.length > 1 ? split[1] : ""; this.nullability = nullability == null ? Nullability.DEFAULT : nullability; + this.hidden = hidden; this.readonly = readonly; this.generatedAlwaysAs = generatedAlwaysAs; this.generationOption = generationOption == null ? GenerationOption.DEFAULT : generationOption; @@ -423,6 +425,7 @@ public class DefaultDataType extends AbstractDataTypeX { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -438,6 +441,7 @@ public class DefaultDataType extends AbstractDataTypeX { newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, @@ -458,6 +462,7 @@ public class DefaultDataType extends AbstractDataTypeX { Integer scale, Integer length, Nullability nullability, + boolean hidden, boolean readonly, Generator generatedAlwaysAs, GenerationOption generationOption, @@ -479,6 +484,7 @@ public class DefaultDataType extends AbstractDataTypeX { this.castTypeSuffix = t.castTypeSuffix0(); this.nullability = nullability; + this.hidden = hidden; this.readonly = readonly; this.generatedAlwaysAs = generatedAlwaysAs; this.generationOption = generationOption; @@ -517,6 +523,11 @@ public class DefaultDataType extends AbstractDataTypeX { return nullability; } + @Override + public final boolean hidden() { + return hidden; + } + @Override public final boolean readonly() { return readonly; @@ -597,7 +608,7 @@ public class DefaultDataType extends AbstractDataTypeX { // ... and then, set them back to the original value // [#2710] TODO: Remove this logic along with cached data types - return dataType.construct(precision, scale, length, nullability, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); + return dataType.construct(precision, scale, length, nullability, hidden, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); } // If this is already the dialect's specific data type, return this diff --git a/jOOQ/src/main/java/org/jooq/impl/DomainDataType.java b/jOOQ/src/main/java/org/jooq/impl/DomainDataType.java index fe857a9a8a..b9362b018a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DomainDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DomainDataType.java @@ -71,6 +71,7 @@ final class DomainDataType extends DefaultDataType { baseType.scaleDefined() ? baseType.scale() : null, baseType.lengthDefined() ? baseType.length() : null, baseType.nullability(), + baseType.hidden(), baseType.readonly(), baseType.generatedAlwaysAsGenerator(), baseType.generationOption(), @@ -91,6 +92,7 @@ final class DomainDataType extends DefaultDataType { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -107,6 +109,7 @@ final class DomainDataType extends DefaultDataType { newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java index 5b9ab9e776..332c7ba11e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java +++ b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java @@ -358,6 +358,7 @@ final class InformationSchemaExport { ic.setColumnDefault(DSL.using(configuration).render(type.defaultValue())); ic.setIsNullable(type.nullable()); ic.setOrdinalPosition(i + 1); + ic.setHidden(type.hidden()); ic.setReadonly(type.readonly()); if (type.computed()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java index 3ec5c405f2..c7f745b8f9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaMetaImpl.java @@ -232,7 +232,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { InformationSchemaDomain id = new InformationSchemaDomain( schema, name(d.getDomainName()), - (DataType) type(d.getDataType(), length, precision, scale, nullable, false, null, null), + (DataType) type(d.getDataType(), length, precision, scale, nullable, false, false, null, null), checks.toArray(EMPTY_CHECK) ); domains.add(id); @@ -305,6 +305,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { int precision = xc.getNumericPrecision() == null ? 0 : xc.getNumericPrecision(); int scale = xc.getNumericScale() == null ? 0 : xc.getNumericScale(); boolean nullable = !FALSE.equals(xc.isIsNullable()); + boolean hidden = TRUE.equals(xc.isHidden()); boolean readonly = TRUE.equals(xc.isReadonly()); Field generatedAlwaysAs = TRUE.equals(xc.isIsGenerated()) ? DSL.field(xc.getGenerationExpression()) @@ -328,7 +329,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { AbstractTable.createField( name(xc.getColumnName()), - type(typeName, length, precision, scale, nullable, readonly, generatedAlwaysAs, generationOption), + type(typeName, length, precision, scale, nullable, hidden, readonly, generatedAlwaysAs, generationOption), table, xc.getComment() ); @@ -547,7 +548,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { InformationSchemaSequence is = new InformationSchemaSequence( xs.getSequenceName(), schema, - type(typeName, length, precision, scale, nullable, false, null, null), + type(typeName, length, precision, scale, nullable, false, false, null, null), startWith, incrementBy, minvalue, @@ -644,6 +645,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { int precision, int scale, boolean nullable, + boolean hidden, boolean readonly, Field generatedAlwaysAs, GenerationOption generationOption @@ -653,6 +655,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { try { type = DefaultDataType.getDataType(configuration.family(), typeName); type = type.nullable(nullable); + type = type.hidden(hidden); type = type.readonly(readonly); if (length != 0) diff --git a/jOOQ/src/main/java/org/jooq/impl/LegacyConvertedDataType.java b/jOOQ/src/main/java/org/jooq/impl/LegacyConvertedDataType.java index bb7f3ed6fc..03f9112eb9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LegacyConvertedDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/LegacyConvertedDataType.java @@ -89,6 +89,7 @@ final class LegacyConvertedDataType extends DefaultDataType { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -104,6 +105,7 @@ final class LegacyConvertedDataType extends DefaultDataType { newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/impl/MultisetDataType.java b/jOOQ/src/main/java/org/jooq/impl/MultisetDataType.java index d330152747..c8124c0eec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MultisetDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/MultisetDataType.java @@ -87,6 +87,7 @@ final class MultisetDataType extends DefaultDataType Integer scale, Integer length, Nullability nullability, + boolean hidden, boolean readonly, Generator> generatedAlwaysAs, GenerationOption generationOption, @@ -96,7 +97,7 @@ final class MultisetDataType extends DefaultDataType boolean identity, Field> defaultValue ) { - super(t, precision, scale, length, nullability, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); + super(t, precision, scale, length, nullability, hidden, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); this.row = row; this.recordType = recordType; @@ -109,6 +110,7 @@ final class MultisetDataType extends DefaultDataType Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator> newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -126,6 +128,7 @@ final class MultisetDataType extends DefaultDataType newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index f19e9d5551..9c214c28c8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -4562,6 +4562,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { List indexes = new ArrayList<>(); boolean primary = false; boolean identity = false; + boolean hidden = false; boolean readonly = false; boolean ctas = false; @@ -4641,6 +4642,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { constraints, primary, identity, + hidden, readonly ); @@ -4864,7 +4866,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { return storageStep; } - private static final record ParseInlineConstraints(DataType type, Comment fieldComment, boolean primary, boolean identity, boolean readonly) {} + private static final record ParseInlineConstraints(DataType type, Comment fieldComment, boolean primary, boolean identity, boolean hidden, boolean readonly) {} private final ParseInlineConstraints parseInlineConstraints( Name fieldName, @@ -4872,6 +4874,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { List constraints, boolean primary, boolean identity, + boolean hidden, boolean readonly ) { boolean nullable = false; @@ -4886,6 +4889,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { Comment fieldComment = null; identity |= type.identity(); + hidden |= type.hidden(); readonly |= type.readonly(); for (;;) { @@ -4918,6 +4922,13 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { identity = true; continue; } + else if (parseKeywordIf("VISIBLE")) { + continue; + } + else if (parseKeywordIf("HIDDEN", "INVISIBLE")) { + type = type.hidden(true); + continue; + } else if (!ignoreProEdition() && parseKeywordIf("READONLY") && requireProEdition()) { @@ -5095,7 +5106,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { break; } - return new ParseInlineConstraints(type, fieldComment, primary, identity, readonly); + return new ParseInlineConstraints(type, fieldComment, primary, identity, hidden, readonly); } @@ -5702,7 +5713,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { int p = list == null ? -1 : list.size(); - ParseInlineConstraints inline = parseInlineConstraints(fieldName, type, list, false, false, false); + ParseInlineConstraints inline = parseInlineConstraints(fieldName, type, list, false, false, false, false); Field result = field(fieldName, inline.type, inline.fieldComment); if (list != null) diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordDataType.java b/jOOQ/src/main/java/org/jooq/impl/RecordDataType.java index e452e82d3f..62af955ca5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordDataType.java @@ -94,6 +94,7 @@ final class RecordDataType extends DefaultDataType { Integer scale, Integer length, Nullability nullability, + boolean hidden, boolean readonly, Generator generatedAlwaysAs, GenerationOption generationOption, @@ -103,7 +104,7 @@ final class RecordDataType extends DefaultDataType { boolean identity, Field defaultValue ) { - super(t, precision, scale, length, nullability, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); + super(t, precision, scale, length, nullability, hidden, readonly, generatedAlwaysAs, generationOption, generationLocation, collation, characterSet, identity, defaultValue); this.row = row; } @@ -115,6 +116,7 @@ final class RecordDataType extends DefaultDataType { Integer newScale, Integer newLength, Nullability newNullability, + boolean newHidden, boolean newReadonly, Generator newGeneratedAlwaysAs, GenerationOption newGenerationOption, @@ -131,6 +133,7 @@ final class RecordDataType extends DefaultDataType { newScale, newLength, newNullability, + newHidden, newReadonly, newGeneratedAlwaysAs, newGenerationOption, diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java index 541cb478d1..d1e46a39ff 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java @@ -42,7 +42,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Catalog implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "catalog_name") @XmlJavaTypeAdapter(StringAdapter.class) protected String catalogName; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java index d83d27f345..42e9abfd48 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java @@ -44,7 +44,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class CheckConstraint implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "constraint_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String constraintCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java index 3abe0ad78c..f9b4d71c39 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java @@ -41,6 +41,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="is_nullable" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="column_default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="hidden" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="readonly" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="is_generated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="generation_expression" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> @@ -63,7 +64,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Column implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "table_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String tableCatalog; @@ -115,6 +116,7 @@ public class Column implements Serializable, XMLAppendable protected String columnDefault; @XmlJavaTypeAdapter(StringAdapter.class) protected String comment; + protected Boolean hidden; protected Boolean readonly; @XmlElement(name = "is_generated") protected Boolean isGenerated; @@ -293,6 +295,30 @@ public class Column implements Serializable, XMLAppendable this.comment = value; } + /** + * Gets the value of the hidden property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isHidden() { + return hidden; + } + + /** + * Sets the value of the hidden property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setHidden(Boolean value) { + this.hidden = value; + } + /** * Gets the value of the readonly property. * @@ -452,6 +478,11 @@ public class Column implements Serializable, XMLAppendable return this; } + public Column withHidden(Boolean value) { + setHidden(value); + return this; + } + public Column withReadonly(Boolean value) { setReadonly(value); return this; @@ -493,6 +524,7 @@ public class Column implements Serializable, XMLAppendable builder.append("is_nullable", isNullable); builder.append("column_default", columnDefault); builder.append("comment", comment); + builder.append("hidden", hidden); builder.append("readonly", readonly); builder.append("is_generated", isGenerated); builder.append("generation_expression", generationExpression); @@ -689,6 +721,15 @@ public class Column implements Serializable, XMLAppendable return false; } } + if (hidden == null) { + if (other.hidden!= null) { + return false; + } + } else { + if (!hidden.equals(other.hidden)) { + return false; + } + } if (readonly == null) { if (other.readonly!= null) { return false; @@ -751,6 +792,7 @@ public class Column implements Serializable, XMLAppendable result = ((prime*result)+((isNullable == null)? 0 :isNullable.hashCode())); result = ((prime*result)+((columnDefault == null)? 0 :columnDefault.hashCode())); result = ((prime*result)+((comment == null)? 0 :comment.hashCode())); + result = ((prime*result)+((hidden == null)? 0 :hidden.hashCode())); result = ((prime*result)+((readonly == null)? 0 :readonly.hashCode())); result = ((prime*result)+((isGenerated == null)? 0 :isGenerated.hashCode())); result = ((prime*result)+((generationExpression == null)? 0 :generationExpression.hashCode())); diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java index 0165bc1384..e0741106ca 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java @@ -48,7 +48,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Domain implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "domain_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String domainCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java index f879a8534b..a6dfaf32cf 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java @@ -46,7 +46,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class DomainConstraint implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "constraint_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String constraintCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java index 962dc90e7f..1da050b165 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java @@ -51,7 +51,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class ElementType implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "object_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String objectCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java index 6fa4fc6249..6c5f6cf558 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java @@ -48,7 +48,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Index implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "index_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String indexCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java index 6da77d1102..f5507e612e 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java @@ -49,7 +49,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class IndexColumnUsage implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "index_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String indexCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java index d6bd09ad97..f83f5cf369 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java @@ -25,24 +25,24 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> - * <element name="catalogs" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Catalogs" minOccurs="0"/> - * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Schemata" minOccurs="0"/> - * <element name="sequences" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Sequences" minOccurs="0"/> - * <element name="tables" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Tables" minOccurs="0"/> - * <element name="views" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Views" minOccurs="0"/> - * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Columns" minOccurs="0"/> - * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TableConstraints" minOccurs="0"/> - * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}KeyColumnUsages" minOccurs="0"/> - * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}ReferentialConstraints" minOccurs="0"/> - * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}CheckConstraints" minOccurs="0"/> - * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Domains" minOccurs="0"/> - * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}DomainConstraints" minOccurs="0"/> - * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Indexes" minOccurs="0"/> - * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}IndexColumnUsages" minOccurs="0"/> - * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Routines" minOccurs="0"/> - * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Parameters" minOccurs="0"/> - * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}ElementTypes" minOccurs="0"/> - * <element name="triggers" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}Triggers" minOccurs="0"/> + * <element name="catalogs" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Catalogs" minOccurs="0"/> + * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Schemata" minOccurs="0"/> + * <element name="sequences" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Sequences" minOccurs="0"/> + * <element name="tables" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Tables" minOccurs="0"/> + * <element name="views" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Views" minOccurs="0"/> + * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Columns" minOccurs="0"/> + * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TableConstraints" minOccurs="0"/> + * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}KeyColumnUsages" minOccurs="0"/> + * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}ReferentialConstraints" minOccurs="0"/> + * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}CheckConstraints" minOccurs="0"/> + * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Domains" minOccurs="0"/> + * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}DomainConstraints" minOccurs="0"/> + * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Indexes" minOccurs="0"/> + * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}IndexColumnUsages" minOccurs="0"/> + * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Routines" minOccurs="0"/> + * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Parameters" minOccurs="0"/> + * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}ElementTypes" minOccurs="0"/> + * <element name="triggers" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}Triggers" minOccurs="0"/> * </all> * </restriction> * </complexContent> @@ -62,7 +62,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class InformationSchema implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElementWrapper(name = "catalogs") @XmlElement(name = "catalog") protected List catalogs; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java index 5d1136b992..a65e0182df 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java @@ -49,7 +49,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class KeyColumnUsage implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "column_name", required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String columnName; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java index 89519ad422..c2cf2488e1 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="specific_package" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="specific_name" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="ordinal_position" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="parameter_mode" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}ParameterMode"/> + * <element name="parameter_mode" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}ParameterMode"/> * <element name="parameter_name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="data_type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="character_maximum_length" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> @@ -57,7 +57,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Parameter implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "specific_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String specificCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java index 759fecd521..c402b60465 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java @@ -46,7 +46,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class ReferentialConstraint implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "constraint_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String constraintCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java index 3fd479d2e3..bd11346bc5 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java @@ -31,7 +31,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="routine_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="routine_package" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="routine_name" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="routine_type" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}RoutineType"/> + * <element name="routine_type" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}RoutineType"/> * <element name="data_type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="character_maximum_length" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> * <element name="numeric_precision" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> @@ -58,7 +58,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Routine implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "specific_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String specificCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java index 0fd09d06aa..d49ddb3667 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java @@ -43,7 +43,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Schema implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "catalog_name") @XmlJavaTypeAdapter(StringAdapter.class) protected String catalogName; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java index 63244b6373..64b8959826 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java @@ -55,7 +55,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Sequence implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "sequence_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String sequenceCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java index 7fcebfb838..0314dfbfb9 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java @@ -26,7 +26,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="table_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="table_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="table_name" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="table_type" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TableType" minOccurs="0"/> + * <element name="table_type" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TableType" minOccurs="0"/> * <element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </all> * </restriction> @@ -46,7 +46,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Table implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "table_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String tableCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java index 950e265501..c0133efeeb 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java @@ -26,7 +26,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="constraint_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="constraint_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="constraint_name" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="constraint_type" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TableConstraintType"/> + * <element name="constraint_type" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TableConstraintType"/> * <element name="table_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="table_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="table_name" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -50,7 +50,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class TableConstraint implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "constraint_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String constraintCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Trigger.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Trigger.java index cd3115de95..4075be9343 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Trigger.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Trigger.java @@ -26,15 +26,15 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <element name="trigger_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="trigger_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="trigger_name" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="event_manipulation" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TriggerEventManipulation"/> + * <element name="event_manipulation" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TriggerEventManipulation"/> * <element name="event_object_catalog" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="event_object_schema" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="event_object_table" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="action_order" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> * <element name="action_condition" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="action_statement" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="action_orientation" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TriggerActionOrientation"/> - * <element name="action_timing" type="{http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd}TriggerActionTiming"/> + * <element name="action_orientation" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TriggerActionOrientation"/> + * <element name="action_timing" type="{http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd}TriggerActionTiming"/> * <element name="action_reference_old_table" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="action_reference_new_table" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="action_reference_old_row" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> @@ -57,7 +57,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Trigger implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "trigger_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String triggerCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java index 89a433b78d..dea5eda1fd 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java @@ -44,7 +44,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class View implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31900L; + private final static long serialVersionUID = 32000L; @XmlElement(name = "table_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String tableCatalog; diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java index e8991333ca..b17d4ae118 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java @@ -1,2 +1,2 @@ -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.19.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.20.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jooq.util.xml.jaxb; diff --git a/jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.19.0.xsd b/jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.20.0.xsd similarity index 99% rename from jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.19.0.xsd rename to jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.20.0.xsd index fc80452a71..30ab217a58 100644 --- a/jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.19.0.xsd +++ b/jOOQ/src/main/resources/org/jooq/xsd/jooq-meta-3.20.0.xsd @@ -1,7 +1,7 @@ @@ -84,6 +84,7 @@ +