From d2cb5570b2ccd289b49c19a3ce9a0079b04b9dfd Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 27 Aug 2019 21:12:17 +0200 Subject: [PATCH] [jOOQ/jOOQ#8986] Consistent naming of "org.jooq.ddl" context data keys Make sure all key references use a consistent "org.jooq.ddl" prefix. --- .../main/java/org/jooq/meta/extensions/ddl/DDLDatabase.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/CollatedField.java | 2 +- jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DDLDatabaseInitializer.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Tools.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) 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 081429f4f8..271125acbc 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 @@ -132,10 +132,10 @@ public class DDLDatabase extends H2Database { ); // [#7771] [#8011] Ignore all parsed storage clauses when executing the statements - ctx.data("org.jooq.meta.extensions.ddl.ignore-storage-clauses", true); + ctx.data("org.jooq.ddl.ignore-storage-clauses", true); // [#8910] Parse things a bit differently for use with the DDLDatabase - ctx.data("org.jooq.meta.extensions.ddl.parse-for-ddldatabase", true); + ctx.data("org.jooq.ddl.parse-for-ddldatabase", true); if (!"AS_IS".equals(defaultNameCase)) { ctx.configuration().set(new DefaultVisitListener() { diff --git a/jOOQ/src/main/java/org/jooq/impl/CollatedField.java b/jOOQ/src/main/java/org/jooq/impl/CollatedField.java index f1c116a059..cce69eff79 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CollatedField.java +++ b/jOOQ/src/main/java/org/jooq/impl/CollatedField.java @@ -75,7 +75,7 @@ final class CollatedField extends AbstractField { public final void accept(Context ctx) { // [#8011] Collations are vendor-specific storage clauses, which we might need to ignore - if (ctx.configuration().data("org.jooq.extensions.ddl.ignore-storage-clauses") == null) + if (ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null) ctx.sql("((").visit(field).sql(") ").visit(K_COLLATE).sql(' ').visit(collation).sql(')'); else ctx.visit(field); diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 7820114e82..f353b6dd77 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -318,7 +318,7 @@ final class CreateIndexImpl extends AbstractRowCountQuery implements .qualify(true) .sql(')'); - if (where != null && ctx.configuration().data("org.jooq.extensions.ddl.ignore-storage-clauses") == null) + if (where != null && ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null) ctx.formatSeparator() .visit(K_WHERE) .sql(' ') diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index 13d4e1ea75..f10ee95a34 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -447,7 +447,7 @@ final class CreateTableImpl extends AbstractRowCountQuery implements .visit(K_COMMENT).sql(' ').visit(comment); // [#7772] This data() value should be available from ctx directly, not only from ctx.configuration() - if (storage != null && ctx.configuration().data("org.jooq.extensions.ddl.ignore-storage-clauses") == null) + if (storage != null && ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null) ctx.formatSeparator() .visit(storage); diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLDatabaseInitializer.java b/jOOQ/src/main/java/org/jooq/impl/DDLDatabaseInitializer.java index 56e003e806..572a455126 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLDatabaseInitializer.java +++ b/jOOQ/src/main/java/org/jooq/impl/DDLDatabaseInitializer.java @@ -91,10 +91,10 @@ final class DDLDatabaseInitializer { ctx = DSL.using(connection, settings); // [#7771] [#8011] Ignore all parsed storage clauses when executing the statements - ctx.data("org.jooq.extensions.ddl.ignore-storage-clauses", true); + ctx.data("org.jooq.ddl.ignore-storage-clauses", true); // [#8910] Parse things a bit differently for use with the DDLDatabase - ctx.data("org.jooq.extensions.ddl.parse-for-ddldatabase", true); + ctx.data("org.jooq.ddl.parse-for-ddldatabase", true); final RenderNameCase nameCase = settings.getRenderNameCase(); final Locale locale = renderLocale(ctx.settings()); diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 8b577234fb..0e2da872f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -558,7 +558,7 @@ final class ParserImpl implements Parser { // [#8910] Some statements can be parsed differently when we know we're // parsing them for the DDLDatabase. This method patches these // statements. - if (TRUE.equals(ctx.configuration().data("org.jooq.extensions.ddl.parse-for-ddldatabase"))) { + if (TRUE.equals(ctx.configuration().data("org.jooq.ddl.parse-for-ddldatabase"))) { if (query instanceof Select) { String sql = ctx.configuration().derive(SettingsTools.clone(ctx.configuration().settings()) diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index e9d6c92f1d..e56b299a63 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -4777,11 +4777,11 @@ final class Tools { } // [#8041] Character sets are vendor-specific storage clauses, which we might need to ignore - if (type.characterSet() != null && ctx.configuration().data("org.jooq.extensions.ddl.ignore-storage-clauses") == null) + if (type.characterSet() != null && ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null) ctx.sql(' ').visit(K_CHARACTER_SET).sql(' ').visit(type.characterSet()); // [#8011] Collations are vendor-specific storage clauses, which we might need to ignore - if (type.collation() != null && ctx.configuration().data("org.jooq.extensions.ddl.ignore-storage-clauses") == null) + if (type.collation() != null && ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null) ctx.sql(' ').visit(K_COLLATE).sql(' ').visit(type.collation()); }