[jOOQ/jOOQ#15281] [jOOQ/jOOQ#10561] Declare ref conflicts for UDTs

This commit is contained in:
Lukas Eder 2023-06-26 13:40:39 +02:00
parent 123bec708c
commit 7b8c8d7a2c

View File

@ -929,6 +929,7 @@ public class JavaGenerator extends AbstractGenerator {
JavaWriter out = newJavaWriter(getStrategy().getGlobalReferencesFile(schema, ConstraintDefinition.class));
out.refConflicts(getStrategy().getJavaIdentifiers(database.getKeys(schema)));
out.refConflicts(getStrategy().getJavaIdentifiers(database.getForeignKeys(schema)));
printGlobalReferencesPackage(out, schema, ConstraintDefinition.class);
if (!kotlin) {
@ -1077,6 +1078,7 @@ public class JavaGenerator extends AbstractGenerator {
JavaWriter out = newJavaWriter(getStrategy().getGlobalReferencesFile(schema, IndexDefinition.class));
out.refConflicts(getStrategy().getJavaIdentifiers(database.getIndexes(schema)));
printGlobalReferencesPackage(out, schema, IndexDefinition.class);
if (!kotlin) {
@ -3160,6 +3162,8 @@ public class JavaGenerator extends AbstractGenerator {
@SuppressWarnings("unused")
protected void generateUDT(SchemaDefinition schema, UDTDefinition udt) {
JavaWriter out = newJavaWriter(getFile(udt));
out.refConflicts(getStrategy().getJavaIdentifiers(udt.getAttributes()));
log.info("Generating UDT ", out.file().getName());
if (log.isDebugEnabled())
@ -3524,6 +3528,7 @@ public class JavaGenerator extends AbstractGenerator {
log.info("Generating DOMAIN references");
JavaWriter out = newJavaWriter(getStrategy().getGlobalReferencesFile(schema, DomainDefinition.class));
out.refConflicts(getStrategy().getJavaIdentifiers(database.getDomains(schema)));
printGlobalReferencesPackage(out, schema, DomainDefinition.class);
final String schemaId = generateDefaultSchema(schema)
@ -7809,6 +7814,7 @@ public class JavaGenerator extends AbstractGenerator {
log.info("Generating sequences");
JavaWriter out = newJavaWriter(getStrategy().getGlobalReferencesFile(schema, SequenceDefinition.class));
out.refConflicts(getStrategy().getJavaIdentifiers(database.getSequences(schema)));
printGlobalReferencesPackage(out, schema, SequenceDefinition.class);
if (!kotlin) {