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

[#5649] [#6423] Compilation error in generated code when both SchemaVersionProvider and CatalogVersionProvider are applied

Browse Source
This commit is contained in:
lukaseder 2017-07-20 14:16:50 +02:00
parent eaed27501e
commit 0b34513301
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
View File

@ -5390,18 +5390,12 @@ public class JavaGenerator extends AbstractGenerator {
out.tab(1).println("value = {");
out.tab(2).println("\"http://www.jooq.org\",");
out.tab(2).println("\"jOOQ version:%s\"%s", Constants.VERSION, (hasCatalogVersion || hasSchemaVersion ? "," : ""));
if (hasCatalogVersion || hasSchemaVersion) {
out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
if (hasCatalogVersion)
out.tab(2).println("\"catalog version:%s\"", catalogVersions.get(catalog).replace("\"", "\\\""));
if (hasSchemaVersion)
out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
}
else {
out.tab(2).println("\"jOOQ version:%s\"", Constants.VERSION);
}
if (hasCatalogVersion)
out.tab(2).println("\"catalog version:%s\"%s", catalogVersions.get(catalog).replace("\"", "\\\""), (hasSchemaVersion ? "," : ""));
if (hasSchemaVersion)
out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
if (scala)
out.tab(1).println("),");