From 4d2ad591189c5abf40688bbde2032f59911d14ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Helge=20=C3=98verland?= <lars@dhis2.org>
Date: Sun, 24 Nov 2024 17:06:35 +0100
Subject: [PATCH] fix: Update code

---
 .../table/JdbcEventAnalyticsTableManager.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 a663baef04d0..0c3e85fe9e0a 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
@@ -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,7 +624,7 @@ private List<AnalyticsTableColumn> getColumnFromTrackedEntityAttributeWithLegend
   }
 
   private List<AnalyticsTableColumn> getColumnsFromOrgUnitTrackedEntityAttribute(
-      TrackedEntityAttribute attribute, String dataClause) {
+      TrackedEntityAttribute attribute, String dataFilterClause) {
     List<AnalyticsTableColumn> columns = new ArrayList<>();
 
     String fromClause =
@@ -632,7 +632,7 @@ private List<AnalyticsTableColumn> getColumnsFromOrgUnitTrackedEntityAttribute(
 
     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()