refactor: [DHIS2-21420] centralise analytics_event/_enrollment table names

luciano-fiandesio · luciano-fiandesio · commit 4be2634ea663 · 2026-05-06T17:27:03.000+02:00
Introduce AnalyticsTableNames in dhis-support-sql with eventTable(Program)
and enrollmentTable(Program) helpers. Replace every inline
"analytics_event_" + program.getUid().toLowerCase() and equivalent
"analytics_enrollment_" + ... concatenation with a call through the helper.
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/AbstractJdbcEventAnalyticsManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/AbstractJdbcEventAnalyticsManager.java
@@ -170,6 +170,7 @@
 import org.hisp.dhis.commons.util.SqlHelper;
 import org.hisp.dhis.commons.util.TextUtils;
 import org.hisp.dhis.db.sql.AnalyticsSqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.external.conf.DhisConfigurationProvider;
 import org.hisp.dhis.feedback.ErrorCode;
 import org.hisp.dhis.option.Option;
@@ -281,8 +282,6 @@ public static AggregateClause of(String sql, AggregationType type, String innerE
 
   private final DateFieldPeriodBucketColumnResolver dateFieldPeriodBucketColumnResolver;
 
-  static final String ANALYTICS_EVENT = "analytics_event_";
-
   static final String COLUMN_ENROLLMENT_GEOMETRY_GEOJSON =
       String.format(
           "ST_AsGeoJSON(%s)", EnrollmentAnalyticsColumnName.ENROLLMENT_GEOMETRY_COLUMN_NAME);
@@ -2447,7 +2446,7 @@ private void addShadowEnrollmentTableCte(EventQueryParams params, CteContext cte
    */
   private void addShadowEventTableCte(EventQueryParams params, CteContext cteContext) {
     // Create a shadow CTE with the EXACT same name as the real event table
-    String eventTableName = "analytics_event_" + params.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(params.getProgram());
 
     SelectBuilder shadowEvents = new SelectBuilder();
 
@@ -2791,7 +2790,7 @@ private void generateFilterCTEs(EventQueryParams params, CteContext cteContext)
   private void buildProgramStageCte(
       CteContext cteContext, QueryItem item, EventQueryParams params) {
     // The event table name, e.g. "analytics_event_XYZ".
-    String eventTableName = ANALYTICS_EVENT + item.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(item.getProgram());
 
     // Quoted column name for the item (e.g. "ax"."my_column").
     String colName = quote(item.getItemName());
@@ -3118,7 +3117,7 @@ private String getSqlFilterValue(QueryFilter filter, QueryItem item, EventQueryP
    */
   private String buildAggregateFilterCteSql(List<QueryItem> stageItems, EventQueryParams params) {
     QueryItem firstItem = stageItems.get(0);
-    String tableName = "analytics_event_" + firstItem.getProgram().getUid().toLowerCase();
+    String tableName = AnalyticsTableNames.eventTable(firstItem.getProgram());
     String stageUid = firstItem.getProgramStage().getUid();
 
     List<String> innerColumns = new ArrayList<>();
@@ -3215,10 +3214,7 @@ private String buildFilterCteSql(List<QueryItem> queryItems, EventQueryParams pa
               // Determine the correct table: event table or enrollment table
               String tableName =
                   item.hasProgramStage()
-                      ? "analytics_event_"
-                          + item.getProgram()
-                              .getUid()
-                              .toLowerCase() // Event table for program stage
+                      ? AnalyticsTableNames.eventTable(item.getProgram())
                       : params.getTableName(); // Enrollment table
 
               String programStageCondition =
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentEventSubqueryBuilder.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentEventSubqueryBuilder.java
@@ -38,6 +38,7 @@
 import org.hisp.dhis.common.RepeatableStageParams;
 import org.hisp.dhis.common.ValueType;
 import org.hisp.dhis.db.sql.AnalyticsSqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.event.EventStatus;
 import org.locationtech.jts.util.Assert;
 import org.springframework.stereotype.Component;
@@ -54,8 +55,6 @@
 @RequiredArgsConstructor
 public class EnrollmentEventSubqueryBuilder {
 
-  private static final String ANALYTICS_EVENT_TABLE_PREFIX = "analytics_event_";
-
   private static final String LIMIT_1 = "limit 1";
 
   private static final String IS_NOT_NULL = " is not null ";
@@ -72,7 +71,7 @@ public class EnrollmentEventSubqueryBuilder {
   public String renderValueSubquery(QueryItem item, String suffix) {
     assertProgram(item);
     String quotedColName = sqlBuilder.quote(item.getItemName() + suffix);
-    String eventTableName = ANALYTICS_EVENT_TABLE_PREFIX + item.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(item.getProgram());
 
     if (item.getProgramStage().getRepeatable() && item.hasRepeatableStageParams()) {
       return repeatableStageSubquery(item, quotedColName, eventTableName);
@@ -89,7 +88,7 @@ public ColumnAndAlias renderCoordinateSubquery(QueryItem item) {
       return ColumnAndAlias.EMPTY;
     }
 
-    String eventTableName = ANALYTICS_EVENT_TABLE_PREFIX + item.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(item.getProgram());
     String quotedColName = sqlBuilder.quote(item.getItemId());
 
     String psCondition = "";
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentTimeFieldSqlRenderer.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EnrollmentTimeFieldSqlRenderer.java
@@ -50,6 +50,7 @@
 import org.hisp.dhis.analytics.event.EventQueryParams;
 import org.hisp.dhis.common.DimensionalItemObject;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodDimension;
 import org.hisp.dhis.program.AnalyticsPeriodBoundary;
@@ -141,8 +142,7 @@ private String getProgramIndicatorEventInProgramStageSql(
     for (String programStage : map.keySet()) {
       Set<AnalyticsPeriodBoundary> boundaries = map.get(programStage);
 
-      String eventTableName =
-          "analytics_event_" + programIndicator.getProgram().getUid().toLowerCase();
+      String eventTableName = AnalyticsTableNames.eventTable(programIndicator.getProgram());
       sql +=
           (firstIteration ? "" : " and ")
               + " exists(select 1 from "
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
@@ -108,6 +108,7 @@
 import org.hisp.dhis.commons.util.ExpressionUtils;
 import org.hisp.dhis.commons.util.SqlHelper;
 import org.hisp.dhis.db.sql.AnalyticsSqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.external.conf.DhisConfigurationProvider;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.period.PeriodDimension;
@@ -934,7 +935,7 @@ private void addBaseAggregatedCteJoins(
       return;
     }
 
-    String eventTableName = ANALYTICS_EVENT + params.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(params.getProgram());
     String eventEnrollmentFilterSql =
         """
         (
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/D2FunctionCteFactory.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/D2FunctionCteFactory.java
@@ -45,6 +45,7 @@
 import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser;
 import org.hisp.dhis.antlr.AntlrParserUtils;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.program.AnalyticsPeriodBoundary;
 import org.hisp.dhis.program.ProgramIndicator;
 
@@ -196,7 +197,7 @@ private static String resolveEventTable(ProgramIndicator pi) {
       log.error("ProgramIndicator {} lacks program – cannot build D2 CTE.", pi.getUid());
       return null;
     }
-    return "analytics_event_" + pi.getProgram().getUid().toLowerCase();
+    return AnalyticsTableNames.eventTable(pi.getProgram());
   }
 
   private enum D2FuncType {
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/FilterCteFactory.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/FilterCteFactory.java
@@ -40,6 +40,7 @@
 import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser;
 import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser.FilterFields;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.program.ProgramIndicator;
 
 public class FilterCteFactory implements CteSqlFactory {
@@ -134,7 +135,7 @@ private static String buildFilterCteSql(
       Date end,
       SqlBuilder qb) {
 
-    String table = "analytics_event_" + pi.getProgram().getUid().toLowerCase();
+    String table = AnalyticsTableNames.eventTable(pi.getProgram());
     String quotedCol = qb.quote(column);
 
     String boundaries =
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/ProgramStageDataElementCteFactory.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/ProgramStageDataElementCteFactory.java
@@ -46,6 +46,7 @@
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.program.AnalyticsPeriodBoundary;
 import org.hisp.dhis.program.ProgramIndicator;
 
@@ -149,7 +150,7 @@ private void ensureCte(
       log.error("PI {} has no Program – cannot create CTE {}", pi.getUid(), key);
       return;
     }
-    String table = "analytics_event_" + pi.getProgram().getUid().toLowerCase();
+    String table = AnalyticsTableNames.eventTable(pi.getProgram());
     String boundaries =
         BoundarySqlBuilder.buildSql(
             pi.getAnalyticsPeriodBoundaries(),
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/VariableCteFactory.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/programindicator/ctefactory/VariableCteFactory.java
@@ -43,6 +43,7 @@
 import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser;
 import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser.VariableFields;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.program.ProgramIndicator;
 
 @Slf4j
@@ -115,7 +116,7 @@ private void buildVariableCte(
       CteContext ctx,
       SqlBuilder qb) {
 
-    String table = "analytics_event_" + pi.getProgram().getUid().toLowerCase();
+    String table = AnalyticsTableNames.eventTable(pi.getProgram());
     String psCondition = v.psUid() != null ? "and ps = '" + v.psUid() + "' " : "";
 
     String boundaries =
diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/ProgramIndicatorQueryBuilder.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/ProgramIndicatorQueryBuilder.java
@@ -66,6 +66,7 @@
 import org.hisp.dhis.analytics.trackedentity.query.context.sql.SqlQueryBuilder;
 import org.hisp.dhis.analytics.trackedentity.query.context.sql.SqlQueryBuilders;
 import org.hisp.dhis.commons.util.TextUtils;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.program.AnalyticsType;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramIndicator;
@@ -262,8 +263,8 @@ private static String enrollmentProgramIndicatorSelect(
         + ", "
         + (needsExpressions ? expression + " as value, " : "")
         + " row_number() over (partition by trackedentity order by enrollmentdate desc) as rn "
-        + " from analytics_enrollment_"
-        + program.getElement().getUid().toLowerCase()
+        + " from "
+        + AnalyticsTableNames.enrollmentTable(program.getElement())
         + " as "
         + SUBQUERY_TABLE_ALIAS
         + (needsExpressions ? " where " + filter : "")
diff --git a/dhis-2/dhis-support/dhis-support-expression-parser/src/main/java/org/hisp/dhis/parser/expression/statement/DefaultStatementBuilder.java b/dhis-2/dhis-support/dhis-support-expression-parser/src/main/java/org/hisp/dhis/parser/expression/statement/DefaultStatementBuilder.java
@@ -43,6 +43,7 @@
 import lombok.RequiredArgsConstructor;
 import org.hisp.dhis.analytics.AnalyticsConstants;
 import org.hisp.dhis.db.sql.SqlBuilder;
+import org.hisp.dhis.db.util.AnalyticsTableNames;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.program.AnalyticsPeriodBoundary;
 import org.hisp.dhis.program.AnalyticsType;
@@ -138,8 +139,7 @@ private String getProgramIndicatorEventInEnrollmentSelectSql(
       programStageCondition = "and ps = '" + programStageUid + "' ";
     }
 
-    String eventTableName =
-        "analytics_event_" + programIndicator.getProgram().getUid().toLowerCase();
+    String eventTableName = AnalyticsTableNames.eventTable(programIndicator.getProgram());
     return "(select "
         + columnName
         + " from "
diff --git a/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/util/AnalyticsTableNames.java b/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/util/AnalyticsTableNames.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2004-2026, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.db.util;
+
+import java.util.Locale;
+import java.util.Objects;
+import org.hisp.dhis.program.Program;
+
+/**
+ * Constructs the names of program-scoped analytics tables ({@code analytics_event_<programUid>},
+ * {@code analytics_enrollment_<programUid>}).
+ *
+ * <p>The program UID is lowercased with {@link Locale#ROOT} so the returned name matches the
+ * physical analytics table on every supported engine, including those that preserve identifier
+ * case (ClickHouse). Use this helper at every emission site instead of concatenating the prefix
+ * inline.
+ */
+public final class AnalyticsTableNames {
+
+  public static final String EVENT_PREFIX = "analytics_event_";
+
+  public static final String ENROLLMENT_PREFIX = "analytics_enrollment_";
+
+  private AnalyticsTableNames() {}
+
+  /** Returns the analytics event table name for the given program. */
+  public static String eventTable(Program program) {
+    Objects.requireNonNull(program, "program");
+    return EVENT_PREFIX + program.getUid().toLowerCase(Locale.ROOT);
+  }
+
+  /** Returns the analytics enrollment table name for the given program. */
+  public static String enrollmentTable(Program program) {
+    Objects.requireNonNull(program, "program");
+    return ENROLLMENT_PREFIX + program.getUid().toLowerCase(Locale.ROOT);
+  }
+}
diff --git a/dhis-2/dhis-support/dhis-support-sql/src/test/java/org/hisp/dhis/db/util/AnalyticsTableNamesTest.java b/dhis-2/dhis-support/dhis-support-sql/src/test/java/org/hisp/dhis/db/util/AnalyticsTableNamesTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2004-2026, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.db.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.hisp.dhis.program.Program;
+import org.junit.jupiter.api.Test;
+
+class AnalyticsTableNamesTest {
+
+  @Test
+  void eventTableLowercasesProgramUid() {
+    assertEquals("analytics_event_iphinat79uw", AnalyticsTableNames.eventTable(program("IpHINAT79UW")));
+  }
+
+  @Test
+  void eventTableIsIdempotentForLowercaseUid() {
+    assertEquals("analytics_event_abcdefghijk", AnalyticsTableNames.eventTable(program("abcdefghijk")));
+  }
+
+  @Test
+  void enrollmentTableLowercasesProgramUid() {
+    assertEquals(
+        "analytics_enrollment_iphinat79uw", AnalyticsTableNames.enrollmentTable(program("IpHINAT79UW")));
+  }
+
+  @Test
+  void enrollmentTableIsIdempotentForLowercaseUid() {
+    assertEquals(
+        "analytics_enrollment_abcdefghijk", AnalyticsTableNames.enrollmentTable(program("abcdefghijk")));
+  }
+
+  @Test
+  void eventTablePrefixIsExposedAsConstant() {
+    assertEquals("analytics_event_", AnalyticsTableNames.EVENT_PREFIX);
+  }
+
+  @Test
+  void enrollmentTablePrefixIsExposedAsConstant() {
+    assertEquals("analytics_enrollment_", AnalyticsTableNames.ENROLLMENT_PREFIX);
+  }
+
+  @Test
+  void eventTableUsesLocaleRootSoTurkishLocaleDoesNotChangeOutput() {
+    // Java default-locale lowercase of "I" in Turkish yields "ı" (dotless), not "i".
+    // Locale.ROOT must guarantee deterministic output regardless of JVM default locale.
+    assertEquals("analytics_event_imspshyf6o6", AnalyticsTableNames.eventTable(program("IMSPSHYF6O6")));
+  }
+
+  @Test
+  void eventTableRejectsNullProgram() {
+    assertThrows(NullPointerException.class, () -> AnalyticsTableNames.eventTable(null));
+  }
+
+  @Test
+  void enrollmentTableRejectsNullProgram() {
+    assertThrows(NullPointerException.class, () -> AnalyticsTableNames.enrollmentTable(null));
+  }
+
+  private static Program program(String uid) {
+    Program program = new Program();
+    program.setUid(uid);
+    return program;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`import org.hisp.dhis.analytics.event.data.programindicator.ctefactory.placeholder.PlaceholderParser;`
`46`	`46`	`import org.hisp.dhis.antlr.AntlrParserUtils;`
`47`	`47`	`import org.hisp.dhis.db.sql.SqlBuilder;`
	`48`	`+import org.hisp.dhis.db.util.AnalyticsTableNames;`
`48`	`49`	`import org.hisp.dhis.program.AnalyticsPeriodBoundary;`
`49`	`50`	`import org.hisp.dhis.program.ProgramIndicator;`
`50`	`51`
`@@ -196,7 +197,7 @@ private static String resolveEventTable(ProgramIndicator pi) {`
`196`	`197`	`log.error("ProgramIndicator {} lacks program – cannot build D2 CTE.", pi.getUid());`
`197`	`198`	`return null;`
`198`	`199`	`}`
`199`		`- return "analytics_event_" + pi.getProgram().getUid().toLowerCase();`
	`200`	`+ return AnalyticsTableNames.eventTable(pi.getProgram());`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`private enum D2FuncType {`