refactor: Qualify table names in analytics table SQL [DHIS2-16705] (#…

…19191)
dhis2 · Nov 18, 2024 · 97fb8ad · 97fb8ad
1 parent 2d25cab
commit 97fb8ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java b/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
@@ -151,9 +151,11 @@ public abstract class AbstractJdbcTableManager implements AnalyticsTableManager
   protected Boolean spatialSupport;
 
   protected boolean isSpatialSupport() {
-    if (spatialSupport == null)
+    if (spatialSupport == null) {
       spatialSupport = databaseInfoProvider.getDatabaseInfo().isSpatialSupport();
-    return spatialSupport;
+    }
+
+    return spatialSupport && sqlBuilder.supportsGeospatialData();
   }
 
   /**

diff --git a/...analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableGenerator.java b/...analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableGenerator.java
@@ -71,8 +71,6 @@ public class DefaultAnalyticsTableGenerator implements AnalyticsTableGenerator {
 
   private final OutliersCache outliersCache;
 
-  // TODO introduce last successful timestamps per table type
-
   @Override
   public void generateAnalyticsTables(AnalyticsTableUpdateParams params0, JobProgress progress) {
     Clock clock = new Clock(log).startClock();

diff --git a/...s/src/main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityAnalyticsTableManager.java b/...s/src/main/java/org/hisp/dhis/analytics/table/JdbcTrackedEntityAnalyticsTableManager.java
@@ -526,19 +526,19 @@ public void populateTable(AnalyticsTableUpdateParams params, AnalyticsTableParti
                 sql.append(
                     replaceQualify(
                         """
-                    \s left join ${trackedentityattributevalue} "${teaUid}" on "${teaUid}".trackedentityid=te.trackedentityid \
-                    and "${teaUid}".trackedentityattributeid = ${teaId}""",
+                    \s left join ${trackedentityattributevalue} ${teaUid} on ${teaUid}.trackedentityid=te.trackedentityid \
+                    and ${teaUid}.trackedentityattributeid = ${teaId}""",
                         Map.of(
-                            "teaUid", tea.getUid(),
+                            "teaUid", quote(tea.getUid()),
                             "teaId", String.valueOf(tea.getId())))));
     sql.append(
-        replace(
+        replaceQualify(
             """
             \s where te.trackedentitytypeid = ${tetId} \
             and te.lastupdated < '${startTime}' \
-            and exists (select 1 from enrollment en \
+            and exists (select 1 from ${enrollment} en \
             where en.trackedentityid = te.trackedentityid \
-            and exists (select 1 from event ev \
+            and exists (select 1 from ${event} ev \
             where ev.enrollmentid = en.enrollmentid \
             and ev.status in (${statuses}) \
             and ev.deleted = false)) \