diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java index 5eaacd7dd3..86823b06e4 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java @@ -127,6 +127,9 @@ public class DDLDatabase extends H2Database { connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions-" + UUID.randomUUID(), info); ctx = DSL.using(connection); + // [#7771] Ignore all parsed storage clauses when executing the statements + ctx.data("org.jooq.meta.extensions.ddl.ignore-storage-clauses", true); + InputStream in = null; boolean loaded = false; in = DDLDatabase.class.getResourceAsStream(scripts); diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index ec7d45cede..1c4e0d7d33 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -501,7 +501,8 @@ final class CreateTableImpl extends AbstractQuery implements ctx.formatSeparator() .visit(K_COMMENT).sql(' ').visit(comment); - if (storage != null) + // [#7772] This data() value should be available from ctx directly, not only from ctx.configuration() + if (storage != null && ctx.configuration().data("org.jooq.meta.extensions.ddl.ignore-storage-clauses") == null) ctx.formatSeparator() .visit(storage);