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

[#6124] This feature can be opted into using a new flag <primaryKeyTypes/>

Browse Source
This commit is contained in:
lukaseder 2017-12-21 13:07:36 +01:00
parent 34b86da52c
commit 49435e5208
7 changed files with 1082 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<bindings xmlns="http://java.sun.com/xml/ns/jaxb" if-exists="true" version="2.1">
<bindings xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd" if-exists="true" scd="x-schema::tns">
<bindings xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd" if-exists="true" scd="x-schema::tns">
<schemaBindings map="false">
<package name="org.jooq.util.jaxb"/>
</schemaBindings>

6
jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java
View File

@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;all&gt;
* &lt;element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Logging" minOccurs="0"/&gt;
* &lt;element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Jdbc" minOccurs="0"/&gt;
* &lt;element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Generator"/&gt;
* &lt;element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Logging" minOccurs="0"/&gt;
* &lt;element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Jdbc" minOccurs="0"/&gt;
* &lt;element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Generator"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;

2
jOOQ-meta/src/main/java/org/jooq/util/jaxb/MatcherRule.java
View File

@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.StringAdapter;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;all&gt;
* &lt;element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}MatcherTransformType" minOccurs="0"/&gt;
* &lt;element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}MatcherTransformType" minOccurs="0"/&gt;
* &lt;element name="expression" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;

2
jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java
View File

@ -5,5 +5,5 @@
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.jooq.util.jaxb;

4
jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd"
xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd"
xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd"
targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd"
elementFormDefault="qualified"
jxb:version="2.1">

1073
jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.11.0.xsd Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -98,7 +98,7 @@ public final class Constants {
/**
* The current jooq-codegen XSD file name.
*/
public static final String XSD_CODEGEN = "jooq-codegen-3.10.0.xsd";
public static final String XSD_CODEGEN = "jooq-codegen-3.11.0.xsd";
/**
* The current jooq-codegen XML namespace.