From f7a79dae333cd9fec80dc307cdb3b6a63c9795d5 Mon Sep 17 00:00:00 2001 From: Michael Buckley Date: Thu, 13 Nov 2025 11:55:55 -0500 Subject: [PATCH 1/2] Add debug logging to migrator. --- .../src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java | 1 + .../main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java index d74aaee4b281..adc381dfb821 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/HapiMigrator.java @@ -246,6 +246,7 @@ private void recordTaskAsCompletedIfNotDryRun(BaseTask theNext, long theExecutio public void addTasks(Iterable theMigrationTasks) { if (HapiSystemProperties.isUnitTestModeEnabled()) { + ourLog.info("Skipping tasks because unit test mode is enabled"); // Tests only need to initialize the schemas. No need to run all the migrations for every test. for (BaseTask task : theMigrationTasks) { if (task instanceof InitializeSchemaTask) { diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java index aa8bf3f98913..9ff1ca0747b7 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java @@ -217,7 +217,8 @@ private int doExecuteSql(@Language("SQL") String theSql, Object... theArguments) } catch (DataAccessException e) { if (myFlags.contains(TaskFlagEnum.FAILURE_ALLOWED)) { ourLog.info( - "Task {} did not exit successfully on doExecuteSql(), but task is allowed to fail", + "Task {} running sql \"{}\"did not exit successfully on doExecuteSql(), but task is allowed to fail", + theSql, getMigrationVersion()); ourLog.debug("Error was: {}", e.getMessage(), e); myExecutionResult = MigrationTaskExecutionResultEnum.NOT_APPLIED_ALLOWED_FAILURE; From d4dd19a2443ec24eabdfdfa8bf6315c7157c74e3 Mon Sep 17 00:00:00 2001 From: Michael Buckley Date: Thu, 13 Nov 2025 12:51:52 -0500 Subject: [PATCH 2/2] fix message param order --- .../main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java index 9ff1ca0747b7..f86bf890ddfe 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTask.java @@ -218,8 +218,8 @@ private int doExecuteSql(@Language("SQL") String theSql, Object... theArguments) if (myFlags.contains(TaskFlagEnum.FAILURE_ALLOWED)) { ourLog.info( "Task {} running sql \"{}\"did not exit successfully on doExecuteSql(), but task is allowed to fail", - theSql, - getMigrationVersion()); + getMigrationVersion(), + theSql); ourLog.debug("Error was: {}", e.getMessage(), e); myExecutionResult = MigrationTaskExecutionResultEnum.NOT_APPLIED_ALLOWED_FAILURE; return 0; @@ -335,7 +335,7 @@ public final int hashCode() { @Override public final boolean equals(Object theObject) { - if (theObject == null || getClass().equals(theObject.getClass()) == false) { + if (theObject == null || !getClass().equals(theObject.getClass())) { return false; } BaseTask otherObject = (BaseTask) theObject;