github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10336] jooq-meta.xsd shouldn't require table_type

Browse Source
This commit is contained in:
Lukas Eder 2020-07-01 14:02:15 +02:00
parent d7e98c2d3d
commit 16c5efd354
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
View File

@ -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)

2
jOOQ/src/main/resources/xsd/jooq-meta-3.14.0.xsd
View File

@ -344,7 +344,7 @@
<element name="table_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="table_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="table_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="table_type" type="tns:TableType" minOccurs="1" maxOccurs="1" default="BASE TABLE"/>
<element name="table_type" type="tns:TableType" minOccurs="0" maxOccurs="1" default="BASE TABLE"/>
<element name="comment" type="string" minOccurs="0" maxOccurs="1" />
</all>
</complexType>