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

[jOOQ/jOOQ#13723] Regression: Zero-length delimited identifier is generated for enum columns when using <outputSchemaToDefault/>

Browse Source
This commit is contained in:
Lukas Eder 2022-06-24 16:05:29 +02:00
parent e08f2bf365
commit 4ae64efbf3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jOOQ/src/main/java/org/jooq/SchemaMapping.java
View File

@ -322,6 +322,11 @@ public class SchemaMapping implements Serializable {
result = getCatalogs().get(catalogName);
}
// [#4642] [#13723] There can still be a default name (e.g. from <outputCatalogToDefault/>
// code generation, even when there's no runtime schema mapping
else if ("".equals(result.getName()))
result = null;
return result;
}
@ -341,6 +346,9 @@ public class SchemaMapping implements Serializable {
else if (schema instanceof RenamedSchema) return schema;
Schema result = schema;
if (result == null)
result = schema(name(""));
RenderMapping m = mapping();
// [#4642] Don't initialise schema mapping if not necessary
@ -349,9 +357,6 @@ public class SchemaMapping implements Serializable {
!isEmpty(m.getDefaultSchema()) ||
!isEmpty(m.getDefaultCatalog())) {
if (result == null)
result = schema(name(""));
Catalog catalog = result.getCatalog();
if (catalog == null)
catalog = DSL.catalog(name(""));
@ -433,6 +438,11 @@ public class SchemaMapping implements Serializable {
result = getSchemata().get(key);
}
// [#4642] [#13723] There can still be a default name (e.g. from <outputSchemaToDefault/>
// code generation, even when there's no runtime schema mapping
else if ("".equals(result.getName()))
result = null;
return result;
}