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

[jOOQ/jOOQ#10480] Avoid generating empty header comments in Keys.java

Browse Source
This commit is contained in:
Lukas Eder 2020-08-10 12:11:04 +02:00
parent 9e092d1617
commit e8977dfee1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,9 +757,6 @@ public class JavaGenerator extends AbstractGenerator {
List<ForeignKeyDefinition> allForeignKeys = new ArrayList<>();
// Unique keys
out.header("UNIQUE and PRIMARY KEY definitions");
out.println();
for (TableDefinition table : database.getTables(schema)) {
try {
List<UniqueKeyDefinition> uniqueKeys = table.getUniqueKeys();
@ -771,6 +768,12 @@ public class JavaGenerator extends AbstractGenerator {
final String keyId = getStrategy().getJavaIdentifier(uniqueKey);
final int block = allUniqueKeys.size() / INITIALISER_SIZE;
// [#10480] Print header before first key
if (allUniqueKeys.isEmpty()) {
out.header("UNIQUE and PRIMARY KEY definitions");
out.println();
}
if (scala || kotlin)
out.println("val %s = UniqueKeys%s.%s", keyId, block, keyId);
else
@ -785,9 +788,6 @@ public class JavaGenerator extends AbstractGenerator {
}
// Foreign keys
out.header("FOREIGN KEY definitions");
out.println();
for (TableDefinition table : database.getTables(schema)) {
try {
List<ForeignKeyDefinition> foreignKeys = table.getForeignKeys();
@ -800,6 +800,12 @@ public class JavaGenerator extends AbstractGenerator {
final String keyId = getStrategy().getJavaIdentifier(foreignKey);
final int block = allForeignKeys.size() / INITIALISER_SIZE;
// [#10480] Print header before first key
if (allForeignKeys.isEmpty()) {
out.header("FOREIGN KEY definitions");
out.println();
}
if (scala || kotlin)
out.println("val %s = ForeignKeys%s.%s", keyId, block, keyId);
else