fix: Update code

dhis2 · Nov 24, 2024 · 4d2ad59 · 4d2ad59
1 parent 7db77c5
commit 4d2ad59
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java b/...analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java
@@ -519,7 +519,7 @@ private List<AnalyticsTableColumn> getColumnFromDataElement(
   }
 
   private List<AnalyticsTableColumn> getColumnFromOrgUnitDataElement(
-      DataElement dataElement, String dataClause) {
+      DataElement dataElement, String dataFilterClause) {
     List<AnalyticsTableColumn> columns = new ArrayList<>();
 
     String columnExpression =
@@ -529,7 +529,7 @@ private List<AnalyticsTableColumn> getColumnFromOrgUnitDataElement(
 
     if (isSpatialSupport()) {
       String fromType = "ou.geometry " + fromClause;
-      String geoSql = getSelectForInsert(dataElement, fromType, dataClause);
+      String geoSql = getSelectForInsert(dataElement, fromType, dataFilterClause);
 
       columns.add(
           AnalyticsTableColumn.builder()
@@ -542,7 +542,7 @@ private List<AnalyticsTableColumn> getColumnFromOrgUnitDataElement(
     }
 
     String fromTypeSql = "ou.name " + fromClause;
-    String ouNameSql = getSelectForInsert(dataElement, fromTypeSql, dataClause);
+    String ouNameSql = getSelectForInsert(dataElement, fromTypeSql, dataFilterClause);
 
     columns.add(
         AnalyticsTableColumn.builder()
@@ -624,15 +624,15 @@ private List<AnalyticsTableColumn> getColumnFromTrackedEntityAttributeWithLegend
   }
 
   private List<AnalyticsTableColumn> getColumnsFromOrgUnitTrackedEntityAttribute(
-      TrackedEntityAttribute attribute, String dataClause) {
+      TrackedEntityAttribute attribute, String dataFilterClause) {
     List<AnalyticsTableColumn> columns = new ArrayList<>();
 
     String fromClause =
         qualifyVariables("from ${organisationunit} ou where ou.uid = (select value");
 
     if (isSpatialSupport()) {
       String fromType = "ou.geometry " + fromClause;
-      String geoSql = selectForInsert(attribute, fromType, dataClause);
+      String geoSql = selectForInsert(attribute, fromType, dataFilterClause);
       columns.add(
           AnalyticsTableColumn.builder()
               .name((attribute.getUid() + OU_GEOMETRY_COL_SUFFIX))
@@ -644,7 +644,7 @@ private List<AnalyticsTableColumn> getColumnsFromOrgUnitTrackedEntityAttribute(
     }
 
     String fromTypeSql = "ou.name " + fromClause;
-    String ouNameSql = selectForInsert(attribute, fromTypeSql, dataClause);
+    String ouNameSql = selectForInsert(attribute, fromTypeSql, dataFilterClause);
 
     columns.add(
         AnalyticsTableColumn.builder()