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

[jOOQ/jOOQ#16379] Compilation error in generated Indexes.java when index

Browse Source 
references embeddables that replace their underlying fields
This commit is contained in:
Lukas Eder 2024-12-11 15:04:05 +01:00
parent b95d554fea
commit fd76e92a00
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ import java.util.List;
import java.util.Objects;
import static java.util.stream.Collectors.toList;
import static org.jooq.codegen.GenerationUtil.escapeString0;
import static org.jooq.codegen.Language.KOTLIN;
/**
@ -198,6 +199,17 @@ public abstract class AbstractGeneratorStrategy implements GeneratorStrategy {
}
sb.append(".");
sb.append(getJavaIdentifier(definition));
return sb.toString();

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

@ -506,6 +506,24 @@ class GenerationUtil {
return "_" + Integer.toHexString(c);
}
static String escapeString0(Language language, String string) {
if (string == null)
return null;
// [#3450] Escape also the escape sequence, among other things that break Java strings.
String result = string.replace("\\", "\\\\")
.replace("\"", "\\\"")
.replace("\n", "\\n")
.replace("\r", "\\r");
// [#10869] Prevent string interpolation in Kotlin
if (language.isKotlin())
result = result.replace("$", "\\$");
return result;
}
/**
* Take a qualified Java type and make it a simple type
*

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

@ -54,6 +54,7 @@ import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.YUGABYTEDB;
import static org.jooq.SortOrder.DESC;
import static org.jooq.codegen.GenerationUtil.escapeString0;
import static org.jooq.codegen.GeneratorStrategy.Mode.POJO;
import static org.jooq.codegen.GeneratorStrategy.Mode.RECORD;
import static org.jooq.codegen.Language.JAVA;
@ -1329,7 +1330,7 @@ public class JavaGenerator extends AbstractGenerator {
for (IndexColumnDefinition column : index.getIndexColumns()) {
orderFields.append(sortFieldSeparator);
orderFields.append(out.ref(getStrategy().getFullJavaIdentifier(column.getColumn()), colRefSegments(null)));
orderFields.append(out.ref(getStrategy().getFullJavaIdentifier(column.getColumn()), colRefSegments(column)));
orderFields.append(column.getSortOrder() == DESC ? ".desc()" : "");
sortFieldSeparator = ", ";
@ -8993,7 +8994,7 @@ public class JavaGenerator extends AbstractGenerator {
// [#10007] [#10318] Very long strings cannot be handled by the javac compiler.
int max = 16384;
if (string.length() <= max)
return escapeString0(string);
return escapeString0(language, string);
StringBuilder sb = new StringBuilder("\" + \"");
for (int i = 0; i < string.length(); i += max) {
@ -9001,29 +9002,12 @@ public class JavaGenerator extends AbstractGenerator {
sb.append("\".toString() + \"");
// [#16662] Delay escaping the string for individual split parts to avoid edge cases
sb.append(escapeString0(string.substring(i, Math.min(i + max, string.length()))));
sb.append(escapeString0(language, string.substring(i, Math.min(i + max, string.length()))));
}
return sb.append("\".toString() + \"").toString();
}
private String escapeString0(String string) {
if (string == null)
return null;
// [#3450] Escape also the escape sequence, among other things that break Java strings.
String result = string.replace("\\", "\\\\")
.replace("\"", "\\\"")
.replace("\n", "\\n")
.replace("\r", "\\r");
// [#10869] Prevent string interpolation in Kotlin
if (kotlin)
result = result.replace("$", "\\$");
return result;
}
/**
* Subclasses may override this method to provide table class footer code.
*/