name schema initializer to distinguish between different schemas

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

@@ -39,7 +39,7 @@ public class InitializeSchemaTask extends BaseTask<InitializeSchemaTask> {
 	public InitializeSchemaTask(String theProductVersion, String theSchemaVersion, ISchemaInitializationProvider theSchemaInitializationProvider) {
 		super(theProductVersion, theSchemaVersion);
 		mySchemaInitializationProvider = theSchemaInitializationProvider;
-		setDescription("Initialize schema");
+		setDescription("Initialize schema for " + theSchemaInitializationProvider.getDescription());
 	}
 
 	@Override

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

@@ -875,7 +875,7 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
 	private void init330() { // 20180114 - 20180329
 		Builder version = forVersion(VersionEnum.V3_3_0);
 
-		version.initializeSchema("20180115.0", new SchemaInitializationProvider("/ca/uhn/hapi/fhir/jpa/docs/database", "HFJ_RESOURCE"));
+		version.initializeSchema("20180115.0", new SchemaInitializationProvider("HAPI-FHIR", "/ca/uhn/hapi/fhir/jpa/docs/database", "HFJ_RESOURCE"));
 
 		Builder.BuilderWithTableName hfjResource = version.onTable("HFJ_RESOURCE");
 		version.startSectionWithMessage("Starting work on table: " + hfjResource.getTableName());

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

@@ -38,15 +38,17 @@ import java.util.regex.Pattern;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 public class SchemaInitializationProvider implements ISchemaInitializationProvider {
-	private static final Pattern ourTrailingCommaPattern = Pattern.compile(",(\\s+)\\)");
+	private final String mySchemaDescription;
 	private final String mySchemaFileClassPath;
 	private final String mySchemaExistsIndicatorTable;
 
 	/**
+	 * @param theSchemaDescription description of the schema being updated (for logging)
 	 * @param theSchemaFileClassPath        pathname to script used to initialize schema
 	 * @param theSchemaExistsIndicatorTable a table name we can use to determine if this schema has already been initialized
 	 */
-	public SchemaInitializationProvider(String theSchemaFileClassPath, String theSchemaExistsIndicatorTable) {
+	public SchemaInitializationProvider(String theSchemaDescription, String theSchemaFileClassPath, String theSchemaExistsIndicatorTable) {
+		mySchemaDescription = theSchemaDescription;
 		mySchemaFileClassPath = theSchemaFileClassPath;
 		mySchemaExistsIndicatorTable = theSchemaExistsIndicatorTable;
 	}
@@ -75,13 +77,19 @@ public class SchemaInitializationProvider implements ISchemaInitializationProvid
 		return retval;
 	}
 
+	private static final Pattern ourTrailingCommaPattern = Pattern.compile(",(\\s+)\\)");
+
 	static String clean(String theStatement) {
-		// Remove commas before brackets.  Some databases don't like this and
+		// Remove commas before brackets.  The Quartz h2 schema has a comma before a closing bracket that fails to execute...
-		// some schemas shipped with Quartz include them
 		Matcher matcher = ourTrailingCommaPattern.matcher(theStatement);
 		return matcher.replaceAll("$1\\)");
 	}
 
+	@Override
+	public String getDescription() {
+		return mySchemaDescription;
+	}
+
 	@Nonnull
 	protected String getInitScript(DriverTypeEnum theDriverType) {
 		return theDriverType.getSchemaFilename();

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

@@ -28,4 +28,6 @@ public interface ISchemaInitializationProvider {
 	List<String> getSqlStatements(DriverTypeEnum theDriverType);
 
 	String getSchemaExistsIndicatorTable();
+
+	String getDescription();
 }

hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTaskTest.java

@@ -40,6 +40,11 @@ public class InitializeSchemaTaskTest extends BaseTest {
 			return "DONT_MATCH_ME";
 		}
 
+		@Override
+		public String getDescription() {
+			return "test";
+		}
+
 		@Override
 		public boolean equals(Object theO) {
 			if (this == theO) return true;