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

[jOOQ/jOOQ#16029] Regression: NullPointerException in KotlinGenerator

Browse Source 
generated code when InlineDerivedTable constructor calls
TableImpl.where(null)
This commit is contained in:
Lukas Eder 2024-01-08 16:02:52 +01:00
parent 3363a8e811
commit bc06815ce2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6686,7 +6686,7 @@ public class JavaGenerator extends AbstractGenerator {
Name.class, Table.class, recordType, Field.class);
if (generateWhereMethodOverrides() && !table.isTableValuedFunction())
out.println("private constructor(alias: %s, aliased: %s<%s>?, where: %s): this(alias, null, null, null, aliased, null, where)",
out.println("private constructor(alias: %s, aliased: %s<%s>?, where: %s?): this(alias, null, null, null, aliased, null, where)",
Name.class, Table.class, recordType, Condition.class);
}
else {
@ -7620,10 +7620,10 @@ public class JavaGenerator extends AbstractGenerator {
r.run();
};
idt.accept(() -> out.println("%soverride fun where(condition: %s): %s = %s(qualifiedName, if (aliased()) this else null, condition)", visibilityPublic(), Condition.class, className, className));
idt.accept(() -> out.println("%soverride fun where(condition: %s?): %s = %s(qualifiedName, if (aliased()) this else null, condition)", visibilityPublic(), Condition.class, className, className));
idt.accept(() -> out.println("%soverride fun where(conditions: %s<%s>): %s = where(%s.and(conditions))", visibilityPublic(), out.ref("kotlin.collections.Collection"), Condition.class, className, DSL.class));
idt.accept(() -> out.println("%soverride fun where(vararg conditions: %s): %s = where(%s.and(*conditions))", visibilityPublic(), Condition.class, className, DSL.class));
idt.accept(() -> out.println("%soverride fun where(condition: %s<%s?>): %s = where(%s.condition(condition))", visibilityPublic(), Field.class, Boolean.class, className, DSL.class));
idt.accept(() -> out.println("%soverride fun where(vararg conditions: %s?): %s = where(%s.and(*conditions))", visibilityPublic(), Condition.class, className, DSL.class));
idt.accept(() -> out.println("%soverride fun where(condition: %s<%s?>?): %s = where(%s.condition(condition))", visibilityPublic(), Field.class, Boolean.class, className, DSL.class));
idt.accept(() -> out.println("@%s %soverride fun where(condition: %s): %s = where(%s.condition(condition))", PlainSQL.class, visibilityPublic(), SQL.class, className, DSL.class));
idt.accept(() -> out.println("@%s %soverride fun where(@%s.SQL condition: %s): %s = where(%s.condition(condition))", PlainSQL.class, visibilityPublic(), Stringly.class, String.class, className, DSL.class));
idt.accept(() -> out.println("@%s %soverride fun where(@%s.SQL condition: %s, vararg binds: Any?): %s = where(%s.condition(condition, *binds))", PlainSQL.class, visibilityPublic(), Stringly.class, String.class, className, DSL.class));