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

[jOOQ/jOOQ#7752] Diff CREATE SEQUENCE with flags

Browse Source
This commit is contained in:
Lukas Eder 2019-10-25 10:20:40 +02:00
parent 0d3b9ec7ff
commit b2685787f8
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/AbstractMeta.java
View File

@ -291,7 +291,7 @@ abstract class AbstractMeta extends AbstractScope implements Meta, Serializable
// correct results
@Override
public /* non-final */ Queries ddl(DDLExportConfiguration exportConfiguration) {
return new DDL(this, exportConfiguration).queries();
return new DDL(dsl(), exportConfiguration).queries(this);
}

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

@ -76,13 +76,11 @@ import org.jooq.tools.StringUtils;
*/
final class DDL {
private final Meta meta;
private final DSLContext ctx;
private final DDLExportConfiguration configuration;
DDL(Meta meta, DDLExportConfiguration configuration) {
this.meta = meta;
this.ctx = meta.dsl();
DDL(DSLContext ctx, DDLExportConfiguration configuration) {
this.ctx = ctx;
this.configuration = configuration;
}
@ -94,7 +92,7 @@ final class DDL {
.constraints(constraints);
}
private final Query createSequence(Sequence<?> sequence) {
final Query createSequence(Sequence<?> sequence) {
CreateSequenceFlagsStep result = configuration.createSequenceIfNotExists()
? ctx.createSequenceIfNotExists(sequence)
: ctx.createSequence(sequence);
@ -224,7 +222,7 @@ final class DDL {
return result;
}
final Queries queries() {
final Queries queries(Meta meta) {
List<Query> queries = new ArrayList<>();
List<Schema> schemas = sortIf(meta.getSchemas(), !configuration.respectSchemaOrder());

3
jOOQ/src/main/java/org/jooq/impl/Diff.java
View File

@ -443,6 +443,9 @@ package org.jooq.impl;

2
jOOQ/src/main/java/org/jooq/impl/TableMetaImpl.java
View File

@ -115,7 +115,7 @@ final class TableMetaImpl extends AbstractMeta {
@Override
public Queries ddl(DDLExportConfiguration exportConfiguration) throws DataAccessException {
return new DDL(this, exportConfiguration).queries(tables);
return new DDL(dsl(), exportConfiguration).queries(tables);
}
@Override