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

[#2032] Handle "DEFAULT_CATALOG" in the absence of catalog support

Browse Source
This commit is contained in:
lukaseder 2015-12-10 14:58:09 +01:00
parent e2b4d0915d
commit 75ff22fe99
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
View File

@ -119,8 +119,13 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
return "IDENTITY_" + getJavaIdentifier(((IdentityDefinition) definition).getColumn().getContainer());
}
// [#2032] Intercept default Catalog
else if (definition instanceof CatalogDefinition && ((CatalogDefinition) definition).isDefaultCatalog()) {
return "DEFAULT_CATALOG";
}
// [#2089] Intercept default schema
if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
else if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
return "DEFAULT_SCHEMA";
}
@ -287,12 +292,17 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
public String getJavaClassName(Definition definition, Mode mode) {
// [#1150] Intercept Mode.RECORD calls for tables
if (!generator.generateRecords() && mode == Mode.RECORD && definition instanceof TableDefinition) {
if (definition instanceof TableDefinition && !generator.generateRecords() && mode == Mode.RECORD) {
return Record.class.getSimpleName();
}
// [#2032] Intercept default catalog
else if (definition instanceof CatalogDefinition && ((CatalogDefinition) definition).isDefaultCatalog()) {
return "DefaultCatalog";
}
// [#2089] Intercept default schema
if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
else if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
return "DefaultSchema";
}

10
jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
View File

@ -141,9 +141,10 @@ public abstract class AbstractDefinition implements Definition {
String separator = "";
for (Definition part : getDefinitionPath()) {
if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema()) {
if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
continue;
else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
continue;
}
sb.append(separator);
sb.append(part.getInputName());
@ -169,9 +170,10 @@ public abstract class AbstractDefinition implements Definition {
String separator = "";
for (Definition part : getDefinitionPath()) {
if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema()) {
if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
continue;
else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
continue;
}
sb.append(separator);
sb.append(part.getOutputName());