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

[#6014] Implement QualifiedTable.getSchema() and QualifiedSchema.getCatalog()

Browse Source
This commit is contained in:
lukaseder 2017-03-30 14:51:22 +02:00
parent 114a7574c4
commit ed26bf2087
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java
View File

@ -65,7 +65,7 @@ public class CatalogImpl extends AbstractQueryPart implements Catalog {
private final String catalogName;
CatalogImpl(Name name) {
this(name.getName()[0]);
this(name.last());
}
public CatalogImpl(String name) {

8
jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java
View File

@ -36,6 +36,7 @@ package org.jooq.impl;
import static org.jooq.Clause.TABLE;
import static org.jooq.Clause.TABLE_REFERENCE;
import static org.jooq.tools.StringUtils.defaultIfNull;
import org.jooq.Clause;
import org.jooq.Context;
@ -61,7 +62,12 @@ final class QualifiedTable extends AbstractTable<Record> {
private final Name name;
QualifiedTable(Name name) {
super(name.getName()[name.getName().length - 1]);
super(
defaultIfNull(name.last(), ""),
name.qualified()
? DSL.schema(name.qualifier())
: null
);
this.name = name;
}

4
jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
View File

@ -69,8 +69,8 @@ public class SchemaImpl extends AbstractQueryPart implements Schema {
SchemaImpl(Name name) {
this(
name.getName()[name.getName().length - 1],
name.getName().length > 1 ? DSL.catalog(DSL.name(name.getName()[0])) : null
name.last(),
name.qualified() ? DSL.catalog(name.qualifier()) : null
);
}