migration version validation tested
This commit is contained in:
Ken Stevens
parent
788f386ce4
commit
c7bd11ed0d
|
|
@ -26,6 +26,7 @@ import ca.uhn.fhir.jpa.migrate.taskdef.ArbitrarySqlTask;
|
|||
import ca.uhn.fhir.jpa.migrate.taskdef.BaseTableColumnTypeTask;
|
||||
import ca.uhn.fhir.jpa.migrate.taskdef.CalculateHashesTask;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.BaseMigrationTasks;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.Builder;
|
||||
import ca.uhn.fhir.jpa.model.entity.*;
|
||||
import ca.uhn.fhir.util.VersionEnum;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,12 @@ package ca.uhn.fhir.jpa.migrate.tasks.api;
|
|||
* #L%
|
||||
*/
|
||||
|
||||
import ca.uhn.fhir.jpa.migrate.DriverTypeEnum;
|
||||
import ca.uhn.fhir.jpa.migrate.taskdef.*;
|
||||
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;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -86,9 +84,8 @@ public class BaseMigrationTasks<T extends Enum> {
|
|||
return retval;
|
||||
}
|
||||
|
||||
// FIXME KHS split this class up
|
||||
// FIXME KHS test this
|
||||
private void validate(Collection<BaseTask<?>> theTasks) {
|
||||
void validate(Collection<BaseTask<?>> theTasks) {
|
||||
for (BaseTask task: theTasks) {
|
||||
if (task.isLogMessage()) {
|
||||
continue;
|
||||
|
|
@ -100,368 +97,11 @@ public class BaseMigrationTasks<T extends Enum> {
|
|||
throw new IllegalStateException("Migration version " + migrationVersion + " found after migration version " + lastVersion + ". Migrations need to be in order by version number.");
|
||||
}
|
||||
}
|
||||
lastVersion = migrationVersion;
|
||||
}
|
||||
}
|
||||
|
||||
public interface IAcceptsTasks {
|
||||
void addTask(BaseTask<?> theTask);
|
||||
}
|
||||
|
||||
public static class Builder {
|
||||
|
||||
private final String myRelease;
|
||||
private final IAcceptsTasks mySink;
|
||||
|
||||
public Builder(String theRelease, IAcceptsTasks theSink) {
|
||||
myRelease = theRelease;
|
||||
mySink = theSink;
|
||||
}
|
||||
|
||||
public BuilderWithTableName onTable(String theTableName) {
|
||||
return new BuilderWithTableName(myRelease, mySink, theTableName);
|
||||
}
|
||||
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
mySink.addTask(theTask);
|
||||
}
|
||||
|
||||
public BuilderAddTableRawSql addTableRawSql(String theVersion, String theTableName) {
|
||||
return new BuilderAddTableRawSql(theVersion, theTableName);
|
||||
}
|
||||
|
||||
public Builder executeRawSql(String theVersion, @Language("SQL") String theSql) {
|
||||
mySink.addTask(new ExecuteRawSqlTask(myRelease, theVersion).addSql(theSql));
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder executeRawSql(String theVersion, DriverTypeEnum theDriver, @Language("SQL") String theSql) {
|
||||
mySink.addTask(new ExecuteRawSqlTask(myRelease, theVersion).addSql(theDriver, theSql));
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder startSectionWithMessage(String theMessage) {
|
||||
Validate.notBlank(theMessage);
|
||||
addTask(new LogStartSectionWithMessageTask(theMessage));
|
||||
return this;
|
||||
}
|
||||
|
||||
public BuilderAddTableByColumns addTableByColumns(String theVersion, String theTableName, String thePkColumnName) {
|
||||
return new BuilderAddTableByColumns(myRelease, theVersion, mySink, theTableName, thePkColumnName);
|
||||
}
|
||||
|
||||
public void addIdGenerator(String theVersion, String theGeneratorName) {
|
||||
AddIdGeneratorTask task = new AddIdGeneratorTask(myRelease, theVersion, theGeneratorName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public void dropIdGenerator(String theVersion, String theIdGeneratorName) {
|
||||
DropIdGeneratorTask task = new DropIdGeneratorTask(myRelease, theVersion, theIdGeneratorName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public class BuilderAddTableRawSql {
|
||||
|
||||
private final AddTableRawSqlTask myTask;
|
||||
|
||||
protected BuilderAddTableRawSql(String theVersion, String theTableName) {
|
||||
myTask = new AddTableRawSqlTask(myRelease, theVersion);
|
||||
myTask.setTableName(theTableName);
|
||||
addTask(myTask);
|
||||
}
|
||||
|
||||
|
||||
public BuilderAddTableRawSql addSql(DriverTypeEnum theDriverTypeEnum, @Language("SQL") String theSql) {
|
||||
myTask.addSql(theDriverTypeEnum, theSql);
|
||||
return this;
|
||||
}
|
||||
|
||||
public void addSql(@Language("SQL") String theSql) {
|
||||
myTask.addSql(theSql);
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderAddTableByColumns extends BuilderWithTableName implements IAcceptsTasks {
|
||||
private final String myVersion;
|
||||
private final AddTableByColumnTask myTask;
|
||||
|
||||
public BuilderAddTableByColumns(String theRelease, String theVersion, IAcceptsTasks theSink, String theTableName, String thePkColumnName) {
|
||||
super(theRelease, theSink, theTableName);
|
||||
myVersion = theVersion;
|
||||
myTask = new AddTableByColumnTask(myRelease, theVersion);
|
||||
myTask.setTableName(theTableName);
|
||||
myTask.setPkColumn(thePkColumnName);
|
||||
theSink.addTask(myTask);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddColumnWithName addColumn(String theColumnName) {
|
||||
return new BuilderWithTableName.BuilderAddColumnWithName(myRelease, myVersion, theColumnName, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
if (theTask instanceof AddColumnTask) {
|
||||
myTask.addAddColumnTask((AddColumnTask) theTask);
|
||||
} else {
|
||||
super.addTask(theTask);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class BuilderWithTableName implements IAcceptsTasks {
|
||||
private final String myRelease;
|
||||
private final IAcceptsTasks mySink;
|
||||
private final String myTableName;
|
||||
|
||||
public BuilderWithTableName(String theRelease, IAcceptsTasks theSink, String theTableName) {
|
||||
myRelease = theRelease;
|
||||
mySink = theSink;
|
||||
myTableName = theTableName;
|
||||
}
|
||||
|
||||
public String getTableName() {
|
||||
return myTableName;
|
||||
}
|
||||
|
||||
public void dropIndex(String theVersion, String theIndexName) {
|
||||
DropIndexTask task = new DropIndexTask(myRelease, theVersion);
|
||||
task.setIndexName(theIndexName);
|
||||
task.setTableName(myTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public void dropThisTable(String theVersion) {
|
||||
DropTableTask task = new DropTableTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public BuilderAddIndexWithName addIndex(String theIndexName) {
|
||||
return new BuilderAddIndexWithName(theIndexName);
|
||||
}
|
||||
|
||||
public BuilderAddColumnWithName addColumn(String theVersion, String theColumnName) {
|
||||
return new BuilderAddColumnWithName(myRelease, theVersion, theColumnName, this);
|
||||
}
|
||||
|
||||
public void dropColumn(String theVersion, String theColumnName) {
|
||||
Validate.notBlank(theColumnName);
|
||||
DropColumnTask task = new DropColumnTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setColumnName(theColumnName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
((BaseTableTask<?>) theTask).setTableName(myTableName);
|
||||
mySink.addTask(theTask);
|
||||
}
|
||||
|
||||
public BuilderModifyColumnWithName modifyColumn(String theColumnName) {
|
||||
return new BuilderModifyColumnWithName(theColumnName);
|
||||
}
|
||||
|
||||
public BuilderAddForeignKey addForeignKey(String theForeignKeyName) {
|
||||
return new BuilderAddForeignKey(theForeignKeyName);
|
||||
}
|
||||
|
||||
public BuilderWithTableName renameColumn(String theVersion, String theOldName, String theNewName) {
|
||||
return renameColumn(theVersion, theOldName, theNewName, false, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param theOldName The old column name
|
||||
* @param theNewName The new column name
|
||||
* @param theAllowNeitherColumnToExist Setting this to true means that it's not an error if neither column exists
|
||||
* @param theDeleteTargetColumnFirstIfBothEixst Setting this to true causes the migrator to be ok with the target column existing. It will make sure that there is no data in the column with the new name, then delete it if so in order to make room for the renamed column. If there is data it will still bomb out.
|
||||
*/
|
||||
public BuilderWithTableName renameColumn(String theVersion, String theOldName, String theNewName, boolean theAllowNeitherColumnToExist, boolean theDeleteTargetColumnFirstIfBothEixst) {
|
||||
RenameColumnTask task = new RenameColumnTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setOldName(theOldName);
|
||||
task.setNewName(theNewName);
|
||||
task.setAllowNeitherColumnToExist(theAllowNeitherColumnToExist);
|
||||
task.setDeleteTargetColumnFirstIfBothExist(theDeleteTargetColumnFirstIfBothEixst);
|
||||
addTask(task);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param theFkName the name of the foreign key
|
||||
* @param theParentTableName the name of the table that exports the foreign key
|
||||
*/
|
||||
public void dropForeignKey(String theVersion, String theFkName, String theParentTableName) {
|
||||
DropForeignKeyTask task = new DropForeignKeyTask(myRelease, theVersion);
|
||||
task.setConstraintName(theFkName);
|
||||
task.setTableName(getTableName());
|
||||
task.setParentTableName(theParentTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public class BuilderAddIndexWithName {
|
||||
private final String myIndexName;
|
||||
|
||||
public BuilderAddIndexWithName(String theIndexName) {
|
||||
myIndexName = theIndexName;
|
||||
}
|
||||
|
||||
public BuilderAddIndexUnique unique(boolean theUnique) {
|
||||
return new BuilderAddIndexUnique(theUnique);
|
||||
}
|
||||
|
||||
public class BuilderAddIndexUnique {
|
||||
private final boolean myUnique;
|
||||
|
||||
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);
|
||||
task.setTableName(myTableName);
|
||||
task.setIndexName(myIndexName);
|
||||
task.setUnique(myUnique);
|
||||
task.setColumns(theColumnNames);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderModifyColumnWithName {
|
||||
|
||||
private final String myColumnName;
|
||||
|
||||
public BuilderModifyColumnWithName(String theColumnName) {
|
||||
myColumnName = theColumnName;
|
||||
}
|
||||
|
||||
public String getColumnName() {
|
||||
return myColumnName;
|
||||
}
|
||||
|
||||
public BuilderModifyColumnWithNameAndNullable nullable() {
|
||||
return new BuilderModifyColumnWithNameAndNullable(true);
|
||||
}
|
||||
|
||||
public BuilderModifyColumnWithNameAndNullable nonNullable() {
|
||||
return new BuilderModifyColumnWithNameAndNullable(false);
|
||||
}
|
||||
|
||||
public class BuilderModifyColumnWithNameAndNullable {
|
||||
|
||||
private final boolean myNullable;
|
||||
|
||||
public BuilderModifyColumnWithNameAndNullable(boolean theNullable) {
|
||||
myNullable = theNullable;
|
||||
}
|
||||
|
||||
public void withType(String theVersion, BaseTableColumnTypeTask.ColumnTypeEnum theColumnType) {
|
||||
withType(theVersion, theColumnType, null);
|
||||
}
|
||||
|
||||
public void withType(String theVersion, BaseTableColumnTypeTask.ColumnTypeEnum theColumnType, Integer theLength) {
|
||||
if (theColumnType == BaseTableColumnTypeTask.ColumnTypeEnum.STRING) {
|
||||
if (theLength == null || theLength == 0) {
|
||||
throw new IllegalArgumentException("Can not specify length 0 for column of type " + theColumnType);
|
||||
}
|
||||
} else {
|
||||
if (theLength != null) {
|
||||
throw new IllegalArgumentException("Can not specify length for column of type " + theColumnType);
|
||||
}
|
||||
}
|
||||
|
||||
ModifyColumnTask task = new ModifyColumnTask(myRelease, theVersion);
|
||||
task.setColumnName(myColumnName);
|
||||
task.setTableName(myTableName);
|
||||
if (theLength != null) {
|
||||
task.setColumnLength(theLength);
|
||||
}
|
||||
task.setNullable(myNullable);
|
||||
task.setColumnType(theColumnType);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderAddForeignKey {
|
||||
private final String myForeignKeyName;
|
||||
|
||||
public BuilderAddForeignKey(String theForeignKeyName) {
|
||||
myForeignKeyName = theForeignKeyName;
|
||||
}
|
||||
|
||||
public BuilderAddForeignKeyToColumn toColumn(String theColumnName) {
|
||||
return new BuilderAddForeignKeyToColumn(theColumnName);
|
||||
}
|
||||
|
||||
public class BuilderAddForeignKeyToColumn extends BuilderModifyColumnWithName {
|
||||
public BuilderAddForeignKeyToColumn(String theColumnName) {
|
||||
super(theColumnName);
|
||||
}
|
||||
|
||||
public void references(String theVersion, String theForeignTable, String theForeignColumn) {
|
||||
AddForeignKeyTask task = new AddForeignKeyTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setConstraintName(myForeignKeyName);
|
||||
task.setColumnName(getColumnName());
|
||||
task.setForeignTableName(theForeignTable);
|
||||
task.setForeignColumnName(theForeignColumn);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class BuilderAddColumnWithName {
|
||||
private final String myRelease;
|
||||
private final String myVersion;
|
||||
private final String myColumnName;
|
||||
private final IAcceptsTasks myTaskSink;
|
||||
|
||||
public BuilderAddColumnWithName(String theRelease, String theVersion, String theColumnName, IAcceptsTasks theTaskSink) {
|
||||
myRelease = theRelease;
|
||||
myVersion = theVersion;
|
||||
myColumnName = theColumnName;
|
||||
myTaskSink = theTaskSink;
|
||||
}
|
||||
|
||||
public BuilderAddColumnWithNameNullable nullable() {
|
||||
return new BuilderAddColumnWithNameNullable(myRelease, myVersion, true);
|
||||
}
|
||||
|
||||
public BuilderAddColumnWithNameNullable nonNullable() {
|
||||
return new BuilderAddColumnWithNameNullable(myRelease, myVersion, false);
|
||||
}
|
||||
|
||||
public class BuilderAddColumnWithNameNullable {
|
||||
private final boolean myNullable;
|
||||
private final String myRelease;
|
||||
private final String myVersion;
|
||||
|
||||
public BuilderAddColumnWithNameNullable(String theRelease, String theVersion, boolean theNullable) {
|
||||
myRelease = theRelease;
|
||||
myVersion = theVersion;
|
||||
myNullable = theNullable;
|
||||
}
|
||||
|
||||
public void type(AddColumnTask.ColumnTypeEnum theColumnType) {
|
||||
type(theColumnType, null);
|
||||
}
|
||||
|
||||
public void type(AddColumnTask.ColumnTypeEnum theColumnType, Integer theLength) {
|
||||
AddColumnTask task = new AddColumnTask(myRelease, myVersion);
|
||||
task.setColumnName(myColumnName);
|
||||
task.setNullable(myNullable);
|
||||
task.setColumnType(theColumnType);
|
||||
if (theLength != null) {
|
||||
task.setColumnLength(theLength);
|
||||
}
|
||||
myTaskSink.addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,363 @@
|
|||
package ca.uhn.fhir.jpa.migrate.tasks.api;
|
||||
|
||||
import ca.uhn.fhir.jpa.migrate.DriverTypeEnum;
|
||||
import ca.uhn.fhir.jpa.migrate.taskdef.*;
|
||||
import org.apache.commons.lang3.Validate;
|
||||
import org.intellij.lang.annotations.Language;
|
||||
|
||||
public class Builder {
|
||||
|
||||
private final String myRelease;
|
||||
private final BaseMigrationTasks.IAcceptsTasks mySink;
|
||||
|
||||
public Builder(String theRelease, BaseMigrationTasks.IAcceptsTasks theSink) {
|
||||
myRelease = theRelease;
|
||||
mySink = theSink;
|
||||
}
|
||||
|
||||
public BuilderWithTableName onTable(String theTableName) {
|
||||
return new BuilderWithTableName(myRelease, mySink, theTableName);
|
||||
}
|
||||
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
mySink.addTask(theTask);
|
||||
}
|
||||
|
||||
public BuilderAddTableRawSql addTableRawSql(String theVersion, String theTableName) {
|
||||
return new BuilderAddTableRawSql(theVersion, theTableName);
|
||||
}
|
||||
|
||||
public Builder executeRawSql(String theVersion, @Language("SQL") String theSql) {
|
||||
mySink.addTask(new ExecuteRawSqlTask(myRelease, theVersion).addSql(theSql));
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder executeRawSql(String theVersion, DriverTypeEnum theDriver, @Language("SQL") String theSql) {
|
||||
mySink.addTask(new ExecuteRawSqlTask(myRelease, theVersion).addSql(theDriver, theSql));
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder startSectionWithMessage(String theMessage) {
|
||||
Validate.notBlank(theMessage);
|
||||
addTask(new LogStartSectionWithMessageTask(theMessage));
|
||||
return this;
|
||||
}
|
||||
|
||||
public BuilderAddTableByColumns addTableByColumns(String theVersion, String theTableName, String thePkColumnName) {
|
||||
return new BuilderAddTableByColumns(myRelease, theVersion, mySink, theTableName, thePkColumnName);
|
||||
}
|
||||
|
||||
public void addIdGenerator(String theVersion, String theGeneratorName) {
|
||||
AddIdGeneratorTask task = new AddIdGeneratorTask(myRelease, theVersion, theGeneratorName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public void dropIdGenerator(String theVersion, String theIdGeneratorName) {
|
||||
DropIdGeneratorTask task = new DropIdGeneratorTask(myRelease, theVersion, theIdGeneratorName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public class BuilderAddTableRawSql {
|
||||
|
||||
private final AddTableRawSqlTask myTask;
|
||||
|
||||
protected BuilderAddTableRawSql(String theVersion, String theTableName) {
|
||||
myTask = new AddTableRawSqlTask(myRelease, theVersion);
|
||||
myTask.setTableName(theTableName);
|
||||
addTask(myTask);
|
||||
}
|
||||
|
||||
|
||||
public BuilderAddTableRawSql addSql(DriverTypeEnum theDriverTypeEnum, @Language("SQL") String theSql) {
|
||||
myTask.addSql(theDriverTypeEnum, theSql);
|
||||
return this;
|
||||
}
|
||||
|
||||
public void addSql(@Language("SQL") String theSql) {
|
||||
myTask.addSql(theSql);
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderAddTableByColumns extends BuilderWithTableName implements BaseMigrationTasks.IAcceptsTasks {
|
||||
private final String myVersion;
|
||||
private final AddTableByColumnTask myTask;
|
||||
|
||||
public BuilderAddTableByColumns(String theRelease, String theVersion, BaseMigrationTasks.IAcceptsTasks theSink, String theTableName, String thePkColumnName) {
|
||||
super(theRelease, theSink, theTableName);
|
||||
myVersion = theVersion;
|
||||
myTask = new AddTableByColumnTask(myRelease, theVersion);
|
||||
myTask.setTableName(theTableName);
|
||||
myTask.setPkColumn(thePkColumnName);
|
||||
theSink.addTask(myTask);
|
||||
}
|
||||
|
||||
public BuilderAddColumnWithName addColumn(String theColumnName) {
|
||||
return new BuilderAddColumnWithName(myRelease, myVersion, theColumnName, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
if (theTask instanceof AddColumnTask) {
|
||||
myTask.addAddColumnTask((AddColumnTask) theTask);
|
||||
} else {
|
||||
super.addTask(theTask);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class BuilderWithTableName implements BaseMigrationTasks.IAcceptsTasks {
|
||||
private final String myRelease;
|
||||
private final BaseMigrationTasks.IAcceptsTasks mySink;
|
||||
private final String myTableName;
|
||||
|
||||
public BuilderWithTableName(String theRelease, BaseMigrationTasks.IAcceptsTasks theSink, String theTableName) {
|
||||
myRelease = theRelease;
|
||||
mySink = theSink;
|
||||
myTableName = theTableName;
|
||||
}
|
||||
|
||||
public String getTableName() {
|
||||
return myTableName;
|
||||
}
|
||||
|
||||
public void dropIndex(String theVersion, String theIndexName) {
|
||||
DropIndexTask task = new DropIndexTask(myRelease, theVersion);
|
||||
task.setIndexName(theIndexName);
|
||||
task.setTableName(myTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public void dropThisTable(String theVersion) {
|
||||
DropTableTask task = new DropTableTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddIndexWithName addIndex(String theIndexName) {
|
||||
return new BuilderWithTableName.BuilderAddIndexWithName(theIndexName);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddColumnWithName addColumn(String theVersion, String theColumnName) {
|
||||
return new BuilderWithTableName.BuilderAddColumnWithName(myRelease, theVersion, theColumnName, this);
|
||||
}
|
||||
|
||||
public void dropColumn(String theVersion, String theColumnName) {
|
||||
Validate.notBlank(theColumnName);
|
||||
DropColumnTask task = new DropColumnTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setColumnName(theColumnName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTask(BaseTask<?> theTask) {
|
||||
((BaseTableTask<?>) theTask).setTableName(myTableName);
|
||||
mySink.addTask(theTask);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderModifyColumnWithName modifyColumn(String theColumnName) {
|
||||
return new BuilderWithTableName.BuilderModifyColumnWithName(theColumnName);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddForeignKey addForeignKey(String theForeignKeyName) {
|
||||
return new BuilderWithTableName.BuilderAddForeignKey(theForeignKeyName);
|
||||
}
|
||||
|
||||
public BuilderWithTableName renameColumn(String theVersion, String theOldName, String theNewName) {
|
||||
return renameColumn(theVersion, theOldName, theNewName, false, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param theOldName The old column name
|
||||
* @param theNewName The new column name
|
||||
* @param theAllowNeitherColumnToExist Setting this to true means that it's not an error if neither column exists
|
||||
* @param theDeleteTargetColumnFirstIfBothEixst Setting this to true causes the migrator to be ok with the target column existing. It will make sure that there is no data in the column with the new name, then delete it if so in order to make room for the renamed column. If there is data it will still bomb out.
|
||||
*/
|
||||
public BuilderWithTableName renameColumn(String theVersion, String theOldName, String theNewName, boolean theAllowNeitherColumnToExist, boolean theDeleteTargetColumnFirstIfBothEixst) {
|
||||
RenameColumnTask task = new RenameColumnTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setOldName(theOldName);
|
||||
task.setNewName(theNewName);
|
||||
task.setAllowNeitherColumnToExist(theAllowNeitherColumnToExist);
|
||||
task.setDeleteTargetColumnFirstIfBothExist(theDeleteTargetColumnFirstIfBothEixst);
|
||||
addTask(task);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param theFkName the name of the foreign key
|
||||
* @param theParentTableName the name of the table that exports the foreign key
|
||||
*/
|
||||
public void dropForeignKey(String theVersion, String theFkName, String theParentTableName) {
|
||||
DropForeignKeyTask task = new DropForeignKeyTask(myRelease, theVersion);
|
||||
task.setConstraintName(theFkName);
|
||||
task.setTableName(getTableName());
|
||||
task.setParentTableName(theParentTableName);
|
||||
addTask(task);
|
||||
}
|
||||
|
||||
public class BuilderAddIndexWithName {
|
||||
private final String myIndexName;
|
||||
|
||||
public BuilderAddIndexWithName(String theIndexName) {
|
||||
myIndexName = theIndexName;
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddIndexWithName.BuilderAddIndexUnique unique(boolean theUnique) {
|
||||
return new BuilderWithTableName.BuilderAddIndexWithName.BuilderAddIndexUnique(theUnique);
|
||||
}
|
||||
|
||||
public class BuilderAddIndexUnique {
|
||||
private final boolean myUnique;
|
||||
|
||||
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);
|
||||
task.setTableName(myTableName);
|
||||
task.setIndexName(myIndexName);
|
||||
task.setUnique(myUnique);
|
||||
task.setColumns(theColumnNames);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderModifyColumnWithName {
|
||||
|
||||
private final String myColumnName;
|
||||
|
||||
public BuilderModifyColumnWithName(String theColumnName) {
|
||||
myColumnName = theColumnName;
|
||||
}
|
||||
|
||||
public String getColumnName() {
|
||||
return myColumnName;
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderModifyColumnWithName.BuilderModifyColumnWithNameAndNullable nullable() {
|
||||
return new BuilderWithTableName.BuilderModifyColumnWithName.BuilderModifyColumnWithNameAndNullable(true);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderModifyColumnWithName.BuilderModifyColumnWithNameAndNullable nonNullable() {
|
||||
return new BuilderWithTableName.BuilderModifyColumnWithName.BuilderModifyColumnWithNameAndNullable(false);
|
||||
}
|
||||
|
||||
public class BuilderModifyColumnWithNameAndNullable {
|
||||
|
||||
private final boolean myNullable;
|
||||
|
||||
public BuilderModifyColumnWithNameAndNullable(boolean theNullable) {
|
||||
myNullable = theNullable;
|
||||
}
|
||||
|
||||
public void withType(String theVersion, BaseTableColumnTypeTask.ColumnTypeEnum theColumnType) {
|
||||
withType(theVersion, theColumnType, null);
|
||||
}
|
||||
|
||||
public void withType(String theVersion, BaseTableColumnTypeTask.ColumnTypeEnum theColumnType, Integer theLength) {
|
||||
if (theColumnType == BaseTableColumnTypeTask.ColumnTypeEnum.STRING) {
|
||||
if (theLength == null || theLength == 0) {
|
||||
throw new IllegalArgumentException("Can not specify length 0 for column of type " + theColumnType);
|
||||
}
|
||||
} else {
|
||||
if (theLength != null) {
|
||||
throw new IllegalArgumentException("Can not specify length for column of type " + theColumnType);
|
||||
}
|
||||
}
|
||||
|
||||
ModifyColumnTask task = new ModifyColumnTask(myRelease, theVersion);
|
||||
task.setColumnName(myColumnName);
|
||||
task.setTableName(myTableName);
|
||||
if (theLength != null) {
|
||||
task.setColumnLength(theLength);
|
||||
}
|
||||
task.setNullable(myNullable);
|
||||
task.setColumnType(theColumnType);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class BuilderAddForeignKey {
|
||||
private final String myForeignKeyName;
|
||||
|
||||
public BuilderAddForeignKey(String theForeignKeyName) {
|
||||
myForeignKeyName = theForeignKeyName;
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddForeignKey.BuilderAddForeignKeyToColumn toColumn(String theColumnName) {
|
||||
return new BuilderWithTableName.BuilderAddForeignKey.BuilderAddForeignKeyToColumn(theColumnName);
|
||||
}
|
||||
|
||||
public class BuilderAddForeignKeyToColumn extends BuilderWithTableName.BuilderModifyColumnWithName {
|
||||
public BuilderAddForeignKeyToColumn(String theColumnName) {
|
||||
super(theColumnName);
|
||||
}
|
||||
|
||||
public void references(String theVersion, String theForeignTable, String theForeignColumn) {
|
||||
AddForeignKeyTask task = new AddForeignKeyTask(myRelease, theVersion);
|
||||
task.setTableName(myTableName);
|
||||
task.setConstraintName(myForeignKeyName);
|
||||
task.setColumnName(getColumnName());
|
||||
task.setForeignTableName(theForeignTable);
|
||||
task.setForeignColumnName(theForeignColumn);
|
||||
addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class BuilderAddColumnWithName {
|
||||
private final String myRelease;
|
||||
private final String myVersion;
|
||||
private final String myColumnName;
|
||||
private final BaseMigrationTasks.IAcceptsTasks myTaskSink;
|
||||
|
||||
public BuilderAddColumnWithName(String theRelease, String theVersion, String theColumnName, BaseMigrationTasks.IAcceptsTasks theTaskSink) {
|
||||
myRelease = theRelease;
|
||||
myVersion = theVersion;
|
||||
myColumnName = theColumnName;
|
||||
myTaskSink = theTaskSink;
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddColumnWithName.BuilderAddColumnWithNameNullable nullable() {
|
||||
return new BuilderWithTableName.BuilderAddColumnWithName.BuilderAddColumnWithNameNullable(myRelease, myVersion, true);
|
||||
}
|
||||
|
||||
public BuilderWithTableName.BuilderAddColumnWithName.BuilderAddColumnWithNameNullable nonNullable() {
|
||||
return new BuilderWithTableName.BuilderAddColumnWithName.BuilderAddColumnWithNameNullable(myRelease, myVersion, false);
|
||||
}
|
||||
|
||||
public class BuilderAddColumnWithNameNullable {
|
||||
private final boolean myNullable;
|
||||
private final String myRelease;
|
||||
private final String myVersion;
|
||||
|
||||
public BuilderAddColumnWithNameNullable(String theRelease, String theVersion, boolean theNullable) {
|
||||
myRelease = theRelease;
|
||||
myVersion = theVersion;
|
||||
myNullable = theNullable;
|
||||
}
|
||||
|
||||
public void type(AddColumnTask.ColumnTypeEnum theColumnType) {
|
||||
type(theColumnType, null);
|
||||
}
|
||||
|
||||
public void type(AddColumnTask.ColumnTypeEnum theColumnType, Integer theLength) {
|
||||
AddColumnTask task = new AddColumnTask(myRelease, myVersion);
|
||||
task.setColumnName(myColumnName);
|
||||
task.setNullable(myNullable);
|
||||
task.setColumnType(theColumnType);
|
||||
if (theLength != null) {
|
||||
task.setColumnLength(theLength);
|
||||
}
|
||||
myTaskSink.addTask(task);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef;
|
|||
|
||||
import ca.uhn.fhir.jpa.migrate.JdbcUtils;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.BaseMigrationTasks;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.Builder;
|
||||
import ca.uhn.fhir.util.VersionEnum;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef;
|
|||
|
||||
import ca.uhn.fhir.jpa.migrate.JdbcUtils;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.BaseMigrationTasks;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.Builder;
|
||||
import ca.uhn.fhir.util.VersionEnum;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.migrate.taskdef;
|
|||
|
||||
import ca.uhn.fhir.jpa.migrate.JdbcUtils;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.BaseMigrationTasks;
|
||||
import ca.uhn.fhir.jpa.migrate.tasks.api.Builder;
|
||||
import ca.uhn.fhir.util.VersionEnum;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,5 +10,4 @@ public class HapiFhirJpaMigrationTasksTest {
|
|||
public void testCreate() {
|
||||
new HapiFhirJpaMigrationTasks(Collections.emptySet());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
package ca.uhn.fhir.jpa.migrate.tasks.api;
|
||||
|
||||
import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask;
|
||||
import ca.uhn.fhir.jpa.migrate.taskdef.DropTableTask;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
public class BaseMigrationTasksTest {
|
||||
static class MyMigrationTasks extends BaseMigrationTasks {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidateCorrectOrder() {
|
||||
MyMigrationTasks migrationTasks = new MyMigrationTasks();
|
||||
List<BaseTask<?>> tasks = new ArrayList<>();
|
||||
tasks.add(new DropTableTask("1", "20191029.1"));
|
||||
tasks.add(new DropTableTask("1", "20191029.2"));
|
||||
migrationTasks.validate(tasks);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidateVersionWrongOrder() {
|
||||
MyMigrationTasks migrationTasks = new MyMigrationTasks();
|
||||
List<BaseTask<?>> tasks = new ArrayList<>();
|
||||
tasks.add(new DropTableTask("1", "20191029.2"));
|
||||
tasks.add(new DropTableTask("1", "20191029.1"));
|
||||
try {
|
||||
migrationTasks.validate(tasks);
|
||||
fail();
|
||||
} catch (IllegalStateException e) {
|
||||
assertEquals("Migration version 1.20191029.1 found after migration version 1.20191029.2. Migrations need to be in order by version number.", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidateSameVersion() {
|
||||
MyMigrationTasks migrationTasks = new MyMigrationTasks();
|
||||
List<BaseTask<?>> tasks = new ArrayList<>();
|
||||
tasks.add(new DropTableTask("1", "20191029.1"));
|
||||
tasks.add(new DropTableTask("1", "20191029.1"));
|
||||
try {
|
||||
migrationTasks.validate(tasks);
|
||||
fail();
|
||||
} catch (IllegalStateException e) {
|
||||
assertEquals("Migration version 1.20191029.1 found after migration version 1.20191029.1. Migrations need to be in order by version number.", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidateWrongDateOrder() {
|
||||
MyMigrationTasks migrationTasks = new MyMigrationTasks();
|
||||
List<BaseTask<?>> tasks = new ArrayList<>();
|
||||
tasks.add(new DropTableTask("1", "20191029.1"));
|
||||
tasks.add(new DropTableTask("1", "20191028.1"));
|
||||
try {
|
||||
migrationTasks.validate(tasks);
|
||||
fail();
|
||||
} catch (IllegalStateException e) {
|
||||
assertEquals("Migration version 1.20191028.1 found after migration version 1.20191029.1. Migrations need to be in order by version number.", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue