- * Instead of directly executing the DDL scripts against the H2 database, they - * are first parsed and translated to the H2 dialect, and only then executed - * against the H2 database. - * - * @author Knut Wannheden - */ -final class DDLDatabaseInitializer { - - private static final JooqLogger log = JooqLogger.getLogger(DDLDatabaseInitializer.class); - private static final Pattern P_NAME = Pattern.compile("(?s:.*?\"([^\"]*)\".*)"); - - private Connection connection; - private DSLContext ctx; - - private DDLDatabaseInitializer(final Settings settings) { - try { - Properties info = new Properties(); - info.put("user", "sa"); - info.put("password", ""); - connection = DriverManager.getConnection("jdbc:h2:mem:jooq-extensions-" + UUID.randomUUID(), info); - ctx = DSL.using(connection, settings); - - // [#7771] [#8011] Ignore all parsed storage clauses when executing the statements - ctx.data("org.jooq.ddl.ignore-storage-clauses", true); - - // [#8910] Parse things a bit differently for use with the DDLDatabase - ctx.data("org.jooq.ddl.parse-for-ddldatabase", true); - - final RenderNameCase nameCase = settings.getRenderNameCase(); - final Locale locale = renderLocale(ctx.settings()); - if (nameCase != null && nameCase != RenderNameCase.AS_IS) { - ctx.configuration().set(new DefaultVisitListener() { - @Override - public void visitStart(VisitContext c) { - if (c.queryPart() instanceof Name) { - Name[] parts = ((Name) c.queryPart()).parts(); - boolean changed = false; - - for (int i = 0; i < parts.length; i++) { - Name replacement = parts[i]; - switch (nameCase) { - case LOWER_IF_UNQUOTED: - if (parts[i].quoted() == Quoted.QUOTED) break; - case LOWER: - replacement = DSL.quotedName(parts[i].first().toLowerCase(locale)); - break; - - case UPPER_IF_UNQUOTED: - if (parts[i].quoted() == Quoted.QUOTED) break; - case UPPER: - replacement = DSL.quotedName(parts[i].first().toUpperCase(locale)); - break; - - default: - break; - } - if (!replacement.equals(parts[i])) { - parts[i] = replacement; - changed = true; - } - } - - if (changed) - c.queryPart(DSL.name(parts)); - } - } - }); - } - } - catch (SQLException e) { - if ("08001".equals(e.getSQLState())) - throw new DataAccessException("The h2.jar was not found on the classpath, which is required for this internal feature", e); - throw new DataAccessException("Error while exporting schema", e); - } - catch (Exception e) { - throw new DataAccessException("Error while exporting schema", e); - } - } - - static Connection initializeUsing(final Settings settings, Source... scripts) { - DDLDatabaseInitializer initializer = new DDLDatabaseInitializer(settings == null ? SettingsTools.defaultSettings() : settings); - for (Source script : scripts) - initializer.loadScript(script); - return initializer.connection(); - } - - /** - * Parses and executes the script represented by {@code reader} against the - * H2 database. If the script references a schema which doesn't exist, it - * will be automatically created first. - *
- * Any parser errors will be thrown. It is however possible to delimit - * sections which cannot be parsed using special comments. - * - * @see Settings#getParseIgnoreCommentStart() - * @see Settings#getParseIgnoreCommentStop() - */ - private final void loadScript(Source source) { - Reader reader = source.reader(); - try { - Scanner s = new Scanner(reader).useDelimiter("\\A"); - Queries queries = ctx.parser().parse(s.hasNext() ? s.next() : ""); - - for (Query query : queries) { - - repeat: - for (;;) { - try { - query.execute(); - log.info(query); - break repeat; - } - catch (DataAccessException e) { - - // [#7039] Auto create missing schemas. We're using the - if ("90079" /* ErrorCode.SCHEMA_NOT_FOUND_1 */.equals(e.sqlState())) { - SQLException cause = e.getCause(SQLException.class); - - if (cause != null) { - Matcher m = P_NAME.matcher(cause.getMessage()); - - if (m.find()) { - Query createSchema = ctx.createSchemaIfNotExists(name(m.group(1))); - createSchema.execute(); - log.info(createSchema); - continue repeat; - } - } - } - - throw e; - } - } - } - } - catch (ParserException e) { - log.error("An exception occurred while parsing a DDL script: " + e.getMessage() - + ". Please report this error to https://github.com/jOOQ/jOOQ/issues/new", e); - throw e; - } - finally { - if (reader != null) - try { - reader.close(); - } - catch (Exception ignore) {} - } - } - - private final Connection connection() { - return connection; - } - -} diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/DDLMetaProvider.java index d77f130385..b7ca9b2db1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/DDLMetaProvider.java @@ -37,13 +37,35 @@ */ package org.jooq.impl; +import static org.jooq.SQLDialect.H2; +import static org.jooq.conf.SettingsTools.renderLocale; +import static org.jooq.impl.DSL.name; + +import java.io.Reader; import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Locale; +import java.util.Properties; +import java.util.Scanner; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.jooq.Configuration; +import org.jooq.DSLContext; import org.jooq.Meta; import org.jooq.MetaProvider; -import org.jooq.SQLDialect; +import org.jooq.Name; +import org.jooq.Name.Quoted; +import org.jooq.Queries; +import org.jooq.Query; import org.jooq.Source; +import org.jooq.VisitContext; +import org.jooq.conf.RenderNameCase; +import org.jooq.conf.Settings; +import org.jooq.exception.DataAccessException; +import org.jooq.tools.JooqLogger; import org.jooq.tools.jdbc.JDBCUtils; /** @@ -55,8 +77,11 @@ import org.jooq.tools.jdbc.JDBCUtils; */ final class DDLMetaProvider implements MetaProvider { - private final Configuration configuration; - private final Source[] scripts; + private static final JooqLogger log = JooqLogger.getLogger(DDLMetaProvider.class); + private static final Pattern P_NAME = Pattern.compile("(?s:.*?\"([^\"]*)\".*)"); + + private final Configuration configuration; + private final Source[] scripts; public DDLMetaProvider(Configuration configuration, Source... scripts) { this.configuration = configuration == null ? new DefaultConfiguration() : configuration; @@ -65,16 +90,154 @@ final class DDLMetaProvider implements MetaProvider { @Override public Meta provide() { - Configuration localConfiguration = configuration.derive(); - Connection connection = DDLDatabaseInitializer.initializeUsing(localConfiguration.settings(), scripts); + Connection connection = null; + try { - localConfiguration.set(connection); - localConfiguration.set(SQLDialect.H2); - MetaProvider defaultProvider = new DefaultMetaProvider(localConfiguration); - Meta meta = DetachedMeta.copyOf(defaultProvider.provide()); - return meta; - } finally { + DDLDatabaseInitializer initializer = new DDLDatabaseInitializer(configuration.settings()); + + for (Source script : scripts) + initializer.loadScript(script); + + return DetachedMeta.detach(new DefaultMetaProvider( + configuration.derive().set(initializer.connection).set(H2) + )); + } + finally { JDBCUtils.safeClose(connection); } } + + static final class DDLDatabaseInitializer { + + private Connection connection; + private DSLContext ctx; + + private DDLDatabaseInitializer(final Settings settings) { + try { + Properties info = new Properties(); + info.put("user", "sa"); + info.put("password", ""); + connection = DriverManager.getConnection("jdbc:h2:mem:jooq-extensions-" + UUID.randomUUID(), info); + ctx = DSL.using(connection, settings); + + // [#7771] [#8011] Ignore all parsed storage clauses when executing the statements + ctx.data("org.jooq.ddl.ignore-storage-clauses", true); + + // [#8910] Parse things a bit differently for use with the DDLDatabase + ctx.data("org.jooq.ddl.parse-for-ddldatabase", true); + + final RenderNameCase nameCase = settings.getRenderNameCase(); + final Locale locale = renderLocale(ctx.settings()); + if (nameCase != null && nameCase != RenderNameCase.AS_IS) { + ctx.configuration().set(new DefaultVisitListener() { + @Override + public void visitStart(VisitContext c) { + if (c.queryPart() instanceof Name) { + Name[] parts = ((Name) c.queryPart()).parts(); + boolean changed = false; + + for (int i = 0; i < parts.length; i++) { + Name replacement = parts[i]; + switch (nameCase) { + case LOWER_IF_UNQUOTED: + if (parts[i].quoted() == Quoted.QUOTED) break; + case LOWER: + replacement = DSL.quotedName(parts[i].first().toLowerCase(locale)); + break; + + case UPPER_IF_UNQUOTED: + if (parts[i].quoted() == Quoted.QUOTED) break; + case UPPER: + replacement = DSL.quotedName(parts[i].first().toUpperCase(locale)); + break; + + default: + break; + } + if (!replacement.equals(parts[i])) { + parts[i] = replacement; + changed = true; + } + } + + if (changed) + c.queryPart(DSL.name(parts)); + } + } + }); + } + } + catch (SQLException e) { + if ("08001".equals(e.getSQLState())) + throw new DataAccessException("The h2.jar was not found on the classpath, which is required for this internal feature", e); + throw new DataAccessException("Error while exporting schema", e); + } + catch (Exception e) { + throw new DataAccessException("Error while exporting schema", e); + } + } + + /** + * Parses and executes the script represented by {@code reader} against the + * H2 database. If the script references a schema which doesn't exist, it + * will be automatically created first. + *
+ * Any parser errors will be thrown. It is however possible to delimit
+ * sections which cannot be parsed using special comments.
+ *
+ * @see Settings#getParseIgnoreCommentStart()
+ * @see Settings#getParseIgnoreCommentStop()
+ */
+ private final void loadScript(Source source) {
+ Reader reader = source.reader();
+ try {
+ Scanner s = new Scanner(reader).useDelimiter("\\A");
+ Queries queries = ctx.parser().parse(s.hasNext() ? s.next() : "");
+
+ for (Query query : queries) {
+
+ repeat:
+ for (;;) {
+ try {
+ query.execute();
+ log.info(query);
+ break repeat;
+ }
+ catch (DataAccessException e) {
+
+ // [#7039] Auto create missing schemas. We're using the
+ if ("90079" /* ErrorCode.SCHEMA_NOT_FOUND_1 */.equals(e.sqlState())) {
+ SQLException cause = e.getCause(SQLException.class);
+
+ if (cause != null) {
+ Matcher m = P_NAME.matcher(cause.getMessage());
+
+ if (m.find()) {
+ Query createSchema = ctx.createSchemaIfNotExists(name(m.group(1)));
+ createSchema.execute();
+ log.info(createSchema);
+ continue repeat;
+ }
+ }
+ }
+
+ throw e;
+ }
+ }
+ }
+ }
+ catch (ParserException e) {
+ log.error("An exception occurred while parsing a DDL script: " + e.getMessage()
+ + ". Please report this error to https://github.com/jOOQ/jOOQ/issues/new", e);
+ throw e;
+ }
+ finally {
+ if (reader != null)
+ try {
+ reader.close();
+ }
+ catch (Exception ignore) {}
+ }
+ }
+ }
}
diff --git a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java
index 973f56c347..e2cdf2fc6a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java
@@ -38,16 +38,17 @@
package org.jooq.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.jooq.Catalog;
import org.jooq.Comment;
-import org.jooq.Configuration;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Index;
import org.jooq.Meta;
+import org.jooq.MetaProvider;
import org.jooq.Name;
import org.jooq.Package;
import org.jooq.Record;
@@ -70,18 +71,19 @@ import org.jooq.exception.DataAccessException;
final class DetachedMeta extends AbstractMeta {
private static final long serialVersionUID = 5561057000510740144L;
- private Meta delegate;
+ private Meta delegate;
- private DetachedMeta(Configuration configuration) {
- super(configuration);
+ static Meta detach(MetaProvider provider) {
+ return new DetachedMeta(provider.provide());
}
- private final DetachedMeta copy(Meta meta) {
+ private DetachedMeta(Meta meta) {
+ super(meta.configuration());
+
delegate = meta;
getCatalogs();
delegate = null;
resolveReferences();
- return this;
}
private final void resolveReferences() {
@@ -89,10 +91,6 @@ final class DetachedMeta extends AbstractMeta {
((DetachedCatalog) catalog).resolveReferences(this);
}
- static Meta copyOf(Meta meta) {
- return new DetachedMeta(meta.configuration()).copy(meta);
- }
-
@Override
protected final List