From 11c5e08fc55f6f7eaa4bec2b0548a457b441336a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 4 Jun 2019 16:50:32 +0200 Subject: [PATCH] [jOOQ/jOOQ#7389] UniqueKey.getReferences returns unnamed foreign keys --- jOOQ/src/main/java/org/jooq/impl/MetaImpl.java | 18 ++++++++++-------- .../main/java/org/jooq/impl/ReferenceImpl.java | 7 ------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index d97ae593ef..f14888e918 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -916,17 +916,19 @@ final class MetaImpl extends AbstractMeta { List> references = new ArrayList>(groups.size()); for (Entry> entry : groups.entrySet()) { - Schema schema = schemas.get(entry.getKey().get(1)); + Record key = entry.getKey(); + Result value = entry.getValue(); - Table fkTable = (Table) schema.getTable(entry.getKey().get(2, String.class)); - TableField[] fkFields = new TableField[entry.getValue().size()]; + Schema schema = schemas.get(key.get(1)); - for (int i = 0; i < entry.getValue().size(); i++) { - Record record = entry.getValue().get(i); - fkFields[i] = (TableField) fkTable.field(record.get(7, String.class)); - } + Table fkTable = (Table) schema.getTable(key.get(2, String.class)); + String fkName = key.get(3, String.class); + TableField[] fkFields = new TableField[value.size()]; - references.add(new ReferenceImpl(this, fkTable, fkFields)); + for (int i = 0; i < value.size(); i++) + fkFields[i] = (TableField) fkTable.field(value.get(i).get(7, String.class)); + + references.add(new ReferenceImpl(this, fkTable, fkName, fkFields)); } return references; diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java index 1d46090844..db450c9e95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java @@ -71,13 +71,6 @@ final class ReferenceImpl extends AbstractKe private final UniqueKey key; - @SafeVarargs - - ReferenceImpl(UniqueKey key, Table table, TableField... fields) { - this(key, table, null, fields); - } - - @SafeVarargs ReferenceImpl(UniqueKey key, Table table, String name, TableField... fields) {