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

[jOOQ/jOOQ#17624] Correct order of excludes / includes, copy paste error

Browse Source
This commit is contained in:
Lukas Eder 2024-11-15 13:24:29 +01:00
parent 8ce1f7b81a
commit 6b248fdc87
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java
View File

@ -660,8 +660,8 @@ abstract class AbstractGenerator implements Generator {
public boolean generateRecordsIncluded(Definition definition) {
return generateRecords()
&& !database.filterExcludeInclude(asList(definition),
generateRecordsIncludes(),
generateRecordsExcludes()
generateRecordsExcludes(),
generateRecordsIncludes()
).isEmpty();
}
@ -734,8 +734,8 @@ abstract class AbstractGenerator implements Generator {
public boolean generatePojosIncluded(Definition definition) {
return generatePojos()
&& !database.filterExcludeInclude(asList(definition),
generatePojosIncludes(),
generatePojosExcludes()
generatePojosExcludes(),
generatePojosIncludes()
).isEmpty();
}
@ -858,8 +858,8 @@ abstract class AbstractGenerator implements Generator {
public boolean generateDaosIncluded(Definition definition) {
return generateDaos()
&& !database.filterExcludeInclude(asList(definition),
generateDaosIncludes(),
generateDaosExcludes()
generateDaosExcludes(),
generateDaosIncludes()
).isEmpty();
}

2
jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
View File

@ -813,7 +813,7 @@ public class GenerationTool {
if (g.getGenerate().getRecordsIncludes() != null)
generator.setGenerateRecordsIncludes(g.getGenerate().getRecordsIncludes());
if (g.getGenerate().getRecordsExcludes() != null)
generator.setGenerateRecordsIncludes(g.getGenerate().getRecordsExcludes());
generator.setGenerateRecordsExcludes(g.getGenerate().getRecordsExcludes());
if (g.getGenerate().isRecordsImplementingRecordN() != null)
generator.setGenerateRecordsImplementingRecordN(g.getGenerate().isRecordsImplementingRecordN());
if (g.getGenerate().isEnumsAsScalaSealedTraits() != null)