Doris fixes

dhis2 · Jan 9, 2025 · e90f6a2 · e90f6a2
1 parent 2df0ae2
commit e90f6a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...s/src/main/java/org/hisp/dhis/analytics/event/data/AbstractJdbcEventAnalyticsManager.java b/...s/src/main/java/org/hisp/dhis/analytics/event/data/AbstractJdbcEventAnalyticsManager.java
@@ -909,6 +909,7 @@ private String getTableAndColumn(
     } else if (DimensionType.ORGANISATION_UNIT_GROUP_SET == dimension.getDimensionType()) {
       return params
           .getOrgUnitField()
+          .withSqlBuilder(sqlBuilder)
           .getOrgUnitGroupSetCol(col, getAnalyticsType(), isGroupByClause);
     } else {
       return quoteAlias(col);

diff --git a/...sp/dhis/analytics/event/data/programindicator/DefaultProgramIndicatorSubqueryBuilder.java b/...sp/dhis/analytics/event/data/programindicator/DefaultProgramIndicatorSubqueryBuilder.java
@@ -114,9 +114,7 @@ public void contributeCTE(
                   earliestStartDate,
                   latestDate)
               // FIXME this is a bit of an hack
-              .replace("subax.\"ps\"", "ps")
-              .replace("subax.enrollment", "enrollment");
-
+              .replaceAll("subax\\.", "");
       filter = "where " + piResolvedSqlFilter;
     }
 
@@ -128,8 +126,7 @@ public void contributeCTE(
                 earliestStartDate,
                 latestDate)
             // FIXME this is a bit of an hack
-            .replace("subax.\"ps\"", "ps")
-            .replace("subax.enrollment", "enrollment");
+            .replaceAll("subax\\.", "");
 
     String cteSql =
         "select enrollment, %s(%s) as value from %s %s group by enrollment"