From 94d259513087f3c532df420548e1465e57b7ecdb Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 10 Dec 2019 12:56:23 +0100 Subject: [PATCH] [jOOQ/jOOQ#9425] Diff for cross schema FKs In order to better reuse diff logic, the lambdas are now extracted as members. --- .../main/java/org/jooq/impl/DDLInterpreter.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Diff.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java index 2609ae4364..d120856109 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java +++ b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java @@ -683,7 +683,7 @@ final class DDLInterpreter { else if (impl.$unique() != null) existing.uniqueKeys.add(new MutableUniqueKey((UnqualifiedName) impl.getUnqualifiedName(), existing, existing.fields(impl.$unique(), true))); else if (impl.$foreignKey() != null) - addForeignKey(schema, existing, impl); + addForeignKey(getSchema(impl.$referencesTable().getSchema(), false), existing, impl); else if (impl.$check() != null) existing.checks.add(new MutableCheck((UnqualifiedName) impl.getUnqualifiedName(), existing, impl.$check())); else @@ -1339,7 +1339,7 @@ final class DDLInterpreter { @Override public String toString() { - return name.toString(); + return qualifiedName().toString(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index 2bea8c5f9c..32652b4b3c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -711,6 +711,20 @@ package org.jooq.impl; + + + + + + + + + + + + + +