honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added version order validation

This commit is contained in:
Ken Stevens 2019-10-29 14:30:17 -04:00
parent c8c89d976f
commit 788f386ce4
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java
View File

@ -170,6 +170,7 @@ public abstract class BaseTask<T extends BaseTask> {
}
}
// FIXME KHS find a way to put these back in
public boolean isLogMessage() {
return false;
}

22
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java
View File

@ -26,6 +26,7 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.lang3.Validate;
import org.flywaydb.core.api.MigrationVersion;
import org.intellij.lang.annotations.Language;
import javax.annotation.Nonnull;
@ -35,6 +36,7 @@ import java.util.List;
public class BaseMigrationTasks<T extends Enum> {
private Multimap<T, BaseTask<?>> myTasks = MultimapBuilder.hashKeys().arrayListValues().build();
MigrationVersion lastVersion;
@SuppressWarnings("unchecked")
public List<BaseTask<?>> getTasks(@Nonnull T theFrom, @Nonnull T theTo) {
@ -76,6 +78,7 @@ public class BaseMigrationTasks<T extends Enum> {
retval.add(new LogStartSectionWithMessageTask("------------------------------------------------"));
Collection<BaseTask<?>> nextValues = myTasks.get(nextVersion);
if (nextValues != null) {
validate(nextValues);
retval.addAll(nextValues);
}
}
@ -83,6 +86,23 @@ public class BaseMigrationTasks<T extends Enum> {
return retval;
}
// FIXME KHS split this class up
// FIXME KHS test this
private void validate(Collection<BaseTask<?>> theTasks) {
for (BaseTask task: theTasks) {
if (task.isLogMessage()) {
continue;
}
String version = task.getFlywayVersion();
MigrationVersion migrationVersion = MigrationVersion.fromVersion(version);
if (lastVersion != null) {
if (migrationVersion.compareTo(lastVersion) <= 0) {
throw new IllegalStateException("Migration version " + migrationVersion + " found after migration version " + lastVersion + ". Migrations need to be in order by version number.");
}
}
}
}
public interface IAcceptsTasks {
void addTask(BaseTask<?> theTask);
}
@ -267,7 +287,6 @@ public class BaseMigrationTasks<T extends Enum> {
}
/**
*
* @param theFkName the name of the foreign key
* @param theParentTableName the name of the table that exports the foreign key
*/
@ -296,6 +315,7 @@ public class BaseMigrationTasks<T extends Enum> {
public BuilderAddIndexUnique(boolean theUnique) {
myUnique = theUnique;
}
// FIXME KHS find all instances of this. The String... messed up the conversion
public void withColumns(String theVersion, String... theColumnNames) {
AddIndexTask task = new AddIndexTask(myRelease, theVersion);