added final String release field to migration BaseTask

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigration.java

@@ -22,7 +22,7 @@ public class FlywayMigration implements JavaMigration {
 
 	@Override
 	public MigrationVersion getVersion() {
-		return MigrationVersion.fromVersion(myTask.getVersion());
+		return MigrationVersion.fromVersion(myTask.getFlywayVersion());
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddColumnTask.java

@@ -31,6 +31,15 @@ public class AddColumnTask extends BaseTableColumnTypeTask<AddColumnTask> {
 
 	private static final Logger ourLog = LoggerFactory.getLogger(AddColumnTask.class);
 
+	/**
+	 * Constructor
+	 *
+	 * @param theRelease
+	 * @param theVersion
+	 */
+	public AddColumnTask(String theRelease, String theVersion) {
+		super(theRelease, theVersion);
+	}
 
 	@Override
 	public void execute() throws SQLException {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java

@@ -37,8 +37,8 @@ public class AddForeignKeyTask extends BaseTableColumnTask<AddForeignKeyTask> {
 	private String myForeignTableName;
 	private String myForeignColumnName;
 
-	public AddForeignKeyTask(String theVersion) {
+	public AddForeignKeyTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void setConstraintName(String theConstraintName) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIdGeneratorTask.java

@@ -36,8 +36,8 @@ public class AddIdGeneratorTask extends BaseTask<AddIdGeneratorTask> {
 	private static final Logger ourLog = LoggerFactory.getLogger(AddIdGeneratorTask.class);
 	private final String myGeneratorName;
 
-	public AddIdGeneratorTask(String theVersion, String theGeneratorName) {
+	public AddIdGeneratorTask(String theRelease, String theVersion, String theGeneratorName) {
-		super(theVersion);
+		super(theRelease, theVersion);
 		myGeneratorName = theGeneratorName;
 	}
 

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddIndexTask.java

@@ -39,8 +39,8 @@ public class AddIndexTask extends BaseTableTask<AddIndexTask> {
 	private List<String> myColumns;
 	private Boolean myUnique;
 
-	public AddIndexTask(String theVersion) {
+	public AddIndexTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void setIndexName(String theIndexName) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableByColumnTask.java

@@ -36,8 +36,8 @@ public class AddTableByColumnTask extends BaseTableTask<AddTableByColumnTask> {
 	private List<AddColumnTask> myAddColumnTasks = new ArrayList<>();
 	private String myPkColumn;
 
-	public AddTableByColumnTask(String theVersion) {
+	public AddTableByColumnTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void addAddColumnTask(AddColumnTask theTask) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddTableRawSqlTask.java

@@ -37,8 +37,8 @@ public class AddTableRawSqlTask extends BaseTableTask<AddTableRawSqlTask> {
 	private Map<DriverTypeEnum, List<String>> myDriverToSqls = new HashMap<>();
 	private List<String> myDriverNeutralSqls = new ArrayList<>();
 
-	public AddTableRawSqlTask(String theVersion) {
+	public AddTableRawSqlTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void addSql(DriverTypeEnum theDriverType, @Language("SQL") String theSql) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ArbitrarySqlTask.java

@@ -44,8 +44,8 @@ public class ArbitrarySqlTask extends BaseTask<ArbitrarySqlTask> {
 	private String myExecuteOnlyIfTableExists;
 	private List<TableAndColumn> myConditionalOnExistenceOf = new ArrayList<>();
 
-	public ArbitrarySqlTask(String theVersion, String theTableName, String theDescription) {
+	public ArbitrarySqlTask(String theRelease, String theVersion, String theTableName, String theDescription) {
-		super(theVersion);
+		super(theRelease, theVersion);
 		myTableName = theTableName;
 		myDescription = theDescription;
 	}

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTask.java

@@ -29,8 +29,8 @@ public abstract class BaseTableColumnTask<T extends BaseTableTask> extends BaseT
 
 	private String myColumnName;
 
-	public BaseTableColumnTask(String theVersion) {
+	public BaseTableColumnTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@SuppressWarnings("unchecked")

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableColumnTypeTask.java

@@ -39,8 +39,8 @@ public abstract class BaseTableColumnTypeTask<T extends BaseTableTask> extends B
 	 * Constructor
 	 */
 
-	public BaseTableColumnTypeTask(String theVersion) {
+	public BaseTableColumnTypeTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 		setColumnType(ColumnTypeEnum.INT, DriverTypeEnum.H2_EMBEDDED, "integer");
 		setColumnType(ColumnTypeEnum.INT, DriverTypeEnum.DERBY_EMBEDDED, "integer");
 		setColumnType(ColumnTypeEnum.INT, DriverTypeEnum.MARIADB_10_1, "integer");

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTableTask.java

@@ -25,8 +25,8 @@ import org.apache.commons.lang3.Validate;
 public abstract class BaseTableTask<T extends BaseTableTask> extends BaseTask {
 	private String myTableName;
 
-	public BaseTableTask(String theVersion) {
+	public BaseTableTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public String getTableName() {

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

@@ -43,10 +43,12 @@ public abstract class BaseTask<T extends BaseTask> {
 	private boolean myDryRun;
 	private List<ExecutedStatement> myExecutedStatements = new ArrayList<>();
 	private boolean myNoColumnShrink;
-	private final String version;
+	private final String myRelease;
+	private final String myVersion;
 
-	protected BaseTask(String theVersion) {
+	protected BaseTask(String theRelease, String theVersion) {
-		version = theVersion;
+		myRelease = theRelease;
+		myVersion = theVersion;
 	}
 
 	public boolean isNoColumnShrink() {
@@ -135,8 +137,8 @@ public abstract class BaseTask<T extends BaseTask> {
 
 	public abstract void execute() throws SQLException;
 
-	public String getVersion() {
+	public String getFlywayVersion() {
-		return version;
+		return myRelease + "." + myVersion;
 	}
 
 	public static class ExecutedStatement {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/CalculateHashesTask.java

@@ -53,8 +53,8 @@ public class CalculateHashesTask extends BaseTableColumnTask<CalculateHashesTask
 	/**
 	 * Constructor
 	 */
-	public CalculateHashesTask(String theVersion) {
+	public CalculateHashesTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropColumnTask.java

@@ -32,8 +32,8 @@ public class DropColumnTask extends BaseTableColumnTask<DropColumnTask> {
 
 	private static final Logger ourLog = LoggerFactory.getLogger(DropColumnTask.class);
 
-	public DropColumnTask(String theVersion) {
+	public DropColumnTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropForeignKeyTask.java

@@ -40,8 +40,8 @@ public class DropForeignKeyTask extends BaseTableTask<DropForeignKeyTask> {
 	private String myConstraintName;
 	private String myParentTableName;
 
-	public DropForeignKeyTask(String theVersion) {
+	public DropForeignKeyTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void setConstraintName(String theConstraintName) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIdGeneratorTask.java

@@ -36,8 +36,8 @@ public class DropIdGeneratorTask extends BaseTask<DropIdGeneratorTask> {
 	private static final Logger ourLog = LoggerFactory.getLogger(DropIdGeneratorTask.class);
 	private final String myGeneratorName;
 
-	public DropIdGeneratorTask(String theVersion, String theGeneratorName) {
+	public DropIdGeneratorTask(String theRelease, String theVersion, String theGeneratorName) {
-		super(theVersion);
+		super(theRelease, theVersion);
 		myGeneratorName = theGeneratorName;
 	}
 

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java

@@ -35,8 +35,8 @@ public class DropIndexTask extends BaseTableTask<DropIndexTask> {
 	private static final Logger ourLog = LoggerFactory.getLogger(DropIndexTask.class);
 	private String myIndexName;
 
-	public DropIndexTask(String theVersion) {
+	public DropIndexTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropTableTask.java

@@ -33,8 +33,8 @@ public class DropTableTask extends BaseTableTask<DropTableTask> {
 
 	private static final Logger ourLog = LoggerFactory.getLogger(DropTableTask.class);
 
-	public DropTableTask(String theVersion) {
+	public DropTableTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ExecuteRawSqlTask.java

@@ -34,8 +34,8 @@ public class ExecuteRawSqlTask extends BaseTask<ExecuteRawSqlTask> {
 	private Map<DriverTypeEnum, List<String>> myDriverToSqls = new HashMap<>();
 	private List<String> myDriverNeutralSqls = new ArrayList<>();
 
-	public ExecuteRawSqlTask(String theVersion) {
+	public ExecuteRawSqlTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public ExecuteRawSqlTask addSql(DriverTypeEnum theDriverType, @Language("SQL") String theSql) {

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/LogStartSectionWithMessageTask.java

@@ -28,8 +28,8 @@ public class LogStartSectionWithMessageTask extends BaseTask {
 	private static final Logger ourLog = LoggerFactory.getLogger(LogStartSectionWithMessageTask.class);
 	private final String myMessage;
 
-	public LogStartSectionWithMessageTask(String theVersion, String theMessage) {
+	public LogStartSectionWithMessageTask(String theRelease, String theVersion, String theMessage) {
-		super(theVersion);
+		super(theRelease, theVersion);
 		myMessage = theMessage;
 	}
 

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTask.java

@@ -37,8 +37,8 @@ public class ModifyColumnTask extends BaseTableColumnTypeTask<ModifyColumnTask>
 	 *
 	 * @param theVersion
 	 */
-	public ModifyColumnTask(String theVersion) {
+	public ModifyColumnTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	@Override

hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/RenameColumnTask.java

@@ -38,8 +38,8 @@ public class RenameColumnTask extends BaseTableTask<RenameColumnTask> {
 	private boolean myAllowNeitherColumnToExist;
 	private boolean myDeleteTargetColumnFirstIfBothExist;
 
-	public RenameColumnTask(String theVersion) {
+	public RenameColumnTask(String theRelease, String theVersion) {
-		super(theVersion);
+		super(theRelease, theVersion);
 	}
 
 	public void setDeleteTargetColumnFirstIfBothExist(boolean theDeleteTargetColumnFirstIfBothExist) {

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

@@ -60,12 +60,12 @@ public class BaseMigrationTasks<T extends Enum> {
 		return retVal;
 	}
 
-	public Builder forVersion(T theVersion) {
+	public Builder forVersion(T theRelease) {
 		IAcceptsTasks sink = theTask -> {
 			theTask.validate();
-			myTasks.put(theVersion, theTask);
+			myTasks.put(theRelease, theTask);
 		};
-		return new Builder(sink);
+		return new Builder(theRelease.name(), sink);
 	}
 
 	public interface IAcceptsTasks {
@@ -74,14 +74,16 @@ public class BaseMigrationTasks<T extends Enum> {
 
 	public static class Builder {
 
+		private final String myRelease;
 		private final IAcceptsTasks mySink;
 
-		public Builder(IAcceptsTasks theSink) {
+		public Builder(String theRelease, IAcceptsTasks theSink) {
+			myRelease = theRelease;
 			mySink = theSink;
 		}
 
 		public BuilderWithTableName onTable(String theTableName) {
-			return new BuilderWithTableName(mySink, theTableName);
+			return new BuilderWithTableName(myRelease, mySink, theTableName);
 		}
 
 		public void addTask(BaseTask<?> theTask) {
@@ -93,32 +95,32 @@ public class BaseMigrationTasks<T extends Enum> {
 		}
 
 		public Builder executeRawSql(String theVersion, @Language("SQL") String theSql) {
-			mySink.addTask(new ExecuteRawSqlTask(theVersion).addSql(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(theVersion).addSql(theDriver, theSql));
+			mySink.addTask(new ExecuteRawSqlTask(myRelease, theVersion).addSql(theDriver, theSql));
 			return this;
 		}
 
 		public Builder startSectionWithMessage(String theMessage) {
 			Validate.notBlank(theMessage);
-			addTask(new LogStartSectionWithMessageTask("log message", theMessage));
+			addTask(new LogStartSectionWithMessageTask(myRelease, "log message", theMessage));
 			return this;
 		}
 
 		public BuilderAddTableByColumns addTableByColumns(String theVersion, String theTableName, String thePkColumnName) {
-			return new BuilderAddTableByColumns(theVersion, mySink, theTableName, thePkColumnName);
+			return new BuilderAddTableByColumns(myRelease, theVersion, mySink, theTableName, thePkColumnName);
 		}
 
 		public void addIdGenerator(String theVersion, String theGeneratorName) {
-			AddIdGeneratorTask task = new AddIdGeneratorTask(theVersion, theGeneratorName);
+			AddIdGeneratorTask task = new AddIdGeneratorTask(myRelease, theVersion, theGeneratorName);
 			addTask(task);
 		}
 
 		public void dropIdGenerator(String theVersion, String theIdGeneratorName) {
-			DropIdGeneratorTask task = new DropIdGeneratorTask(theVersion, theIdGeneratorName);
+			DropIdGeneratorTask task = new DropIdGeneratorTask(myRelease, theVersion, theIdGeneratorName);
 			addTask(task);
 		}
 
@@ -127,7 +129,7 @@ public class BaseMigrationTasks<T extends Enum> {
 			private final AddTableRawSqlTask myTask;
 
 			protected BuilderAddTableRawSql(String theVersion, String theTableName) {
-				myTask = new AddTableRawSqlTask(theVersion);
+				myTask = new AddTableRawSqlTask(myRelease, theVersion);
 				myTask.setTableName(theTableName);
 				addTask(myTask);
 			}
@@ -146,17 +148,17 @@ public class BaseMigrationTasks<T extends Enum> {
 		public class BuilderAddTableByColumns extends BuilderWithTableName implements IAcceptsTasks {
 			private final AddTableByColumnTask myTask;
 
-			public BuilderAddTableByColumns(String theVersion, IAcceptsTasks theSink, String theTableName, String thePkColumnName) {
+			public BuilderAddTableByColumns(String theRelease, String theVersion, IAcceptsTasks theSink, String theTableName, String thePkColumnName) {
-				super(theSink, theTableName);
+				super(theRelease, theSink, theTableName);
-				myTask = new AddTableByColumnTask(theVersion);
+				myTask = new AddTableByColumnTask(myRelease, theVersion);
 				myTask.setTableName(theTableName);
 				myTask.setPkColumn(thePkColumnName);
 				theSink.addTask(myTask);
 			}
 
 			@Override
-			public BuilderWithTableName.BuilderAddColumnWithName addColumn(String theColumnName) {
+			public BuilderWithTableName.BuilderAddColumnWithName addColumn(String theVersion, String theColumnName) {
-				return new BuilderWithTableName.BuilderAddColumnWithName(theColumnName, this);
+				return new BuilderWithTableName.BuilderAddColumnWithName(myRelease, theVersion, theColumnName, this);
 			}
 
 			@Override
@@ -170,10 +172,12 @@ public class BaseMigrationTasks<T extends Enum> {
 		}
 
 		public static class BuilderWithTableName implements IAcceptsTasks {
-			private final String myTableName;
+			private final String myRelease;
 			private final IAcceptsTasks mySink;
+			private final String myTableName;
 
-			public BuilderWithTableName(IAcceptsTasks theSink, String theTableName) {
+			public BuilderWithTableName(String theRelease, IAcceptsTasks theSink, String theTableName) {
+				myRelease = theRelease;
 				mySink = theSink;
 				myTableName = theTableName;
 			}
@@ -183,14 +187,14 @@ public class BaseMigrationTasks<T extends Enum> {
 			}
 
 			public void dropIndex(String theVersion, String theIndexName) {
-				DropIndexTask task = new DropIndexTask(theVersion);
+				DropIndexTask task = new DropIndexTask(myRelease, theVersion);
 				task.setIndexName(theIndexName);
 				task.setTableName(myTableName);
 				addTask(task);
 			}
 
 			public void dropThisTable(String theVersion) {
-				DropTableTask task = new DropTableTask(theVersion);
+				DropTableTask task = new DropTableTask(myRelease, theVersion);
 				task.setTableName(myTableName);
 				addTask(task);
 			}
@@ -199,13 +203,13 @@ public class BaseMigrationTasks<T extends Enum> {
 				return new BuilderAddIndexWithName(theIndexName);
 			}
 
-			public BuilderAddColumnWithName addColumn(String theColumnName) {
+			public BuilderAddColumnWithName addColumn(String theVersion, String theColumnName) {
-				return new BuilderAddColumnWithName(theColumnName, this);
+				return new BuilderAddColumnWithName(myRelease, theVersion, theColumnName, this);
 			}
 
 			public void dropColumn(String theVersion, String theColumnName) {
 				Validate.notBlank(theColumnName);
-				DropColumnTask task = new DropColumnTask(theVersion);
+				DropColumnTask task = new DropColumnTask(myRelease, theVersion);
 				task.setTableName(myTableName);
 				task.setColumnName(theColumnName);
 				addTask(task);
@@ -236,7 +240,7 @@ public class BaseMigrationTasks<T extends Enum> {
 			 * @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(theVersion);
+				RenameColumnTask task = new RenameColumnTask(myRelease, theVersion);
 				task.setTableName(myTableName);
 				task.setOldName(theOldName);
 				task.setNewName(theNewName);
@@ -252,7 +256,7 @@ public class BaseMigrationTasks<T extends Enum> {
 			 * @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(theVersion);
+				DropForeignKeyTask task = new DropForeignKeyTask(myRelease, theVersion);
 				task.setConstraintName(theFkName);
 				task.setTableName(getTableName());
 				task.setParentTableName(theParentTableName);
@@ -278,7 +282,7 @@ public class BaseMigrationTasks<T extends Enum> {
 					}
 
 					public void withColumns(String theVersion, String... theColumnNames) {
-						AddIndexTask task = new AddIndexTask(theVersion);
+						AddIndexTask task = new AddIndexTask(myRelease, theVersion);
 						task.setTableName(myTableName);
 						task.setIndexName(myIndexName);
 						task.setUnique(myUnique);
@@ -331,7 +335,7 @@ public class BaseMigrationTasks<T extends Enum> {
 							}
 						}
 
-						ModifyColumnTask task = new ModifyColumnTask(theVersion);
+						ModifyColumnTask task = new ModifyColumnTask(myRelease, theVersion);
 						task.setColumnName(myColumnName);
 						task.setTableName(myTableName);
 						if (theLength != null) {
@@ -361,7 +365,7 @@ public class BaseMigrationTasks<T extends Enum> {
 					}
 
 					public void references(String theVersion, String theForeignTable, String theForeignColumn) {
-						AddForeignKeyTask task = new AddForeignKeyTask(theVersion);
+						AddForeignKeyTask task = new AddForeignKeyTask(myRelease, theVersion);
 						task.setTableName(myTableName);
 						task.setConstraintName(myForeignKeyName);
 						task.setColumnName(getColumnName());
@@ -373,26 +377,34 @@ public class BaseMigrationTasks<T extends Enum> {
 			}
 
 			public static class BuilderAddColumnWithName {
+				private final String myRelease;
+				private final String myVersion;
 				private final String myColumnName;
 				private final IAcceptsTasks myTaskSink;
 
-				public BuilderAddColumnWithName(String theColumnName, IAcceptsTasks theTaskSink) {
+				public BuilderAddColumnWithName(String theRelease, String theVersion, String theColumnName, IAcceptsTasks theTaskSink) {
+					myRelease = theRelease;
+					myVersion = theVersion;
 					myColumnName = theColumnName;
 					myTaskSink = theTaskSink;
 				}
 
 				public BuilderAddColumnWithNameNullable nullable() {
-					return new BuilderAddColumnWithNameNullable(true);
+					return new BuilderAddColumnWithNameNullable(myRelease, myVersion, true);
 				}
 
 				public BuilderAddColumnWithNameNullable nonNullable() {
-					return new BuilderAddColumnWithNameNullable(false);
+					return new BuilderAddColumnWithNameNullable(myRelease, myVersion, false);
 				}
 
 				public class BuilderAddColumnWithNameNullable {
 					private final boolean myNullable;
+					private final String myRelease;
+					private final String myVersion;
 
-					public BuilderAddColumnWithNameNullable(boolean theNullable) {
+					public BuilderAddColumnWithNameNullable(String theRelease, String theVersion, boolean theNullable) {
+						myRelease = theRelease;
+						myVersion = theVersion;
 						myNullable = theNullable;
 					}
 
@@ -401,7 +413,7 @@ public class BaseMigrationTasks<T extends Enum> {
 					}
 
 					public void type(AddColumnTask.ColumnTypeEnum theColumnType, Integer theLength) {
-						AddColumnTask task = new AddColumnTask();
+						AddColumnTask task = new AddColumnTask(myRelease, myVersion);
 						task.setColumnName(myColumnName);
 						task.setNullable(myNullable);
 						task.setColumnType(theColumnType);