From e06f06edb76f926c4e36573f6d65e50ce45a7c4e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 4 Nov 2021 10:51:34 +0100 Subject: [PATCH] [jOOQ/jOOQ#9864] Added READONLY support in InformationSchema --- .../java/org/jooq/codegen/XMLGenerator.java | 1 + .../java/org/jooq/meta/ColumnDefinition.java | 5 +++ .../jooq/meta/DefaultColumnDefinition.java | 5 +++ .../org/jooq/meta/xml/XMLTableDefinition.java | 2 + .../jooq/impl/InformationSchemaExport.java | 1 + .../jooq/impl/InformationSchemaMetaImpl.java | 14 +++--- .../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 | 36 +++++++-------- .../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/View.java | 2 +- .../org/jooq/util/xml/jaxb/package-info.java | 2 +- ...q-meta-3.14.0.xsd => jooq-meta-3.16.0.xsd} | 5 ++- 26 files changed, 108 insertions(+), 47 deletions(-) rename jOOQ/src/main/resources/xsd/{jooq-meta-3.14.0.xsd => jooq-meta-3.16.0.xsd} (99%) 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 daea7e9b77..c4718a21ec 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java @@ -195,6 +195,7 @@ public class XMLGenerator extends AbstractGenerator { column.setNumericPrecision(type.getPrecision()); column.setNumericScale(type.getScale()); column.setOrdinalPosition(co.getPosition()); + column.setReadonly(co.isReadonly()); is.getColumns().add(column); } 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 1dd11b0b1f..71bb7b8bf7 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 id = new InformationSchemaDomain( schema, name(d.getDomainName()), - (DataType) type(d.getDataType(), length, precision, scale, nullable), + (DataType) type(d.getDataType(), length, precision, scale, nullable, false), checks.toArray(EMPTY_CHECK) ); domains.add(id); @@ -272,7 +274,8 @@ final class InformationSchemaMetaImpl extends AbstractMeta { int length = xc.getCharacterMaximumLength() == null ? 0 : xc.getCharacterMaximumLength(); int precision = xc.getNumericPrecision() == null ? 0 : xc.getNumericPrecision(); int scale = xc.getNumericScale() == null ? 0 : xc.getNumericScale(); - boolean nullable = xc.isIsNullable() == null || xc.isIsNullable(); + boolean nullable = !FALSE.equals(xc.isIsNullable()); + boolean readonly = TRUE.equals(xc.isReadonly()); // TODO: Exception handling should be moved inside SQLDataType Name tableName = name(xc.getTableCatalog(), xc.getTableSchema(), xc.getTableName()); @@ -285,7 +288,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { AbstractTable.createField( name(xc.getColumnName()), - type(typeName, length, precision, scale, nullable), + type(typeName, length, precision, scale, nullable, readonly), table, xc.getComment() ); @@ -504,7 +507,7 @@ final class InformationSchemaMetaImpl extends AbstractMeta { InformationSchemaSequence is = new InformationSchemaSequence( xs.getSequenceName(), schema, - type(typeName, length, precision, scale, nullable), + type(typeName, length, precision, scale, nullable, false), startWith, incrementBy, minvalue, @@ -538,12 +541,13 @@ final class InformationSchemaMetaImpl extends AbstractMeta { lookup.computeIfAbsent(key, k -> new ArrayList<>()).add(value); } - private final DataType type(String typeName, int length, int precision, int scale, boolean nullable) { + private final DataType type(String typeName, int length, int precision, int scale, boolean nullable, boolean readonly) { DataType type = null; try { type = DefaultDataType.getDataType(configuration.family(), typeName); type = type.nullable(nullable); + type = type.readonly(readonly); if (length != 0) type = type.length(length); 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 171f41c508..b47c6fbe6c 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 0d4f129d8d..55ac178ea7 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 700e6ef04c..b2f07c3cf8 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="readonly" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </all> * </restriction> * </complexContent> @@ -59,7 +60,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class Column implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31400L; + private final static long serialVersionUID = 31600L; @XmlElement(name = "table_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String tableCatalog; @@ -111,6 +112,7 @@ public class Column implements Serializable, XMLAppendable protected String columnDefault; @XmlJavaTypeAdapter(StringAdapter.class) protected String comment; + protected Boolean readonly; public String getTableCatalog() { return tableCatalog; @@ -280,6 +282,30 @@ public class Column implements Serializable, XMLAppendable this.comment = value; } + /** + * Gets the value of the readonly property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isReadonly() { + return readonly; + } + + /** + * Sets the value of the readonly property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setReadonly(Boolean value) { + this.readonly = value; + } + public Column withTableCatalog(String value) { setTableCatalog(value); return this; @@ -375,6 +401,11 @@ public class Column implements Serializable, XMLAppendable return this; } + public Column withReadonly(Boolean value) { + setReadonly(value); + return this; + } + @Override public final void appendTo(XMLBuilder builder) { builder.append("table_catalog", tableCatalog); @@ -396,6 +427,7 @@ public class Column implements Serializable, XMLAppendable builder.append("is_nullable", isNullable); builder.append("column_default", columnDefault); builder.append("comment", comment); + builder.append("readonly", readonly); } @Override @@ -588,6 +620,15 @@ public class Column implements Serializable, XMLAppendable return false; } } + if (readonly == null) { + if (other.readonly!= null) { + return false; + } + } else { + if (!readonly.equals(other.readonly)) { + return false; + } + } return true; } @@ -614,6 +655,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)+((readonly == null)? 0 :readonly.hashCode())); return result; } 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 566191ba75..02aec19cab 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 4fd004ce07..de731f1969 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 4b77f195b6..a782cc064d 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 d69f4fa3af..3fb410e974 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 3015572c9d..53c4bb1a81 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 33d2d16f56..b2c4aac214 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,23 +25,23 @@ 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.14.0.xsd}Catalogs" minOccurs="0"/> - * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Schemata" minOccurs="0"/> - * <element name="sequences" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Sequences" minOccurs="0"/> - * <element name="tables" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Tables" minOccurs="0"/> - * <element name="views" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Views" minOccurs="0"/> - * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Columns" minOccurs="0"/> - * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}TableConstraints" minOccurs="0"/> - * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}KeyColumnUsages" minOccurs="0"/> - * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ReferentialConstraints" minOccurs="0"/> - * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}CheckConstraints" minOccurs="0"/> - * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Domains" minOccurs="0"/> - * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}DomainConstraints" minOccurs="0"/> - * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Indexes" minOccurs="0"/> - * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}IndexColumnUsages" minOccurs="0"/> - * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Routines" minOccurs="0"/> - * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Parameters" minOccurs="0"/> - * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ElementTypes" minOccurs="0"/> + * <element name="catalogs" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Catalogs" minOccurs="0"/> + * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Schemata" minOccurs="0"/> + * <element name="sequences" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Sequences" minOccurs="0"/> + * <element name="tables" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Tables" minOccurs="0"/> + * <element name="views" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Views" minOccurs="0"/> + * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Columns" minOccurs="0"/> + * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}TableConstraints" minOccurs="0"/> + * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}KeyColumnUsages" minOccurs="0"/> + * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}ReferentialConstraints" minOccurs="0"/> + * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}CheckConstraints" minOccurs="0"/> + * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Domains" minOccurs="0"/> + * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}DomainConstraints" minOccurs="0"/> + * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Indexes" minOccurs="0"/> + * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}IndexColumnUsages" minOccurs="0"/> + * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Routines" minOccurs="0"/> + * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}Parameters" minOccurs="0"/> + * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd}ElementTypes" minOccurs="0"/> * </all> * </restriction> * </complexContent> @@ -61,7 +61,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class InformationSchema implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31400L; + private final static long serialVersionUID = 31600L; @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 7a02146554..a162002f47 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 @@ -48,7 +48,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; public class KeyColumnUsage implements Serializable, XMLAppendable { - private final static long serialVersionUID = 31400L; + private final static long serialVersionUID = 31600L; @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 93ac1532fd..e25965abc7 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.14.0.xsd}ParameterMode"/> + * <element name="parameter_mode" type="{http://www.jooq.org/xsd/jooq-meta-3.16.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 = 31400L; + private final static long serialVersionUID = 31600L; @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 c0ba2b7ca8..364cc6f170 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 f51764acf6..d5656d1a14 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.14.0.xsd}RoutineType"/> + * <element name="routine_type" type="{http://www.jooq.org/xsd/jooq-meta-3.16.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 = 31400L; + private final static long serialVersionUID = 31600L; @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 79aaf9a234..8c37ec0f99 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 1f5cbdd138..16957cffb8 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 4e5d6113dc..e50d25bdf5 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.14.0.xsd}TableType" minOccurs="0"/> + * <element name="table_type" type="{http://www.jooq.org/xsd/jooq-meta-3.16.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 = 31400L; + private final static long serialVersionUID = 31600L; @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 84c3e667f7..20224f7329 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.14.0.xsd}TableConstraintType"/> + * <element name="constraint_type" type="{http://www.jooq.org/xsd/jooq-meta-3.16.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 = 31400L; + private final static long serialVersionUID = 31600L; @XmlElement(name = "constraint_catalog") @XmlJavaTypeAdapter(StringAdapter.class) protected String constraintCatalog; 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 1c7f26189c..1324d81df1 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 = 31400L; + private final static long serialVersionUID = 31600L; @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 c7748aabdb..dc2bc463be 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 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jooq.util.xml.jaxb; diff --git a/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd b/jOOQ/src/main/resources/xsd/jooq-meta-3.16.0.xsd similarity index 99% rename from jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd rename to jOOQ/src/main/resources/xsd/jooq-meta-3.16.0.xsd index 4174f14dbe..e1dbbf24a9 100644 --- a/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd +++ b/jOOQ/src/main/resources/xsd/jooq-meta-3.16.0.xsd @@ -1,7 +1,7 @@ @@ -83,6 +83,7 @@ +