7790: move db migration steps to correct method (#7188)

Author: another-luis

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

@@ -130,15 +130,6 @@ public HapiFhirJpaMigrationTasks(Set<String> theFlags) {
 		init780();
 		init820();
 		init840();
-		init860();
-	}
-
-	protected void init860() {
-		Builder version = forVersion(VersionEnum.V8_4_0);
-		{
-			version.onTable("HFJ_RESOURCE_MODIFIED").dropPrimaryKey("20250729.1");
-			version.onTable("HFJ_RESOURCE_MODIFIED").addPrimaryKey("20250729.2", "RES_ID", "RES_VER", "RESOURCE_TYPE");
-		}
 	}
 
 	protected void init840() {
@@ -177,6 +168,10 @@ protected void init840() {
 			Builder.BuilderWithTableName resLink = version.onTable("HFJ_RES_LINK");
 			resLink.addColumn("20250515.501", "SRC_RES_TYPE_ID").nullable().type(ColumnTypeEnum.SMALLINT);
 			resLink.addColumn("20250515.502", "TARGET_RES_TYPE_ID").nullable().type(ColumnTypeEnum.SMALLINT);
+
+			// Add RESOURCE_TYPE to the HFJ_RESOURCE_MODIFIED primary key
+			version.onTable("HFJ_RESOURCE_MODIFIED").dropPrimaryKey("20250729.1");
+			version.onTable("HFJ_RESOURCE_MODIFIED").addPrimaryKey("20250729.2", "RES_ID", "RES_VER", "RESOURCE_TYPE");
 		}
 	}