From d74d1c9655a900979ae943886d226f7418d885cb Mon Sep 17 00:00:00 2001 From: Oskar Wyke Date: Mon, 7 Feb 2022 16:32:13 +0100 Subject: [PATCH] [jOOQ#13008] Unquote keyword when mapping one to many relation --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 10 ++++++---- jOOQ/src/main/resources/META-INF/ABOUT.txt | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index eaa8e85529..37291c48fb 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -5950,9 +5950,10 @@ public class JavaGenerator extends AbstractGenerator { for (ForeignKeyDefinition foreignKey : foreignKeys) { final String referencedTableClassName = out.ref(getStrategy().getFullJavaClassName(foreignKey.getReferencedTable())); final String keyMethodName = out.ref(getStrategy().getJavaMethodName(foreignKey)); + final String unquotedKeyMethodName = keyMethodName.replace("`", ""); if (kotlin) - out.println("private lateinit var _%s: %s", keyMethodName, referencedTableClassName); + out.println("private lateinit var _%s: %s", unquotedKeyMethodName, referencedTableClassName); else out.println("private transient %s _%s;", referencedTableClassName, keyMethodName); } @@ -5965,6 +5966,7 @@ public class JavaGenerator extends AbstractGenerator { : out.ref(getStrategy().getFullJavaIdentifier(foreignKey), 2); final String referencedTableClassName = out.ref(getStrategy().getFullJavaClassName(foreignKey.getReferencedTable())); final String keyMethodName = out.ref(getStrategy().getJavaMethodName(foreignKey)); + final String unquotedKeyMethodName = keyMethodName.replace("`", ""); out.javadoc( "Get the implicit join path to the " + foreignKey.getReferencedTable().getQualifiedName() + " table" @@ -5977,10 +5979,10 @@ public class JavaGenerator extends AbstractGenerator { } else if (kotlin) { out.println("%sfun %s(): %s {", visibility(), keyMethodName, referencedTableClassName); - out.println("if (!this::_%s.isInitialized)", keyMethodName); - out.println("_%s = %s(this, %s)", keyMethodName, referencedTableClassName, keyFullId); + out.println("if (!this::_%s.isInitialized)", unquotedKeyMethodName); + out.println("_%s = %s(this, %s)", unquotedKeyMethodName, referencedTableClassName, keyFullId); out.println(); - out.println("return _%s;", keyMethodName); + out.println("return _%s;", unquotedKeyMethodName); out.println("}"); } else { diff --git a/jOOQ/src/main/resources/META-INF/ABOUT.txt b/jOOQ/src/main/resources/META-INF/ABOUT.txt index 9265a12df3..6281fbb584 100644 --- a/jOOQ/src/main/resources/META-INF/ABOUT.txt +++ b/jOOQ/src/main/resources/META-INF/ABOUT.txt @@ -63,6 +63,7 @@ Authors and contributors of jOOQ or parts of jOOQ in alphabetical order: - Vladimir Vinogradov - Vojtech Polivka - Wang Gaoyuan +- Wyke Oskar - Zoltan Tamasi See the following website for details about contributing to jOOQ: