From a01d6cf302ca7c26cbe1df40adf838261990e23f Mon Sep 17 00:00:00 2001 From: "Graham, Gary" Date: Wed, 12 Dec 2018 21:00:41 -0500 Subject: [PATCH 1/2] Add init330() to migrate from 2.5 -> 3.3 --- .../java/ca/uhn/fhir/util/VersionEnum.java | 6 ++++-- .../tasks/HapiFhirJpaMigrationTasks.java | 19 +++++++++++++++++++ .../migrate/tasks/api/BaseMigrationTasks.java | 2 -- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java index 73fd6e72385..8ffe21b7cfb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java @@ -21,11 +21,13 @@ package ca.uhn.fhir.util; */ public enum VersionEnum { - + V2_5_0, + V3_0_0, + V3_1_0, + V3_2_0, V3_3_0, V3_4_0, V3_5_0, V3_6_0, V3_7_0 - } diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java index 45d1e68c19a..ce582631ce7 100644 --- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java +++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java @@ -49,11 +49,14 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks { .map(FlagEnum::fromCommandLineValue) .collect(Collectors.toSet()); + init330(); init340(); init350(); init360(); } + + private void init360() { Builder version = forVersion(VersionEnum.V3_6_0); @@ -542,6 +545,22 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks { } + private void init330() { + Builder version = forVersion(VersionEnum.V3_3_0); + + Builder.BuilderWithTableName hfjResource = version.onTable("HFJ_RESOURCE"); + version.startSectionWithMessage("Starting work on table: " + hfjResource.getTableName()); + hfjResource.dropColumn("RES_TEXT"); + hfjResource.dropColumn("RES_ENCODING"); + + Builder.BuilderWithTableName hfjResVer = version.onTable("HFJ_RESOURCE"); + version.startSectionWithMessage("Starting work on table: " + hfjResVer.getTableName()); + hfjResVer.modifyColumn("RES_ENCODING") + .nullable(); + hfjResVer.modifyColumn("RES_TEXT") + .nullable(); + } + public enum FlagEnum { NO_MIGRATE_HASHES("no-migrate-350-hashes"); diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java index 7d1ef93e595..784d1fa922e 100644 --- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java +++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/BaseMigrationTasks.java @@ -279,9 +279,7 @@ public class BaseMigrationTasks { task.setNullable(myNullable); task.setColumnType(theColumnType); addTask(task); - } - } } From 4fea74cfa28a260efcf0331c36991f250377162c Mon Sep 17 00:00:00 2001 From: "Graham, Gary" Date: Thu, 13 Dec 2018 00:49:17 -0500 Subject: [PATCH 2/2] Fix incorrectly grabbed table --- .../uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java index ce582631ce7..238d9920cdd 100644 --- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java +++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java @@ -553,7 +553,7 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks { hfjResource.dropColumn("RES_TEXT"); hfjResource.dropColumn("RES_ENCODING"); - Builder.BuilderWithTableName hfjResVer = version.onTable("HFJ_RESOURCE"); + Builder.BuilderWithTableName hfjResVer = version.onTable("HFJ_RES_VER"); version.startSectionWithMessage("Starting work on table: " + hfjResVer.getTableName()); hfjResVer.modifyColumn("RES_ENCODING") .nullable();