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

[jOOQ/jOOQ#17196] ScalaGenerator produces wrong code when generated interfaces (traits) extend multiple other interfaces

Browse Source
This commit is contained in:
Lukas Eder 2024-09-06 09:53:30 +02:00
parent f389ed3645
commit e45a9eaf1f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3348,7 +3348,7 @@ public class JavaGenerator extends AbstractGenerator {
printTableJPAAnnotation(out, (TableDefinition) tableUdtOrEmbeddable);
if (scala)
out.println("%strait %s[[before= extends ][%s]] {", visibility(), className, interfaces);
out.println("%strait %s[[before= extends ][separator= with ][%s]] {", visibility(), className, interfaces);
else if (kotlin)
out.println("%sinterface %s[[before= : ][%s]] {", visibility(), className, interfaces);
else
@ -5837,8 +5837,7 @@ public class JavaGenerator extends AbstractGenerator {
? out.ref(getStrategy().getFullJavaClassName(tableUdtOrEmbeddable, Mode.INTERFACE))
: "";
final String superName =
// [#644] [#17189] TODO: Support this in ScalaGenerator
!scala && udtSupertype(tableUdtOrEmbeddable) != null
udtSupertype(tableUdtOrEmbeddable) != null
? out.ref(getStrategy().getFullJavaClassName(udtSupertype(tableUdtOrEmbeddable), Mode.POJO)) + (kotlin
? "(" + udtSupertype(tableUdtOrEmbeddable)
.getAttributes()