From 16c5efd35474f7d522f04a72fc76bdfe316d243c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 1 Jul 2020 14:02:15 +0200 Subject: [PATCH] [jOOQ/jOOQ#10336] jooq-meta.xsd shouldn't require table_type --- jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java | 4 ++-- jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 cc0a705aae..4e5d6113dc 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"/> + * <element name="table_type" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}TableType" minOccurs="0"/> * <element name="comment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </all> * </restriction> @@ -56,7 +56,7 @@ public class Table implements Serializable, XMLAppendable @XmlElement(name = "table_name", required = true) @XmlJavaTypeAdapter(StringAdapter.class) protected String tableName; - @XmlElement(name = "table_type", required = true, defaultValue = "BASE TABLE") + @XmlElement(name = "table_type", defaultValue = "BASE TABLE") @XmlSchemaType(name = "string") protected TableType tableType = TableType.BASE_TABLE; @XmlJavaTypeAdapter(StringAdapter.class) diff --git a/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd b/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd index 89c2657c19..4174f14dbe 100644 --- a/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd +++ b/jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd @@ -344,7 +344,7 @@ - +