From 1804cbe68f15e454a4d046137f0db61b02857fbd Mon Sep 17 00:00:00 2001 From: Enrico Date: Wed, 15 Nov 2023 10:42:41 +0100 Subject: [PATCH] Fix tests --- .../analytics/table/JdbcEnrollmentAnalyticsTableManager.java | 2 +- .../dhis/analytics/table/JdbcEventAnalyticsTableManager.java | 2 +- .../table/JdbcTeiEnrollmentsAnalyticsTableManager.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java index a87ebde8990c..be49e8fb3cb8 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java @@ -107,7 +107,7 @@ public JdbcEnrollmentAnalyticsTableManager( List.of( new AnalyticsTableColumn(quote("pi"), CHARACTER_11, NOT_NULL, "pi.uid"), new AnalyticsTableColumn(quote("enrollmentdate"), TIMESTAMP, "pi.enrollmentdate"), - new AnalyticsTableColumn(quote("occurreddate"), TIMESTAMP, "pi.occurreddate"), + new AnalyticsTableColumn(quote("incidentdate"), TIMESTAMP, "pi.occurreddate"), new AnalyticsTableColumn( quote("completeddate"), TIMESTAMP, diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java index 3b46ebf8502a..4e1d88945055 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java @@ -140,7 +140,7 @@ public JdbcEventAnalyticsTableManager( new AnalyticsTableColumn(quote("ps"), CHARACTER_11, NOT_NULL, "ps.uid"), new AnalyticsTableColumn(quote("ao"), CHARACTER_11, NOT_NULL, "ao.uid"), new AnalyticsTableColumn(quote("enrollmentdate"), TIMESTAMP, "pi.enrollmentdate"), - new AnalyticsTableColumn(quote("occurreddate"), TIMESTAMP, "pi.occurreddate"), + new AnalyticsTableColumn(quote("incidentdate"), TIMESTAMP, "pi.occurreddate"), new AnalyticsTableColumn(quote("occurreddate"), TIMESTAMP, "psi.occurreddate"), new AnalyticsTableColumn(quote("scheduleddate"), TIMESTAMP, "psi.scheduleddate"), new AnalyticsTableColumn(quote("completeddate"), TIMESTAMP, "psi.completeddate"), diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcTeiEnrollmentsAnalyticsTableManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcTeiEnrollmentsAnalyticsTableManager.java index 270de123202d..1a67795566b0 100644 --- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcTeiEnrollmentsAnalyticsTableManager.java +++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcTeiEnrollmentsAnalyticsTableManager.java @@ -121,7 +121,7 @@ public JdbcTeiEnrollmentsAnalyticsTableManager( new AnalyticsTableColumn(quote("programinstanceuid"), CHARACTER_11, NULL, "pi.uid"), new AnalyticsTableColumn(quote("enrollmentdate"), TIMESTAMP, "pi.enrollmentdate"), new AnalyticsTableColumn(quote("enddate"), TIMESTAMP, "pi.completeddate"), - new AnalyticsTableColumn(quote("occurreddate"), TIMESTAMP, "pi.occurreddate"), + new AnalyticsTableColumn(quote("incidentdate"), TIMESTAMP, "pi.occurreddate"), new AnalyticsTableColumn(quote("enrollmentstatus"), VARCHAR_50, "pi.status"), new AnalyticsTableColumn(quote("pigeometry"), GEOMETRY, "pi.geometry") .withIndexType(GIST),