From 37b16cbe32c68ef7513668d31023a5f3e5e0040c Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 19 Apr 2017 14:20:28 +0200 Subject: [PATCH] [#6105] Add Name { Field | Table | Schema | Catalog }.getUnqualifiedName() --- jOOQ/src/main/java/org/jooq/Catalog.java | 5 +++++ jOOQ/src/main/java/org/jooq/Field.java | 5 +++++ jOOQ/src/main/java/org/jooq/Schema.java | 5 +++++ jOOQ/src/main/java/org/jooq/Table.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/AbstractField.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/AbstractTable.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java | 5 +++++ jOOQ/src/main/java/org/jooq/impl/TableImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Tools.java | 6 +++--- 10 files changed, 44 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Catalog.java b/jOOQ/src/main/java/org/jooq/Catalog.java index d21c05ac57..bf3f37570e 100644 --- a/jOOQ/src/main/java/org/jooq/Catalog.java +++ b/jOOQ/src/main/java/org/jooq/Catalog.java @@ -56,6 +56,11 @@ public interface Catalog extends QueryPart { */ Name getQualifiedName(); + /** + * The unqualified name of this catalog. + */ + Name getUnqualifiedName(); + /** * List all schemas contained in this catalog. */ diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 708df997d1..2598a471e5 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -102,6 +102,11 @@ public interface Field extends SelectField, GroupField, FieldOrRow { */ Name getQualifiedName(); + /** + * The unqualified name of this field. + */ + Name getUnqualifiedName(); + /** * The comment given to the field. *

diff --git a/jOOQ/src/main/java/org/jooq/Schema.java b/jOOQ/src/main/java/org/jooq/Schema.java index 422e59fbb3..31b05129ee 100644 --- a/jOOQ/src/main/java/org/jooq/Schema.java +++ b/jOOQ/src/main/java/org/jooq/Schema.java @@ -60,6 +60,11 @@ public interface Schema extends QueryPart { */ Name getQualifiedName(); + /** + * The unqualified name of this schema. + */ + Name getUnqualifiedName(); + /** * Stream all tables contained in this schema. */ diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index 1c44a810d7..1047d5c15c 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -95,6 +95,11 @@ public interface Table extends TableLike { */ Name getQualifiedName(); + /** + * The unqualified name of this table. + */ + Name getUnqualifiedName(); + /** * The comment given to the table. *

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java index 7c5468dd91..3e231d37e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java @@ -217,6 +217,11 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return name; } + @Override + public final Name getUnqualifiedName() { + return name.unqualifiedName(); + } + @Override public final String getComment() { return comment; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java index 2694ed688b..34a9c251e6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java @@ -395,6 +395,11 @@ abstract class AbstractTable extends AbstractQueryPart impleme return tablename; } + @Override + public final Name getUnqualifiedName() { + return tablename.unqualifiedName(); + } + @Override public final String getComment() { return tablecomment; diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java index 0eb9ec042f..ae7b5906eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java @@ -83,6 +83,11 @@ public class CatalogImpl extends AbstractQueryPart implements Catalog { return name; } + @Override + public final Name getUnqualifiedName() { + return name.unqualifiedName(); + } + @Override public final void accept(Context ctx) { ctx.visit(name.unqualifiedName()); diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java index 894193eabe..3c9d56d41b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java @@ -104,6 +104,11 @@ public class SchemaImpl extends AbstractQueryPart implements Schema { return name; } + @Override + public final Name getUnqualifiedName() { + return name.unqualifiedName(); + } + @Override public final void accept(Context ctx) { Catalog mappedCatalog = Tools.getMappedCatalog(ctx.configuration(), getCatalog()); diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 59179cf830..94eb60ab8f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -204,7 +204,7 @@ public class TableImpl extends AbstractTable { } } - ctx.visit(Tools.getMappedTable(ctx.configuration(), this).getQualifiedName().unqualifiedName()); + ctx.visit(Tools.getMappedTable(ctx.configuration(), this).getUnqualifiedName()); if (parameters != null && ctx.declareTables()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index c28aa38f58..4c0afc6d79 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -1972,7 +1972,7 @@ final class Tools { String separator = ""; for (Field field : list) { - context.sql(separator).visit(field.getQualifiedName().unqualifiedName()); + context.sql(separator).visit(field.getUnqualifiedName()); separator = ", "; } @@ -1994,7 +1994,7 @@ final class Tools { String separator = ""; for (Table table : list) { - context.sql(separator).visit(table.getQualifiedName().unqualifiedName()); + context.sql(separator).visit(table.getUnqualifiedName()); separator = ", "; } @@ -3636,7 +3636,7 @@ final class Tools { Name[] part = table.getQualifiedName().parts(); Name[] name = new Name[part.length + 1]; System.arraycopy(part, 0, name, 0, part.length); - name[part.length] = field.getQualifiedName().unqualifiedName(); + name[part.length] = field.getUnqualifiedName(); return DSL.field(DSL.name(name), field.getDataType()); }