From d488114b7e920f462e2a69ed6006fb6fe2e5a728 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 9 Oct 2017 15:23:34 +0200 Subject: [PATCH] [#6661] Add support for catalogs in the XMLGenerator --- .../src/main/java/org/jooq/util/XMLGenerator.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java index 6655e8db50..64fbb70b57 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/XMLGenerator.java @@ -47,6 +47,8 @@ import javax.xml.bind.JAXB; import org.jooq.SortOrder; import org.jooq.tools.JooqLogger; +import org.jooq.tools.StringUtils; +import org.jooq.util.xml.jaxb.Catalog; import org.jooq.util.xml.jaxb.Column; import org.jooq.util.xml.jaxb.Index; import org.jooq.util.xml.jaxb.IndexColumnUsage; @@ -89,9 +91,20 @@ public class XMLGenerator extends AbstractGenerator { InformationSchema is = new InformationSchema(); + boolean hasNonDefaultCatalogs = false; + for (CatalogDefinition c : db.getCatalogs()) { + if (!StringUtils.isBlank(c.getName())) { + hasNonDefaultCatalogs = true; + break; + } + } + for (CatalogDefinition c : db.getCatalogs()) { String catalogName = c.getOutputName(); + if (hasNonDefaultCatalogs) + is.getCatalogs().add(new Catalog().withCatalogName(catalogName)); + for (SchemaDefinition s : c.getSchemata()) { String schemaName = s.getOutputName();