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

[#6988] DDLFlag.TABLE does not work correctly on DSLContext.ddl()

Browse Source
This commit is contained in:
lukaseder 2018-01-04 15:25:51 +01:00
parent 3a218640db
commit 68365bfa60
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,21 +82,19 @@ final class DDL {
private final Query createTable(Table<?> table) {
List<Constraint> constraints = new ArrayList<Constraint>();
if (flags.contains(TABLE)) {
if (flags.contains(PRIMARY_KEY))
for (UniqueKey<?> key : table.getKeys())
if (key.isPrimary())
constraints.add(constraint(key.getName()).primaryKey(key.getFieldsArray()));
if (flags.contains(PRIMARY_KEY))
for (UniqueKey<?> key : table.getKeys())
if (key.isPrimary())
constraints.add(constraint(key.getName()).primaryKey(key.getFieldsArray()));
if (flags.contains(UNIQUE))
for (UniqueKey<?> key : table.getKeys())
if (!key.isPrimary())
constraints.add(constraint(key.getName()).unique(key.getFieldsArray()));
if (flags.contains(UNIQUE))
for (UniqueKey<?> key : table.getKeys())
if (!key.isPrimary())
constraints.add(constraint(key.getName()).unique(key.getFieldsArray()));
if (flags.contains(FOREIGN_KEY))
for (ForeignKey<?, ?> key : table.getReferences())
constraints.add(constraint(key.getName()).foreignKey(key.getFieldsArray()).references(key.getKey().getTable(), key.getKey().getFieldsArray()));
}
if (flags.contains(FOREIGN_KEY))
for (ForeignKey<?, ?> key : table.getReferences())
constraints.add(constraint(key.getName()).foreignKey(key.getFieldsArray()).references(key.getKey().getTable(), key.getKey().getFieldsArray()));
return ctx.createTable(table)
.columns(table.fields())
@ -107,7 +105,8 @@ final class DDL {
List<Query> queries = new ArrayList<Query>();
for (Table<?> table : tables) {
queries.add(createTable(table));
if (flags.contains(TABLE))
queries.add(createTable(table));
if (flags.contains(COMMENT)) {
String tComment = table.getComment();