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

[jOOQ/jOOQ#9506] Fix migration validation

Browse Source 
- Validate VersionProvider
- Lookup expected schemas from interpreter search path
- Init versions with interpreter search path (TODO new config)
- Stop skipping create and drop schema commands
This commit is contained in:
Lukas Eder 2019-12-17 12:15:19 +01:00
parent 7084813f39
commit f6870fe15c
2 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
jOOQ/src/main/java/org/jooq/impl/MigrationImpl.java
View File

@ -41,12 +41,17 @@ import static java.lang.Boolean.FALSE;
import static org.jooq.impl.DSL.createSchemaIfNotExists;
import static org.jooq.impl.DSL.dropSchemaIfExists;
import static org.jooq.impl.DSL.dropTableIfExists;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.DSL.schema;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.jooq.Configuration;
import org.jooq.Constants;
@ -65,6 +70,7 @@ import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.Version;
import org.jooq.conf.InterpreterSearchSchema;
import org.jooq.exception.DataAccessException;
import org.jooq.exception.DataMigrationException;
import org.jooq.exception.DataMigrationValidationException;
@ -133,21 +139,31 @@ final class MigrationImpl extends AbstractScope implements Migration {
Version currentVersion = versions().get(currentRecord.getMigratedTo());
if (currentVersion == null)
throw new DataMigrationValidationException("Version trying to migrate to is not available from VersionProvider: " + currentRecord.getMigratedTo());
throw new DataMigrationValidationException("Version currently installed is not available from VersionProvider: " + currentRecord.getMigratedTo());
}
validateVersionProvider(from());
validateVersionProvider(to());
validateUnexpectedObjects();
}
private final void validateVersionProvider(Version version) {
if (!versions().containsKey(version.id()))
throw new DataMigrationValidationException("Version is not available from VersionProvider: " + version.id());
}
private final void validateUnexpectedObjects() {
Version currentVersion = currentVersion();
Meta currentMeta = currentVersion.meta();
List<Schema> expectedSchemas = to().meta().getSchemas();
Set<Schema> expectedSchemas = new HashSet<>();
expectedSchemas.addAll(lookup(from().meta().getSchemas()));
expectedSchemas.addAll(lookup(to().meta().getSchemas()));
// TODO Add a settings governing what schemas we're including in the migration
// The current implementation will default to migrating all schemas that are
// touched by the to() version
// touched by the from() or to() version
Meta existingMeta = dsl().meta();
for (Schema schema : existingMeta.getSchemas()) {
@ -165,6 +181,26 @@ final class MigrationImpl extends AbstractScope implements Migration {
throw new DataMigrationValidationException("Non-empty difference between actual schema and migration from schema: " + diff);
}
private final Collection<Schema> lookup(List<Schema> schemas) {
// TODO: Refactor usages of getInterpreterSearchPath()
Collection<Schema> result = schemas;
List<InterpreterSearchSchema> searchPath = dsl().settings().getInterpreterSearchPath();
if (!searchPath.isEmpty()) {
result = new HashSet<>();
Schema defaultSchema = schema(name(searchPath.get(0).getCatalog(), searchPath.get(0).getSchema()));
for (Schema schema : schemas)
if (schema.getQualifiedName().empty())
result.add(defaultSchema);
else
result.add(schema);
}
return result;
}
private static final MigrationResult MIGRATION_RESULT = new MigrationResult() {};
@Override
@ -231,11 +267,6 @@ final class MigrationImpl extends AbstractScope implements Migration {
// TODO: Make batching an option: queries().executeBatch();
for (Query query : queries().queries()) {
// TODO: Properly configure the schema creation
if (query.toString().startsWith("create schema") || query.toString().startsWith("drop schema"))
continue;
ctx.query(query);
listener.queryStart(ctx);
query.execute();

23
jOOQ/src/main/java/org/jooq/impl/VersionImpl.java
View File

@ -37,6 +37,10 @@
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.createSchema;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.DSL.schema;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -53,6 +57,7 @@ import org.jooq.Queries;
import org.jooq.Query;
import org.jooq.Source;
import org.jooq.Version;
import org.jooq.conf.InterpreterSearchSchema;
import org.jooq.exception.DataDefinitionException;
/**
@ -68,10 +73,23 @@ final class VersionImpl implements Version {
private VersionImpl(DSLContext ctx, String id, Meta meta, List<Parent> parents) {
this.ctx = ctx;
this.id = id;
this.meta = meta != null ? meta : ctx.meta("");
this.meta = meta != null ? meta : init(ctx);
this.parents = parents;
}
private static final Meta init(DSLContext ctx) {
Meta result = ctx.meta("");
// TODO: Instead of reusing interpreter search path, we should have some dedicated
// configuration for this.
// TODO: Should this be moved in DSLContext.meta()?
List<InterpreterSearchSchema> searchPath = ctx.settings().getInterpreterSearchPath();
for (InterpreterSearchSchema schema : searchPath)
result = result.apply(createSchema(schema(name(schema.getCatalog(), schema.getSchema()))));
return result;
}
VersionImpl(DSLContext ctx, String id, Meta meta, Version parent, Queries queries) {
this(ctx, id, meta, Arrays.asList(new Parent((VersionImpl) parent, queries)));
}
@ -131,6 +149,9 @@ final class VersionImpl implements Version {
@Override
public final Queries migrateTo(Version version) {
if (equals(version))
return ctx.queries();
VersionImpl subgraph = ((VersionImpl) version).subgraphTo(this);
// TODO: When there's no common ancestor, we're switching branches.