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

[jOOQ/jOOQ#9059] DSLContext.ddl(Catalog) does not correctly create cross schema foreign key constraints.

Browse Source
This commit is contained in:
Lukas Eder 2019-08-19 11:40:55 +02:00
parent 796c8260c1
commit 0e63ae8064
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
jOOQ/src/main/java/org/jooq/impl/DDL.java
View File

@ -46,7 +46,6 @@ import static org.jooq.DDLFlag.UNIQUE;
import static org.jooq.impl.DSL.constraint;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@ -175,55 +174,57 @@ final class DDL {
return result;
}
final Queries queries(Schema schema) {
final Queries queries(Schema... schemas) {
List<Query> queries = new ArrayList<>();
if (configuration.flags().contains(SCHEMA) && !StringUtils.isBlank(schema.getName()))
if (configuration.createSchemaIfNotExists())
queries.add(ctx.createSchemaIfNotExists(schema.getName()));
else
queries.add(ctx.createSchema(schema.getName()));
for (Schema schema : schemas)
if (configuration.flags().contains(SCHEMA) && !StringUtils.isBlank(schema.getName()))
if (configuration.createSchemaIfNotExists())
queries.add(ctx.createSchemaIfNotExists(schema.getName()));
else
queries.add(ctx.createSchema(schema.getName()));
if (configuration.flags().contains(TABLE)) {
for (Table<?> table : schema.getTables()) {
List<Constraint> constraints = new ArrayList<>();
for (Schema schema : schemas) {
for (Table<?> table : schema.getTables()) {
List<Constraint> constraints = new ArrayList<>();
constraints.addAll(primaryKeys(table));
constraints.addAll(uniqueKeys(table));
constraints.addAll(primaryKeys(table));
constraints.addAll(uniqueKeys(table));
queries.add(createTable(table, constraints));
queries.add(createTable(table, constraints));
}
}
}
else {
if (configuration.flags().contains(PRIMARY_KEY))
for (Table<?> table : schema.getTables())
for (Constraint constraint : primaryKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
for (Schema schema : schemas) {
if (configuration.flags().contains(PRIMARY_KEY))
for (Table<?> table : schema.getTables())
for (Constraint constraint : primaryKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
if (configuration.flags().contains(UNIQUE))
for (Table<?> table : schema.getTables())
for (Constraint constraint : uniqueKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
if (configuration.flags().contains(UNIQUE))
for (Table<?> table : schema.getTables())
for (Constraint constraint : uniqueKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
}
}
if (configuration.flags().contains(FOREIGN_KEY))
for (Table<?> table : schema.getTables())
for (Constraint constraint : foreignKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
for (Schema schema : schemas)
for (Table<?> table : schema.getTables())
for (Constraint constraint : foreignKeys(table))
queries.add(ctx.alterTable(table).add(constraint));
if (configuration.flags().contains(COMMENT))
for (Table<?> table : schema.getTables())
queries.addAll(commentOn(table));
for (Schema schema : schemas)
for (Table<?> table : schema.getTables())
queries.addAll(commentOn(table));
return ctx.queries(queries);
}
final Queries queries(Catalog catalog) {
List<Query> queries = new ArrayList<>();
for (Schema schema : catalog.getSchemas())
queries.addAll(Arrays.asList(queries(schema).queries()));
return ctx.queries(queries);
return queries(catalog.getSchemas().toArray(Tools.EMPTY_SCHEMA));
}
}

1
jOOQ/src/main/java/org/jooq/impl/Tools.java
View File

@ -296,6 +296,7 @@ final class Tools {
static final QueryPart[] EMPTY_QUERYPART = {};
static final Record[] EMPTY_RECORD = {};
static final RowN[] EMPTY_ROWN = {};
static final Schema[] EMPTY_SCHEMA = {};
static final SelectFieldOrAsterisk[] EMPTY_SELECT_FIELD_OR_ASTERISK = {};
static final SortField<?>[] EMPTY_SORTFIELD = {};
static final String[] EMPTY_STRING = {};