- change index name to match convention

- drop old index h2 automatically created

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

@@ -85,8 +85,7 @@ public class TestUtil {
 		"FK_CONCEPTDESIG_CONCEPT",
 		"FK_TERM_CONCEPTPC_CHILD",
 		"FK_TERM_CONCEPTPC_PARENT",
-		"FK_TRM_VALUESET_CONCEPT_PID",
-		"FK_SEARCHINC_SEARCH"
+		"FK_TRM_VALUESET_CONCEPT_PID"
 	);
 
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SearchInclude.java

@@ -37,7 +37,7 @@ import javax.persistence.Table;
 //@formatter:off
 @Entity
 @Table(name = "HFJ_SEARCH_INCLUDE", indexes = {
-	@Index(name = "FK_SEARCHINC_SEARCH", columnList = "SEARCH_PID")
+	@Index(name = "IDX_HFJ_SEARCH_INCLUDE_SRCHPID", columnList = "SEARCH_PID")
 })
 //@formatter:on
 public class SearchInclude implements Serializable {

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

@@ -103,11 +103,18 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
 		// Add new Index to HFJ_SEARCH_INCLUDE on SEARCH_PID
 		version
 			.onTable("HFJ_SEARCH_INCLUDE")
-			.addIndex("20221207.1", "FK_SEARCHINC_SEARCH")
+			.addIndex("20221207.1", "IDX_HFJ_SEARCH_INCLUDE_SRCHPID")
 			.unique(false)
 			.online(true)
-			.withColumns("SEARCH_PID")
-			.onlyAppliesToPlatforms(NON_AUTOMATIC_FK_INDEX_PLATFORMS);
+			.withColumns("SEARCH_PID");
+
+		// We are explicitly dropping the index FK_SEARCHINC_SEARCH. This index was automatically created on the
+		// SEARCH_PID column by H2 because it is a foreign key. It is no longer needed since IDX_HFJ_SEARCH_INCLUDE_SRCHPID
+		// is added above.
+		version
+			.onTable("HFJ_SEARCH_INCLUDE")
+			.dropIndex("20221207.2", "FK_SEARCHINC_SEARCH")
+			.failureAllowed();
 	}
 
 	private void init620() {