diff --git a/jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode b/jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode index 9b6ad9cac1..24b225d29e 100644 --- a/jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode +++ b/jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode @@ -1,7 +1,7 @@ - + diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java index fdcf14dec1..74778bb355 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/Configuration.java @@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> - * <element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Logging" minOccurs="0"/> - * <element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Jdbc" minOccurs="0"/> - * <element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}Generator"/> + * <element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Logging" minOccurs="0"/> + * <element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Jdbc" minOccurs="0"/> + * <element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}Generator"/> * </all> * </restriction> * </complexContent> diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MatcherRule.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MatcherRule.java index c74c1d857e..31f5bff37f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MatcherRule.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/MatcherRule.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.StringAdapter; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> - * <element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.10.0.xsd}MatcherTransformType" minOccurs="0"/> + * <element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.11.0.xsd}MatcherTransformType" minOccurs="0"/> * <element name="expression" type="{http://www.w3.org/2001/XMLSchema}string"/> * </all> * </restriction> diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java index baccf8e836..355bee18fd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jaxb/package-info.java @@ -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; diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd index aeb372e1d4..a8b0ceea44 100644 --- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd +++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd @@ -1,8 +1,8 @@ diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.11.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.11.0.xsd new file mode 100644 index 0000000000..7f4f2ee0f4 --- /dev/null +++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.11.0.xsd @@ -0,0 +1,1073 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JPADatabase, XMLDatabase, or DDLDatabase, or to pass to JDBC drivers.]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.util.[database].[database]Database. +

+Natively supported values are: +

    +
  • {@link org.jooq.util.ase.ASEDatabase}
    • +
  • {@link org.jooq.util.cubrid.CUBRIDDatabase}
    • +
  • {@link org.jooq.util.db2.DB2Database}
    • +
  • {@link org.jooq.util.derby.DerbyDatabase}
    • +
  • {@link org.jooq.util.firebird.FirebirdDatabase}
    • +
  • {@link org.jooq.util.h2.H2Database}
    • +
  • {@link org.jooq.util.hana.HanaDatabase}
    • +
  • {@link org.jooq.util.hsqldb.HSQLDBDatabase}
    • +
  • {@link org.jooq.util.informix.InformixDatabase}
    • +
  • {@link org.jooq.util.ingres.IngresDatabase}
    • +
  • {@link org.jooq.util.mariadb.MariaDBDatabase}
    • +
  • {@link org.jooq.util.mysql.MySQLDatabase}
    • +
  • {@link org.jooq.util.oracle.OracleDatabase}
    • +
  • {@link org.jooq.util.postgres.PostgresDatabase}
    • +
  • {@link org.jooq.util.redshift.RedshiftDatabase}
    • +
  • {@link org.jooq.util.sqlite.SQLiteDatabase}
    • +
  • {@link org.jooq.util.sqlserver.SQLServerDatabase}
    • +
  • {@link org.jooq.util.sybase.SybaseDatabase}
    • +
  • {@link org.jooq.util.vertica.VerticaDatabase}
    • +
+

+This value can be used to reverse-engineer generic JDBC DatabaseMetaData (e.g. for MS Access). +

    +
  • {@link org.jooq.util.jdbc.JDBCDatabase}
    • +
+

+This value can be used to reverse-engineer standard jOOQ-meta XML formats. +

    +
  • {@link org.jooq.util.xml.XMLDatabase}
    • +
+

+This value can be used to reverse-engineer JPA annotated entities +

    +
  • {@link org.jooq.util.jpa.JPADatabase}
    • +
+

+You can also provide your own org.jooq.util.Database implementation +here, if your database is currently not supported]]> + + + + +Known supported properties include: +

+

    +
  • {@link org.jooq.util.xml.XMLDatabase}

    +

    dialect=ORACLE
+xml-file=C:\path\to\database.xml
+xsl-files=C:\path\to\1.xsl,C:\path\to\2.xsl
    • +
  • {@link org.jooq.util.jpa.JPADatabase}

    +

    packages=com.example.entities
    • +
  • {@link org.jooq.util.ddl.DDLDatabase}

    +

    scripts=C:\path\to\database.sql
+encoding=UTF-8
    • +
]]> + + + + +The default value is "COMMENTS CASE_INSENSITIVE"]]> + + + + +This is a Java regular expression. Use the pipe to separate several expressions. +Watch out for case-sensitivity. Depending on your database, this might be +important! +

+You can create case-insensitive regular expressions +using this syntax: (?i:expr) +

+Whitespace is ignored and comments are possible unless overridden in {@link #getRegexFlags()}.]]> + + + + +This is a Java regular expression. Use the pipe to separate several expressions. +Excludes match before includes, i.e. excludes have a higher priority.]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +This is a Java regular expression. Use the pipe to separate several expressions. +See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.]]> + + + + +This is a Java regular expression. Use the pipe to separate several expressions. +See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.]]> + + + + +To be used if columns are not detected as automatically as identities.]]> + + + + +To be used with: +

    +
  • {@link org.jooq.UpdatableRecord.store()}
    • +
  • {@link org.jooq.UpdatableRecord.update()}
    • +
  • {@link org.jooq.UpdatableRecord.delete()}
    • +
  • {@link org.jooq.UpdatableRecord.refresh()}
    • +
+

+Synthetic primary keys will override existing primary keys.]]> + + + + +To be used with: +

    +
  • {@link org.jooq.UpdatableRecord.store()}
    • +
  • {@link org.jooq.UpdatableRecord.update()}
    • +
  • {@link org.jooq.UpdatableRecord.delete()}
    • +
  • {@link org.jooq.UpdatableRecord.refresh()}
    • +
+

+If several keys match, a warning is emitted and the first one encountered will be used. +

+This flag will also replace synthetic primary keys, if it matches.]]> + + + + + + + + +In jOOQ 3.6.0, #4106 was implemented to support Transact-SQL's +optional return values from stored procedures. This turns all procedures +into Routine (instead of Routine). For backwards- +compatibility reasons, users can suppress this change in jOOQ 3.x +

+@deprecated This feature is deprecated as of jOOQ 3.6.0 and will be removed again in +jOOQ 4.0.]]> + + + + + + + + +This cannot be combined with the {@link #getCatalogs()} configuration element. +If left empty (and without any {@link #getCatalogs()} configuration element), jOOQ will generate all available catalogs.]]> + + + + +Use this to override your local development +catalog name for source code generation. If not specified, this +will be the same as {@link #getInputCatalog()} +

+This will be ignored if {@link #isOutputCatalogToDefault()} is set to true]]> + + + + + + + + +This cannot be combined with the {@link #getSchemata()} configuration element. +If left empty (and without any {@link #getSchemata()} configuration element), jOOQ will generate all available schemata.]]> + + + + +Use this to override your local development +schema name for source code generation. If not specified, this +will be the same as {@link #getInputSchema()}. + +This will be ignored if {@link #isOutputSchemaToDefault()} is set to true]]> + + + + + + + + +This configuration element cannot be used at the same time as the {@link #getSchemata()} configuration element.]]> + + + + +Using this configuration element in an enviroment that supports multiple +catalogs means that all catalogs are generated. +

+This configuration element cannot be used at the same time as the {@link #getCatalogs()} configuration element.]]> + + + + +There are three operation modes for this element: +

    +
  • The value is a class that can be found on the classpath and that implements + {@link org.jooq.util.SchemaVersionProvider}. Such classes must provide a default constructor
    • +
  • The value is a SELECT statement that returns one record with one column. The + SELECT statement may contain a named variable called :schema_name
    • +
  • The value is a constant, such as a Maven property
    • +
+

+Schema versions will be generated into the {@link javax.annotation.Generated} annotation on +generated artefacts.]]> + + + + +There are three operation modes for this element: +

    +
  • The value is a class that can be found on the classpath and that implements + {@link org.jooq.util.CatalogVersionProvider}. Such classes must provide a default constructor
    • +
  • The value is a SELECT statement that returns one record with one column. The + SELECT statement may contain a named variable called :catalog_name
    • +
  • The value is a constant, such as a Maven property
    • +

    +Catalog versions will be generated into the {@link javax.annotation.Generated} annotation on +generated artefacts.]]> + + + + +This comparator can be used to influence the order of any object that is produced by jOOQ meta, and thus, indirectly, the order of declared objects in generated code.]]> + + + + + + + + + + + + + + + + +If this is deactivated, such functions are not generated as tables, but +as ordinary routines. This is particularly useful for backwards- +compatibility between jOOQ 3.8 and previous versions, when using TABLE +and VARRAY types in Oracle. +

    +While this flag defaults to true for most databases, it defaults to false +for Oracle.]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +If provided, {@link #getName()} will be ignored, and either {@link #getConverter()} +or {@link #getBinding()} is required]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +If this flag is set to false, then: +

    +

      +
    • Column name : X_INDEX
      • +
    • Attribute name: xIndex
      • +
    • Getter name : getXIndex()
      • +
    • Setter name : setXIndex()
      • +
    +

    +If this flag is set to true, then: +

      +
    • Getter name : getxIndex()
      • +
    • Setter name : setxIndex()
      • +
    +

    +Custom GeneratorStrategy implementations are unaffected]]> + + + + +This may lead to compilation warnings in current Java versions.]]> + + + + +This can be useful if you have a database object that generates a String +class, and you want to avoid naming clashes with the java.lang package +by specifying java\.lang\..*]]> + + + + configurations) should still be generated.]]> + + + + configurations) should still be generated.]]> + + + + +This flag is ignored in the commercial Java 6 distribution of jOOQ 3.9+ ]]> + + + + + + + + + + + + + +jOOQ may append the schema name to this package if generating multiple schemas, +e.g. org.jooq.generated.schema1, org.jooq.generated.schema2]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 6ca2f80ae2..7e8ed10cef 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -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.