From efe1be424a53eb50877b87d01e65d35e5ba54f19 Mon Sep 17 00:00:00 2001 From: michaelabuckley Date: Tue, 7 Mar 2023 13:35:09 -0500 Subject: [PATCH] Provide default update time to batch2 entities (#4630) * Data migration - default value for batch2 UPDATE_TIME --- .../6_6_0/4630-instance-default-update-time.yaml | 4 ++++ .../fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4630-instance-default-update-time.yaml diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4630-instance-default-update-time.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4630-instance-default-update-time.yaml new file mode 100644 index 00000000000..f3dbaea3b0a --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4630-instance-default-update-time.yaml @@ -0,0 +1,4 @@ +--- +type: fix +issue: 4630 +title: "Default values are provided for the new UPDATE_TIME columns so batch jobs started before an upgrade can complete." diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java index 9679089610a..886a5d7d555 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java @@ -175,6 +175,14 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks { .nullable() .type(ColumnTypeEnum.DATE_TIMESTAMP); + version.executeRawSql("20230397.1", + "update BT2_JOB_INSTANCE " + + "set UPDATE_TIME = coalesce(end_time, start_time, create_time, TIMESTAMP '2023-01-01 00:00:00') " + + "where UPDATE_TIME is null;"); + version.executeRawSql("20230397.2", + "update bt2_work_chunk " + + "set UPDATE_TIME = coalesce(end_time, start_time, create_time, TIMESTAMP '2023-01-01 00:00:00') " + + "where UPDATE_TIME is null;"); }