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

[#6867] [#6885] Add DSLContext.ddl(Table[]) and ddl(Collection<? extends Table<?>>)

Browse Source
This commit is contained in:
lukaseder 2017-12-07 09:48:10 +01:00
parent cbea3c04f0
commit 4fdfc8e657
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ/src/main/java/org/jooq/DSLContext.java
View File

@ -8367,11 +8367,10 @@ public interface DSLContext extends Scope , AutoCloseable {
*
* @see #ddl(Table[], DDLFlag...)
*/
Queries ddl(Table[] tables);
Queries ddl(Table<?>... tables);
/**
* Generate the complete creation script for tables.
*
* <p>
* The following {@link DDLFlag} can be set:
* <ul>
@ -8388,7 +8387,7 @@ public interface DSLContext extends Scope , AutoCloseable {
* </ul>
* </p>
*/
Queries ddl(Table[] tables, DDLFlag... flags);
Queries ddl(Table<?>[] tables, DDLFlag... flags);
/**
* Generate the complete creation script for tables.
@ -8399,7 +8398,6 @@ public interface DSLContext extends Scope , AutoCloseable {
/**
* Generate the complete creation script for tables.
*
* <p>
* The following {@link DDLFlag} can be set:
* <ul>

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

@ -77,10 +77,6 @@ final class DDL {
this.flags.add(flag);
}
final Queries queries(Table<?> table) {
return ctx.queries(createTable(table));
}
private final Query createTable(Table<?> table) {
List<Constraint> constraints = new ArrayList<Constraint>();
@ -101,16 +97,15 @@ final class DDL {
}
return ctx.createTable(table)
.columns(table.fields())
.constraints(constraints);
.columns(table.fields())
.constraints(constraints);
}
final Queries queries(Table[] tables) {
List<Query> queries = new ArrayList<Query>();
final Queries queries(Table<?>... tables) {
Query[] queries = new Query[tables.length];
for (Table table : tables) {
queries.add(createTable(table));
}
for (int i = 0; i < tables.length; i++)
queries[i] = createTable(tables[i]);
return ctx.queries(queries);
}

6
jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
View File

@ -2810,16 +2810,16 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
@Override
public Queries ddl(Table<?> table) {
return ddl(table, DDLFlag.values());
return ddl(new Table[] { table });
}
@Override
public Queries ddl(Table<?> table, DDLFlag... flags) {
return new DDL(this, flags).queries(table);
return ddl(new Table[] { table }, flags);
}
@Override
public Queries ddl(Table[] tables) {
public Queries ddl(Table... tables) {
return ddl(tables, DDLFlag.values());
}