Merge pull request #3013 from hapifhir/jr-20210921-mssql-data-migration

Fix MS SQLServer database migration

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_6_0/3012-mssql-database-migration.yaml

@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 3012
+title: "Fixes migration of VARBINARY columns on MS SQLServer."

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java

@@ -220,6 +220,14 @@ public class TestUtil {
 
 		}
 
+		for (Class<?> innerClass : theClazz.getDeclaredClasses()) {
+			Embeddable embeddable = innerClass.getAnnotation(Embeddable.class);
+			if (embeddable != null) {
+				scanClassOrSuperclass(theNames, innerClass, false, columnNameToLength);
+			}
+
+		}
+
 		if (theClazz.getSuperclass().equals(Object.class)) {
 			return;
 		}

hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java

@@ -185,6 +185,13 @@ public class JdbcUtils {
 								return new ColumnType(ColumnTypeEnum.DATE_TIMESTAMP, length);
 							case Types.BLOB:
 								return new ColumnType(ColumnTypeEnum.BLOB, length);
+							case Types.VARBINARY:
+								if (DriverTypeEnum.MSSQL_2012.equals(theConnectionProperties.getDriverType())) {
+									// MS SQLServer seems to be mapping BLOB to VARBINARY under the covers, so we need to reverse that mapping
+									return new ColumnType(ColumnTypeEnum.BLOB, length);
+								} else {
+									throw new IllegalArgumentException("Don't know how to handle datatype " + dataType + " for column " + theColumnName + " on table " + theTableName);
+								}
 							case Types.CLOB:
 								return new ColumnType(ColumnTypeEnum.CLOB, length);
 							case Types.DOUBLE:

hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java

@@ -526,6 +526,11 @@ public class Builder {
 				super.addTask(theTask);
 			}
 		}
+
+		public BuilderAddTableByColumns failureAllowed() {
+			myTask.setFailureAllowed(true);
+			return this;
+		}
 	}
 
 }