fix: coerce null-valued date PRVs to null

dhis2 · Feb 27, 2025 · 18c3885 · 18c3885
1 parent acf6eaf
commit 18c3885
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
     mavenCentral()
 }
 
-version = "1.1.8-SNAPSHOT"
+version = "1.1.9-SNAPSHOT"
 group = "org.hisp.dhis.lib.expression"
 
 if (project.hasProperty("removeSnapshotSuffix")) {

diff --git a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/ast/Typed.kt b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/ast/Typed.kt
@@ -33,7 +33,7 @@ fun interface Typed {
 
         fun toDateTypeCoercion(value: Any?): LocalDate? {
             if (value == null) return null
-            if (value is VariableValue) return toDateTypeCoercion(toMixedTypeTypeCoercion(value))
+            if (value is VariableValue) return if (value.value == null) null else toDateTypeCoercion(toMixedTypeTypeCoercion(value))
             if (value is LocalDate) return value
             if (value is String) return LocalDate.parse(value)
             if (value is Instant) return value.toLocalDateTime(TimeZone.currentSystemDefault()).date