From cfab2b59d012f978c92fcec2d48293c738460d5e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 3 Jun 2020 12:04:43 +0200 Subject: [PATCH] [jOOQ/jOOQ#681] Restored InformationSchema element order --- .../jooq/util/xml/jaxb/InformationSchema.java | 1128 ++++++++--------- .../main/resources/xsd/jooq-meta-3.14.0.xsd | 24 +- 2 files changed, 576 insertions(+), 576 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java index 77d49bd2ec..33d2d16f56 100644 --- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java +++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java @@ -26,22 +26,22 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> * <element name="catalogs" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Catalogs" minOccurs="0"/> - * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}CheckConstraints" minOccurs="0"/> - * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Columns" minOccurs="0"/> - * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}DomainConstraints" minOccurs="0"/> - * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Domains" minOccurs="0"/> - * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ElementTypes" minOccurs="0"/> - * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}IndexColumnUsages" minOccurs="0"/> - * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Indexes" minOccurs="0"/> - * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}KeyColumnUsages" minOccurs="0"/> - * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Parameters" minOccurs="0"/> - * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ReferentialConstraints" minOccurs="0"/> - * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Routines" minOccurs="0"/> * <element name="schemata" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Schemata" minOccurs="0"/> * <element name="sequences" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Sequences" minOccurs="0"/> - * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}TableConstraints" minOccurs="0"/> * <element name="tables" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Tables" minOccurs="0"/> * <element name="views" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Views" minOccurs="0"/> + * <element name="columns" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Columns" minOccurs="0"/> + * <element name="table_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}TableConstraints" minOccurs="0"/> + * <element name="key_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}KeyColumnUsages" minOccurs="0"/> + * <element name="referential_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ReferentialConstraints" minOccurs="0"/> + * <element name="check_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}CheckConstraints" minOccurs="0"/> + * <element name="domains" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Domains" minOccurs="0"/> + * <element name="domain_constraints" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}DomainConstraints" minOccurs="0"/> + * <element name="indexes" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Indexes" minOccurs="0"/> + * <element name="index_column_usages" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}IndexColumnUsages" minOccurs="0"/> + * <element name="routines" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Routines" minOccurs="0"/> + * <element name="parameters" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}Parameters" minOccurs="0"/> + * <element name="element_types" type="{http://www.jooq.org/xsd/jooq-meta-3.14.0.xsd}ElementTypes" minOccurs="0"/> * </all> * </restriction> * </complexContent> @@ -65,54 +65,54 @@ public class InformationSchema implements Serializable, XMLAppendable @XmlElementWrapper(name = "catalogs") @XmlElement(name = "catalog") protected List catalogs; - @XmlElementWrapper(name = "check_constraints") - @XmlElement(name = "check_constraint") - protected List checkConstraints; - @XmlElementWrapper(name = "columns") - @XmlElement(name = "column") - protected List columns; - @XmlElementWrapper(name = "domain_constraints") - @XmlElement(name = "domainConstraint") - protected List domainConstraints; - @XmlElementWrapper(name = "domains") - @XmlElement(name = "domain") - protected List domains; - @XmlElementWrapper(name = "element_types") - @XmlElement(name = "element_type") - protected List elementTypes; - @XmlElementWrapper(name = "index_column_usages") - @XmlElement(name = "index_column_usage") - protected List indexColumnUsages; - @XmlElementWrapper(name = "indexes") - @XmlElement(name = "index") - protected List indexes; - @XmlElementWrapper(name = "key_column_usages") - @XmlElement(name = "key_column_usage") - protected List keyColumnUsages; - @XmlElementWrapper(name = "parameters") - @XmlElement(name = "parameter") - protected List parameters; - @XmlElementWrapper(name = "referential_constraints") - @XmlElement(name = "referential_constraint") - protected List referentialConstraints; - @XmlElementWrapper(name = "routines") - @XmlElement(name = "routine") - protected List routines; @XmlElementWrapper(name = "schemata") @XmlElement(name = "schema") protected List schemata; @XmlElementWrapper(name = "sequences") @XmlElement(name = "sequence") protected List sequences; - @XmlElementWrapper(name = "table_constraints") - @XmlElement(name = "table_constraint") - protected List tableConstraints; @XmlElementWrapper(name = "tables") @XmlElement(name = "table") protected List tables; @XmlElementWrapper(name = "views") @XmlElement(name = "view") protected List views; + @XmlElementWrapper(name = "columns") + @XmlElement(name = "column") + protected List columns; + @XmlElementWrapper(name = "table_constraints") + @XmlElement(name = "table_constraint") + protected List tableConstraints; + @XmlElementWrapper(name = "key_column_usages") + @XmlElement(name = "key_column_usage") + protected List keyColumnUsages; + @XmlElementWrapper(name = "referential_constraints") + @XmlElement(name = "referential_constraint") + protected List referentialConstraints; + @XmlElementWrapper(name = "check_constraints") + @XmlElement(name = "check_constraint") + protected List checkConstraints; + @XmlElementWrapper(name = "domains") + @XmlElement(name = "domain") + protected List domains; + @XmlElementWrapper(name = "domain_constraints") + @XmlElement(name = "domainConstraint") + protected List domainConstraints; + @XmlElementWrapper(name = "indexes") + @XmlElement(name = "index") + protected List indexes; + @XmlElementWrapper(name = "index_column_usages") + @XmlElement(name = "index_column_usage") + protected List indexColumnUsages; + @XmlElementWrapper(name = "routines") + @XmlElement(name = "routine") + protected List routines; + @XmlElementWrapper(name = "parameters") + @XmlElement(name = "parameter") + protected List parameters; + @XmlElementWrapper(name = "element_types") + @XmlElement(name = "element_type") + protected List elementTypes; public List getCatalogs() { if (catalogs == null) { @@ -125,127 +125,6 @@ public class InformationSchema implements Serializable, XMLAppendable this.catalogs = catalogs; } - public List getCheckConstraints() { - if (checkConstraints == null) { - checkConstraints = new ArrayList(); - } - return checkConstraints; - } - - public void setCheckConstraints(List checkConstraints) { - this.checkConstraints = checkConstraints; - } - - public List getColumns() { - if (columns == null) { - columns = new ArrayList(); - } - return columns; - } - - public void setColumns(List columns) { - this.columns = columns; - } - - public List getDomainConstraints() { - if (domainConstraints == null) { - domainConstraints = new ArrayList(); - } - return domainConstraints; - } - - public void setDomainConstraints(List domainConstraints) { - this.domainConstraints = domainConstraints; - } - - public List getDomains() { - if (domains == null) { - domains = new ArrayList(); - } - return domains; - } - - public void setDomains(List domains) { - this.domains = domains; - } - - public List getElementTypes() { - if (elementTypes == null) { - elementTypes = new ArrayList(); - } - return elementTypes; - } - - public void setElementTypes(List elementTypes) { - this.elementTypes = elementTypes; - } - - public List getIndexColumnUsages() { - if (indexColumnUsages == null) { - indexColumnUsages = new ArrayList(); - } - return indexColumnUsages; - } - - public void setIndexColumnUsages(List indexColumnUsages) { - this.indexColumnUsages = indexColumnUsages; - } - - public List getIndexes() { - if (indexes == null) { - indexes = new ArrayList(); - } - return indexes; - } - - public void setIndexes(List indexes) { - this.indexes = indexes; - } - - public List getKeyColumnUsages() { - if (keyColumnUsages == null) { - keyColumnUsages = new ArrayList(); - } - return keyColumnUsages; - } - - public void setKeyColumnUsages(List keyColumnUsages) { - this.keyColumnUsages = keyColumnUsages; - } - - public List getParameters() { - if (parameters == null) { - parameters = new ArrayList(); - } - return parameters; - } - - public void setParameters(List parameters) { - this.parameters = parameters; - } - - public List getReferentialConstraints() { - if (referentialConstraints == null) { - referentialConstraints = new ArrayList(); - } - return referentialConstraints; - } - - public void setReferentialConstraints(List referentialConstraints) { - this.referentialConstraints = referentialConstraints; - } - - public List getRoutines() { - if (routines == null) { - routines = new ArrayList(); - } - return routines; - } - - public void setRoutines(List routines) { - this.routines = routines; - } - public List getSchemata() { if (schemata == null) { schemata = new ArrayList(); @@ -268,17 +147,6 @@ public class InformationSchema implements Serializable, XMLAppendable this.sequences = sequences; } - public List getTableConstraints() { - if (tableConstraints == null) { - tableConstraints = new ArrayList(); - } - return tableConstraints; - } - - public void setTableConstraints(List tableConstraints) { - this.tableConstraints = tableConstraints; - } - public List
getTables() { if (tables == null) { tables = new ArrayList
(); @@ -301,6 +169,138 @@ public class InformationSchema implements Serializable, XMLAppendable this.views = views; } + public List getColumns() { + if (columns == null) { + columns = new ArrayList(); + } + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public List getTableConstraints() { + if (tableConstraints == null) { + tableConstraints = new ArrayList(); + } + return tableConstraints; + } + + public void setTableConstraints(List tableConstraints) { + this.tableConstraints = tableConstraints; + } + + public List getKeyColumnUsages() { + if (keyColumnUsages == null) { + keyColumnUsages = new ArrayList(); + } + return keyColumnUsages; + } + + public void setKeyColumnUsages(List keyColumnUsages) { + this.keyColumnUsages = keyColumnUsages; + } + + public List getReferentialConstraints() { + if (referentialConstraints == null) { + referentialConstraints = new ArrayList(); + } + return referentialConstraints; + } + + public void setReferentialConstraints(List referentialConstraints) { + this.referentialConstraints = referentialConstraints; + } + + public List getCheckConstraints() { + if (checkConstraints == null) { + checkConstraints = new ArrayList(); + } + return checkConstraints; + } + + public void setCheckConstraints(List checkConstraints) { + this.checkConstraints = checkConstraints; + } + + public List getDomains() { + if (domains == null) { + domains = new ArrayList(); + } + return domains; + } + + public void setDomains(List domains) { + this.domains = domains; + } + + public List getDomainConstraints() { + if (domainConstraints == null) { + domainConstraints = new ArrayList(); + } + return domainConstraints; + } + + public void setDomainConstraints(List domainConstraints) { + this.domainConstraints = domainConstraints; + } + + public List getIndexes() { + if (indexes == null) { + indexes = new ArrayList(); + } + return indexes; + } + + public void setIndexes(List indexes) { + this.indexes = indexes; + } + + public List getIndexColumnUsages() { + if (indexColumnUsages == null) { + indexColumnUsages = new ArrayList(); + } + return indexColumnUsages; + } + + public void setIndexColumnUsages(List indexColumnUsages) { + this.indexColumnUsages = indexColumnUsages; + } + + public List getRoutines() { + if (routines == null) { + routines = new ArrayList(); + } + return routines; + } + + public void setRoutines(List routines) { + this.routines = routines; + } + + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); + } + return parameters; + } + + public void setParameters(List parameters) { + this.parameters = parameters; + } + + public List getElementTypes() { + if (elementTypes == null) { + elementTypes = new ArrayList(); + } + return elementTypes; + } + + public void setElementTypes(List elementTypes) { + this.elementTypes = elementTypes; + } + public InformationSchema withCatalogs(Catalog... values) { if (values!= null) { for (Catalog value: values) { @@ -322,237 +322,6 @@ public class InformationSchema implements Serializable, XMLAppendable return this; } - public InformationSchema withCheckConstraints(CheckConstraint... values) { - if (values!= null) { - for (CheckConstraint value: values) { - getCheckConstraints().add(value); - } - } - return this; - } - - public InformationSchema withCheckConstraints(Collection values) { - if (values!= null) { - getCheckConstraints().addAll(values); - } - return this; - } - - public InformationSchema withCheckConstraints(List checkConstraints) { - setCheckConstraints(checkConstraints); - return this; - } - - public InformationSchema withColumns(Column... values) { - if (values!= null) { - for (Column value: values) { - getColumns().add(value); - } - } - return this; - } - - public InformationSchema withColumns(Collection values) { - if (values!= null) { - getColumns().addAll(values); - } - return this; - } - - public InformationSchema withColumns(List columns) { - setColumns(columns); - return this; - } - - public InformationSchema withDomainConstraints(DomainConstraint... values) { - if (values!= null) { - for (DomainConstraint value: values) { - getDomainConstraints().add(value); - } - } - return this; - } - - public InformationSchema withDomainConstraints(Collection values) { - if (values!= null) { - getDomainConstraints().addAll(values); - } - return this; - } - - public InformationSchema withDomainConstraints(List domainConstraints) { - setDomainConstraints(domainConstraints); - return this; - } - - public InformationSchema withDomains(Domain... values) { - if (values!= null) { - for (Domain value: values) { - getDomains().add(value); - } - } - return this; - } - - public InformationSchema withDomains(Collection values) { - if (values!= null) { - getDomains().addAll(values); - } - return this; - } - - public InformationSchema withDomains(List domains) { - setDomains(domains); - return this; - } - - public InformationSchema withElementTypes(ElementType... values) { - if (values!= null) { - for (ElementType value: values) { - getElementTypes().add(value); - } - } - return this; - } - - public InformationSchema withElementTypes(Collection values) { - if (values!= null) { - getElementTypes().addAll(values); - } - return this; - } - - public InformationSchema withElementTypes(List elementTypes) { - setElementTypes(elementTypes); - return this; - } - - public InformationSchema withIndexColumnUsages(IndexColumnUsage... values) { - if (values!= null) { - for (IndexColumnUsage value: values) { - getIndexColumnUsages().add(value); - } - } - return this; - } - - public InformationSchema withIndexColumnUsages(Collection values) { - if (values!= null) { - getIndexColumnUsages().addAll(values); - } - return this; - } - - public InformationSchema withIndexColumnUsages(List indexColumnUsages) { - setIndexColumnUsages(indexColumnUsages); - return this; - } - - public InformationSchema withIndexes(Index... values) { - if (values!= null) { - for (Index value: values) { - getIndexes().add(value); - } - } - return this; - } - - public InformationSchema withIndexes(Collection values) { - if (values!= null) { - getIndexes().addAll(values); - } - return this; - } - - public InformationSchema withIndexes(List indexes) { - setIndexes(indexes); - return this; - } - - public InformationSchema withKeyColumnUsages(KeyColumnUsage... values) { - if (values!= null) { - for (KeyColumnUsage value: values) { - getKeyColumnUsages().add(value); - } - } - return this; - } - - public InformationSchema withKeyColumnUsages(Collection values) { - if (values!= null) { - getKeyColumnUsages().addAll(values); - } - return this; - } - - public InformationSchema withKeyColumnUsages(List keyColumnUsages) { - setKeyColumnUsages(keyColumnUsages); - return this; - } - - public InformationSchema withParameters(Parameter... values) { - if (values!= null) { - for (Parameter value: values) { - getParameters().add(value); - } - } - return this; - } - - public InformationSchema withParameters(Collection values) { - if (values!= null) { - getParameters().addAll(values); - } - return this; - } - - public InformationSchema withParameters(List parameters) { - setParameters(parameters); - return this; - } - - public InformationSchema withReferentialConstraints(ReferentialConstraint... values) { - if (values!= null) { - for (ReferentialConstraint value: values) { - getReferentialConstraints().add(value); - } - } - return this; - } - - public InformationSchema withReferentialConstraints(Collection values) { - if (values!= null) { - getReferentialConstraints().addAll(values); - } - return this; - } - - public InformationSchema withReferentialConstraints(List referentialConstraints) { - setReferentialConstraints(referentialConstraints); - return this; - } - - public InformationSchema withRoutines(Routine... values) { - if (values!= null) { - for (Routine value: values) { - getRoutines().add(value); - } - } - return this; - } - - public InformationSchema withRoutines(Collection values) { - if (values!= null) { - getRoutines().addAll(values); - } - return this; - } - - public InformationSchema withRoutines(List routines) { - setRoutines(routines); - return this; - } - public InformationSchema withSchemata(Schema... values) { if (values!= null) { for (Schema value: values) { @@ -595,27 +364,6 @@ public class InformationSchema implements Serializable, XMLAppendable return this; } - public InformationSchema withTableConstraints(TableConstraint... values) { - if (values!= null) { - for (TableConstraint value: values) { - getTableConstraints().add(value); - } - } - return this; - } - - public InformationSchema withTableConstraints(Collection values) { - if (values!= null) { - getTableConstraints().addAll(values); - } - return this; - } - - public InformationSchema withTableConstraints(List tableConstraints) { - setTableConstraints(tableConstraints); - return this; - } - public InformationSchema withTables(Table... values) { if (values!= null) { for (Table value: values) { @@ -658,25 +406,277 @@ public class InformationSchema implements Serializable, XMLAppendable return this; } + public InformationSchema withColumns(Column... values) { + if (values!= null) { + for (Column value: values) { + getColumns().add(value); + } + } + return this; + } + + public InformationSchema withColumns(Collection values) { + if (values!= null) { + getColumns().addAll(values); + } + return this; + } + + public InformationSchema withColumns(List columns) { + setColumns(columns); + return this; + } + + public InformationSchema withTableConstraints(TableConstraint... values) { + if (values!= null) { + for (TableConstraint value: values) { + getTableConstraints().add(value); + } + } + return this; + } + + public InformationSchema withTableConstraints(Collection values) { + if (values!= null) { + getTableConstraints().addAll(values); + } + return this; + } + + public InformationSchema withTableConstraints(List tableConstraints) { + setTableConstraints(tableConstraints); + return this; + } + + public InformationSchema withKeyColumnUsages(KeyColumnUsage... values) { + if (values!= null) { + for (KeyColumnUsage value: values) { + getKeyColumnUsages().add(value); + } + } + return this; + } + + public InformationSchema withKeyColumnUsages(Collection values) { + if (values!= null) { + getKeyColumnUsages().addAll(values); + } + return this; + } + + public InformationSchema withKeyColumnUsages(List keyColumnUsages) { + setKeyColumnUsages(keyColumnUsages); + return this; + } + + public InformationSchema withReferentialConstraints(ReferentialConstraint... values) { + if (values!= null) { + for (ReferentialConstraint value: values) { + getReferentialConstraints().add(value); + } + } + return this; + } + + public InformationSchema withReferentialConstraints(Collection values) { + if (values!= null) { + getReferentialConstraints().addAll(values); + } + return this; + } + + public InformationSchema withReferentialConstraints(List referentialConstraints) { + setReferentialConstraints(referentialConstraints); + return this; + } + + public InformationSchema withCheckConstraints(CheckConstraint... values) { + if (values!= null) { + for (CheckConstraint value: values) { + getCheckConstraints().add(value); + } + } + return this; + } + + public InformationSchema withCheckConstraints(Collection values) { + if (values!= null) { + getCheckConstraints().addAll(values); + } + return this; + } + + public InformationSchema withCheckConstraints(List checkConstraints) { + setCheckConstraints(checkConstraints); + return this; + } + + public InformationSchema withDomains(Domain... values) { + if (values!= null) { + for (Domain value: values) { + getDomains().add(value); + } + } + return this; + } + + public InformationSchema withDomains(Collection values) { + if (values!= null) { + getDomains().addAll(values); + } + return this; + } + + public InformationSchema withDomains(List domains) { + setDomains(domains); + return this; + } + + public InformationSchema withDomainConstraints(DomainConstraint... values) { + if (values!= null) { + for (DomainConstraint value: values) { + getDomainConstraints().add(value); + } + } + return this; + } + + public InformationSchema withDomainConstraints(Collection values) { + if (values!= null) { + getDomainConstraints().addAll(values); + } + return this; + } + + public InformationSchema withDomainConstraints(List domainConstraints) { + setDomainConstraints(domainConstraints); + return this; + } + + public InformationSchema withIndexes(Index... values) { + if (values!= null) { + for (Index value: values) { + getIndexes().add(value); + } + } + return this; + } + + public InformationSchema withIndexes(Collection values) { + if (values!= null) { + getIndexes().addAll(values); + } + return this; + } + + public InformationSchema withIndexes(List indexes) { + setIndexes(indexes); + return this; + } + + public InformationSchema withIndexColumnUsages(IndexColumnUsage... values) { + if (values!= null) { + for (IndexColumnUsage value: values) { + getIndexColumnUsages().add(value); + } + } + return this; + } + + public InformationSchema withIndexColumnUsages(Collection values) { + if (values!= null) { + getIndexColumnUsages().addAll(values); + } + return this; + } + + public InformationSchema withIndexColumnUsages(List indexColumnUsages) { + setIndexColumnUsages(indexColumnUsages); + return this; + } + + public InformationSchema withRoutines(Routine... values) { + if (values!= null) { + for (Routine value: values) { + getRoutines().add(value); + } + } + return this; + } + + public InformationSchema withRoutines(Collection values) { + if (values!= null) { + getRoutines().addAll(values); + } + return this; + } + + public InformationSchema withRoutines(List routines) { + setRoutines(routines); + return this; + } + + public InformationSchema withParameters(Parameter... values) { + if (values!= null) { + for (Parameter value: values) { + getParameters().add(value); + } + } + return this; + } + + public InformationSchema withParameters(Collection values) { + if (values!= null) { + getParameters().addAll(values); + } + return this; + } + + public InformationSchema withParameters(List parameters) { + setParameters(parameters); + return this; + } + + public InformationSchema withElementTypes(ElementType... values) { + if (values!= null) { + for (ElementType value: values) { + getElementTypes().add(value); + } + } + return this; + } + + public InformationSchema withElementTypes(Collection values) { + if (values!= null) { + getElementTypes().addAll(values); + } + return this; + } + + public InformationSchema withElementTypes(List elementTypes) { + setElementTypes(elementTypes); + return this; + } + @Override public final void appendTo(XMLBuilder builder) { builder.append("catalogs", "catalog", catalogs); - builder.append("check_constraints", "check_constraint", checkConstraints); - builder.append("columns", "column", columns); - builder.append("domain_constraints", "domainConstraint", domainConstraints); - builder.append("domains", "domain", domains); - builder.append("element_types", "element_type", elementTypes); - builder.append("index_column_usages", "index_column_usage", indexColumnUsages); - builder.append("indexes", "index", indexes); - builder.append("key_column_usages", "key_column_usage", keyColumnUsages); - builder.append("parameters", "parameter", parameters); - builder.append("referential_constraints", "referential_constraint", referentialConstraints); - builder.append("routines", "routine", routines); builder.append("schemata", "schema", schemata); builder.append("sequences", "sequence", sequences); - builder.append("table_constraints", "table_constraint", tableConstraints); builder.append("tables", "table", tables); builder.append("views", "view", views); + builder.append("columns", "column", columns); + builder.append("table_constraints", "table_constraint", tableConstraints); + builder.append("key_column_usages", "key_column_usage", keyColumnUsages); + builder.append("referential_constraints", "referential_constraint", referentialConstraints); + builder.append("check_constraints", "check_constraint", checkConstraints); + builder.append("domains", "domain", domains); + builder.append("domain_constraints", "domainConstraint", domainConstraints); + builder.append("indexes", "index", indexes); + builder.append("index_column_usages", "index_column_usage", indexColumnUsages); + builder.append("routines", "routine", routines); + builder.append("parameters", "parameter", parameters); + builder.append("element_types", "element_type", elementTypes); } @Override @@ -707,105 +707,6 @@ public class InformationSchema implements Serializable, XMLAppendable return false; } } - if (checkConstraints == null) { - if (other.checkConstraints!= null) { - return false; - } - } else { - if (!checkConstraints.equals(other.checkConstraints)) { - return false; - } - } - if (columns == null) { - if (other.columns!= null) { - return false; - } - } else { - if (!columns.equals(other.columns)) { - return false; - } - } - if (domainConstraints == null) { - if (other.domainConstraints!= null) { - return false; - } - } else { - if (!domainConstraints.equals(other.domainConstraints)) { - return false; - } - } - if (domains == null) { - if (other.domains!= null) { - return false; - } - } else { - if (!domains.equals(other.domains)) { - return false; - } - } - if (elementTypes == null) { - if (other.elementTypes!= null) { - return false; - } - } else { - if (!elementTypes.equals(other.elementTypes)) { - return false; - } - } - if (indexColumnUsages == null) { - if (other.indexColumnUsages!= null) { - return false; - } - } else { - if (!indexColumnUsages.equals(other.indexColumnUsages)) { - return false; - } - } - if (indexes == null) { - if (other.indexes!= null) { - return false; - } - } else { - if (!indexes.equals(other.indexes)) { - return false; - } - } - if (keyColumnUsages == null) { - if (other.keyColumnUsages!= null) { - return false; - } - } else { - if (!keyColumnUsages.equals(other.keyColumnUsages)) { - return false; - } - } - if (parameters == null) { - if (other.parameters!= null) { - return false; - } - } else { - if (!parameters.equals(other.parameters)) { - return false; - } - } - if (referentialConstraints == null) { - if (other.referentialConstraints!= null) { - return false; - } - } else { - if (!referentialConstraints.equals(other.referentialConstraints)) { - return false; - } - } - if (routines == null) { - if (other.routines!= null) { - return false; - } - } else { - if (!routines.equals(other.routines)) { - return false; - } - } if (schemata == null) { if (other.schemata!= null) { return false; @@ -824,15 +725,6 @@ public class InformationSchema implements Serializable, XMLAppendable return false; } } - if (tableConstraints == null) { - if (other.tableConstraints!= null) { - return false; - } - } else { - if (!tableConstraints.equals(other.tableConstraints)) { - return false; - } - } if (tables == null) { if (other.tables!= null) { return false; @@ -851,6 +743,114 @@ public class InformationSchema implements Serializable, XMLAppendable return false; } } + if (columns == null) { + if (other.columns!= null) { + return false; + } + } else { + if (!columns.equals(other.columns)) { + return false; + } + } + if (tableConstraints == null) { + if (other.tableConstraints!= null) { + return false; + } + } else { + if (!tableConstraints.equals(other.tableConstraints)) { + return false; + } + } + if (keyColumnUsages == null) { + if (other.keyColumnUsages!= null) { + return false; + } + } else { + if (!keyColumnUsages.equals(other.keyColumnUsages)) { + return false; + } + } + if (referentialConstraints == null) { + if (other.referentialConstraints!= null) { + return false; + } + } else { + if (!referentialConstraints.equals(other.referentialConstraints)) { + return false; + } + } + if (checkConstraints == null) { + if (other.checkConstraints!= null) { + return false; + } + } else { + if (!checkConstraints.equals(other.checkConstraints)) { + return false; + } + } + if (domains == null) { + if (other.domains!= null) { + return false; + } + } else { + if (!domains.equals(other.domains)) { + return false; + } + } + if (domainConstraints == null) { + if (other.domainConstraints!= null) { + return false; + } + } else { + if (!domainConstraints.equals(other.domainConstraints)) { + return false; + } + } + if (indexes == null) { + if (other.indexes!= null) { + return false; + } + } else { + if (!indexes.equals(other.indexes)) { + return false; + } + } + if (indexColumnUsages == null) { + if (other.indexColumnUsages!= null) { + return false; + } + } else { + if (!indexColumnUsages.equals(other.indexColumnUsages)) { + return false; + } + } + if (routines == null) { + if (other.routines!= null) { + return false; + } + } else { + if (!routines.equals(other.routines)) { + return false; + } + } + if (parameters == null) { + if (other.parameters!= null) { + return false; + } + } else { + if (!parameters.equals(other.parameters)) { + return false; + } + } + if (elementTypes == null) { + if (other.elementTypes!= null) { + return false; + } + } else { + if (!elementTypes.equals(other.elementTypes)) { + return false; + } + } return true; } @@ -859,22 +859,22 @@ public class InformationSchema implements Serializable, XMLAppendable final int prime = 31; int result = 1; result = ((prime*result)+((catalogs == null)? 0 :catalogs.hashCode())); - result = ((prime*result)+((checkConstraints == null)? 0 :checkConstraints.hashCode())); - result = ((prime*result)+((columns == null)? 0 :columns.hashCode())); - result = ((prime*result)+((domainConstraints == null)? 0 :domainConstraints.hashCode())); - result = ((prime*result)+((domains == null)? 0 :domains.hashCode())); - result = ((prime*result)+((elementTypes == null)? 0 :elementTypes.hashCode())); - result = ((prime*result)+((indexColumnUsages == null)? 0 :indexColumnUsages.hashCode())); - result = ((prime*result)+((indexes == null)? 0 :indexes.hashCode())); - result = ((prime*result)+((keyColumnUsages == null)? 0 :keyColumnUsages.hashCode())); - result = ((prime*result)+((parameters == null)? 0 :parameters.hashCode())); - result = ((prime*result)+((referentialConstraints == null)? 0 :referentialConstraints.hashCode())); - result = ((prime*result)+((routines == null)? 0 :routines.hashCode())); result = ((prime*result)+((schemata == null)? 0 :schemata.hashCode())); result = ((prime*result)+((sequences == null)? 0 :sequences.hashCode())); - result = ((prime*result)+((tableConstraints == null)? 0 :tableConstraints.hashCode())); result = ((prime*result)+((tables == null)? 0 :tables.hashCode())); result = ((prime*result)+((views == null)? 0 :views.hashCode())); + result = ((prime*result)+((columns == null)? 0 :columns.hashCode())); + result = ((prime*result)+((tableConstraints == null)? 0 :tableConstraints.hashCode())); + result = ((prime*result)+((keyColumnUsages == null)? 0 :keyColumnUsages.hashCode())); + result = ((prime*result)+((referentialConstraints == null)? 0 :referentialConstraints.hashCode())); + result = ((prime*result)+((checkConstraints == null)? 0 :checkConstraints.hashCode())); + result = ((prime*result)+((domains == null)? 0 :domains.hashCode())); + result = ((prime*result)+((domainConstraints == null)? 0 :domainConstraints.hashCode())); + result = ((prime*result)+((indexes == null)? 0 :indexes.hashCode())); + result = ((prime*result)+((indexColumnUsages == null)? 0 :indexColumnUsages.hashCode())); + result = ((prime*result)+((routines == null)? 0 :routines.hashCode())); + result = ((prime*result)+((parameters == null)? 0 :parameters.hashCode())); + result = ((prime*result)+((elementTypes == null)? 0 :elementTypes.hashCode())); return result; } 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 09bc671d68..89c2657c19 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 @@ -8,22 +8,22 @@ - - - - - - - - - - - - + + + + + + + + + + + +