Merge pull request #121 from OHDSI/ARACHNE-119

Wrong type for the analysis_state_journal.error
OHDSI · Jan 10, 2025 · 3323910 · 3323910
2 parents 18d5fb3 + b8ab0b0
commit 3323910
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java b/datanode/src/main/java/com/odysseusinc/arachne/datanode/service/AnalysisService.java
@@ -220,7 +220,7 @@ public List<Long> getIncompleteIds() {
 			Join<Analysis, AnalysisStateEntry> state = root.join(Analysis_.currentState, JoinType.LEFT);
 			javax.persistence.criteria.Path<String> stage = state.get(AnalysisStateEntry_.stage);
 			return q.where(
-					cb.isNull(root.get(Analysis_.error)),
+					cb.isNull(state.get(AnalysisStateEntry_.error)),
 					cb.or(stage.isNull(), stage.in(Stage.EXECUTE, Stage.INITIALIZE, Stage.ABORT))
 			);
 		}).getResultStream().map(Analysis::getId).collect(Collectors.toList());

diff --git a/datanode/src/main/resources/db/migration/V20241210000004__change_error_to_varchar.sql b/datanode/src/main/resources/db/migration/V20241210000004__change_error_to_varchar.sql
@@ -0,0 +1,2 @@
+ALTER TABLE analysis_state_journal
+    ALTER COLUMN error TYPE VARCHAR;
diff --git a/...0241210000004__update_stage_and_error.sql → ...0241210000005__update_stage_and_error.sql b/...0241210000004__update_stage_and_error.sql → ...0241210000005__update_stage_and_error.sql
@@ -1,4 +1,4 @@
 UPDATE analysis_state_journal SET
                                   stage = analyses.stage,
                                   error = analyses.error
-FROM analyses WHERE analyses.current_state_id = analyses.id;
+FROM analyses WHERE analyses.current_state_id = analysis_state_journal.id;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE analysis_state_journal
		ALTER COLUMN error TYPE VARCHAR;