fix: PI functions and program to handle Doris/CH double type (#19769)

dhis2 · Jan 26, 2025 · d926404 · d926404
1 parent 2b28ecf
commit d926404
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/function/D2Zpvc.java b/.../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/function/D2Zpvc.java
@@ -56,6 +56,7 @@ public Object getSql(ExprContext ctx, CommonExpressionVisitor visitor) {
       sql += "case when " + visitor.visitAllowingNulls(c) + " >= 0 then 1 else 0 end + ";
     }
 
-    return TextUtils.removeLast(sql, "+").trim() + ") as double precision),0)";
+    return TextUtils.removeLast(sql, "+").trim()
+        + ") as %s),0)".formatted(visitor.getSqlBuilder().dataTypeDouble());
   }
 }
diff --git a/...-services/dhis-service-core/src/main/java/org/hisp/dhis/program/variable/vValueCount.java b/...-services/dhis-service-core/src/main/java/org/hisp/dhis/program/variable/vValueCount.java
@@ -52,6 +52,7 @@ public Object getSql(CommonExpressionVisitor visitor) {
       sql += "case when " + SqlUtils.quote(uid) + " is not null then 1 else 0 end + ";
     }
 
-    return TextUtils.removeLast(sql, "+").trim() + ") as double precision),0)";
+    return TextUtils.removeLast(sql, "+").trim()
+        + ") as %s),0)".formatted(visitor.getSqlBuilder().dataTypeDouble());
   }
 }
diff --git a/...es/dhis-service-core/src/main/java/org/hisp/dhis/program/variable/vZeroPosValueCount.java b/...es/dhis-service-core/src/main/java/org/hisp/dhis/program/variable/vZeroPosValueCount.java
@@ -52,6 +52,7 @@ public Object getSql(CommonExpressionVisitor visitor) {
       sql += "case when " + SqlUtils.quote(uid) + " >= 0 then 1 else 0 end + ";
     }
 
-    return TextUtils.removeLast(sql, "+").trim() + ") as double precision),0)";
+    return TextUtils.removeLast(sql, "+").trim()
+        + ") as %s),0)".formatted(visitor.getSqlBuilder().dataTypeDouble());
   }
 }