honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix index migration error (#4365) 

* fix index migration error

* add exception to duplicateNameValidationExceptionList

* - change index name to match convention
- drop old index h2 automatically created

* Revert "- change index name to match convention"

This reverts commit 59f35a1891.

Co-authored-by: nathaniel.doef <nathaniel.doef@smilecdr.com>
This commit is contained in:
Nathan Doef 2022-12-14 12:40:53 -05:00 committed by GitHub
parent 01b1074808
commit 360f32f3e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -103,10 +103,11 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
// Add new Index to HFJ_SEARCH_INCLUDE on SEARCH_PID // Add new Index to HFJ_SEARCH_INCLUDE on SEARCH_PID
version version
.onTable("HFJ_SEARCH_INCLUDE") .onTable("HFJ_SEARCH_INCLUDE")
.addIndex("20221207.1", "IDX_HFJ_SEARCH_INCLUDE_SRCHPID") .addIndex("20221207.1", "FK_SEARCHINC_SEARCH")
.unique(false) .unique(false)
.online(true) .online(true)
.withColumns("SEARCH_PID"); .withColumns("SEARCH_PID")
.onlyAppliesToPlatforms(NON_AUTOMATIC_FK_INDEX_PLATFORMS);
} }
private void init620() { private void init620() {