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

[#4096] jooq-meta-3.5.2.xsd doesn't specify the right namespaces

Browse Source
This commit is contained in:
Lukas Eder 2015-02-25 16:54:24 +01:00
parent 5a72389125
commit 38d155a0fd
5 changed files with 156 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-examples/jOOQ-vertabelo-example/src/main/resources/vertabelo-2-jooq.xsl
View File

@ -48,7 +48,7 @@
<xsl:key name="schema" match="/DatabaseModel/Tables/Table/Properties/Property[Name = 'Schema']" use="." />
<xsl:template match="/">
<information_schema xmlns="http://www.jooq.org/xsd/jooq-meta-3.5.0.xsd">
<information_schema xmlns="http://www.jooq.org/xsd/jooq-meta-3.5.4.xsd">
<schemata>
<xsl:apply-templates select="/DatabaseModel/Tables/Table/Properties/Property[Name = 'Schema'][generate-id() = generate-id(key('schema', .)[1])]" mode="schema"/>
</schemata>

2
jOOQ-meta/pom.xml
View File

@ -96,7 +96,7 @@
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
<bindingDirectory>src/main/resources/xjb/meta</bindingDirectory>
<schemaIncludes>
<include>jooq-meta-3.5.2.xsd</include>
<include>jooq-meta-3.5.4.xsd</include>
</schemaIncludes>
<generatePackage>org.jooq.util.xml.jaxb</generatePackage>
<args>

4
jOOQ-meta/src/main/resources/xjb/meta/binding.xjb
View File

@ -11,7 +11,7 @@
<jaxb:globalBindings>
<!-- Force all classes implements Serializable -->
<xjc:serializable uid="352" />
<xjc:serializable uid="354" />
<!-- [#2401] Trim unnecessary whitespace from configuration -->
<xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
@ -19,7 +19,7 @@
<!-- Annotate the following classes with @SuppressWarnings -->
<jaxb:bindings schemaLocation="../../xsd/jooq-meta-3.5.2.xsd" multiple="true" node="//xs:complexType">
<jaxb:bindings schemaLocation="../../xsd/jooq-meta-3.5.4.xsd" multiple="true" node="//xs:complexType">
<annox:annotate>
<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
</annox:annotate>

151
jOOQ-meta/src/main/resources/xsd/jooq-meta-3.5.4.xsd Normal file
View File

@ -0,0 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://www.jooq.org/xsd/jooq-meta-3.5.4.xsd"
targetNamespace="http://www.jooq.org/xsd/jooq-meta-3.5.4.xsd"
elementFormDefault="qualified">
<element name="information_schema">
<complexType>
<all>
<element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1" />
<element name="sequences" type="tns:Sequences" minOccurs="0" maxOccurs="1" />
<element name="tables" type="tns:Tables" minOccurs="0" maxOccurs="1" />
<element name="columns" type="tns:Columns" minOccurs="0" maxOccurs="1" />
<element name="table_constraints" type="tns:TableConstraints" minOccurs="0" maxOccurs="1" />
<element name="key_column_usages" type="tns:KeyColumnUsages" minOccurs="0" maxOccurs="1" />
<element name="referential_constraints" type="tns:ReferentialConstraints" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
</element>
<complexType name="Schemata">
<sequence>
<element name="schema" type="tns:Schema" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="Schema">
<all>
<element name="catalog_name" type="string" minOccurs="0" maxOccurs="1" />
<element name="schema_name" type="string" minOccurs="1" maxOccurs="1" />
</all>
</complexType>
<complexType name="Sequences">
<sequence>
<element name="sequence" type="tns:Sequence" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="Sequence">
<all>
<element name="sequence_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="sequence_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="sequence_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="data_type" type="string" minOccurs="1" maxOccurs="1" />
<element name="character_maximum_length" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_precision" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_scale" type="int" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="Tables">
<sequence>
<element name="table" type="tns:Table" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="Table">
<all>
<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" />
</all>
</complexType>
<complexType name="Columns">
<sequence>
<element name="column" type="tns:Column" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="Column">
<all>
<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="column_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="data_type" type="string" minOccurs="1" maxOccurs="1" />
<element name="character_maximum_length" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_precision" type="int" minOccurs="0" maxOccurs="1" />
<element name="numeric_scale" type="int" minOccurs="0" maxOccurs="1" />
<element name="ordinal_position" type="int" minOccurs="0" maxOccurs="1" />
<element name="identity_generation" type="string" minOccurs="0" maxOccurs="1" />
<element name="is_nullable" type="boolean" minOccurs="0" maxOccurs="1" />
<element name="column_default" type="string" minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="TableConstraints">
<sequence>
<element name="table_constraint" type="tns:TableConstraint" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="TableConstraint">
<all>
<element name="constraint_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="constraint_type" type="tns:TableConstraintType" minOccurs="1" maxOccurs="1" />
<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" />
</all>
</complexType>
<simpleType name="TableConstraintType">
<restriction base="string">
<enumeration value="PRIMARY KEY"/>
<enumeration value="UNIQUE"/>
<enumeration value="CHECK"/>
<enumeration value="FOREIGN KEY"/>
</restriction>
</simpleType>
<complexType name="KeyColumnUsages">
<sequence>
<element name="key_column_usage" type="tns:KeyColumnUsage" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="KeyColumnUsage">
<all>
<element name="column_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="constraint_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="ordinal_position" type="int" minOccurs="1" maxOccurs="1" />
<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" />
</all>
</complexType>
<complexType name="ReferentialConstraints">
<sequence>
<element name="referential_constraint" type="tns:ReferentialConstraint" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</complexType>
<complexType name="ReferentialConstraint">
<all>
<element name="constraint_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="constraint_name" type="string" minOccurs="1" maxOccurs="1" />
<element name="unique_constraint_catalog" type="string" minOccurs="0" maxOccurs="1" />
<element name="unique_constraint_schema" type="string" minOccurs="0" maxOccurs="1" />
<element name="unique_constraint_name" type="string" minOccurs="1" maxOccurs="1" />
</all>
</complexType>
</schema>

2
jOOQ/src/main/java/org/jooq/Constants.java
View File

@ -81,7 +81,7 @@ public final class Constants {
/**
* The current jooq-meta XSD file name.
*/
public static final String XSD_META = "jooq-meta-3.5.2.xsd";
public static final String XSD_META = "jooq-meta-3.5.4.xsd";
/**
* The current jooq-meta XML namespace.