From d0f24ada157e4cbcc4594f949cd9050ba02ce454 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 30 Dec 2016 11:41:59 +0100 Subject: [PATCH] [#5744] Log WARN if users combine nested catalog configurations with top-level inputSchema configuration --- jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java index 9566607805..d044db1c98 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java @@ -341,6 +341,10 @@ public class GenerationTool { log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/inputCatalog and /configuration/generator/database/catalogs"); if (!StringUtils.isBlank(d.getOutputCatalog())) log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/outputCatalog and /configuration/generator/database/catalogs"); + if (!StringUtils.isBlank(d.getInputSchema())) + log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/inputSchema and /configuration/generator/database/catalogs"); + if (!StringUtils.isBlank(d.getOutputSchema())) + log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/outputSchema and /configuration/generator/database/catalogs"); if (!schemataEmpty) log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/catalogs and /configuration/generator/database/schemata"); }