Fixes conformance failures

Replaces creation of a DECIMAL_ARBITRARY with DECIMAL Fixes null-call of equals function
partiql · Nov 19, 2024 · d56bc85 · d56bc85
1 parent 6a4b3e2
commit d56bc85
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 127 deletions.
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/ToNull.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/ToNull.kt
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnEq.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnEq.kt
@@ -42,7 +42,7 @@ internal object FnEq : Function {
             "eq",
             args,
             boolType,
-            isNullCall = false,
+            isNullCall = true,
             isMissingCall = false
         ) {
             override fun invoke(args: Array<Datum>): Datum {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValue.kt b/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValue.kt
@@ -220,7 +220,7 @@ public abstract class IntValue : NumericValue<BigInteger>() {
 @PartiQLValueExperimental
 public abstract class DecimalValue : NumericValue<BigDecimal>() {
 
-    override val type: PartiQLValueType = PartiQLValueType.DECIMAL_ARBITRARY
+    override val type: PartiQLValueType = PartiQLValueType.DECIMAL
 
     abstract override fun copy(annotations: Annotations): DecimalValue
 

diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonReader.kt b/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonReader.kt
@@ -429,7 +429,7 @@ internal class PartiQLValueIonReader(
                             val map = mutableMapOf<String, Any?>()
                             checkRequiredFieldNameAndPut(reader, map, "hour", PartiQLValueType.INT)
                             checkRequiredFieldNameAndPut(reader, map, "minute", PartiQLValueType.INT)
-                            checkRequiredFieldNameAndPut(reader, map, "second", PartiQLValueType.DECIMAL_ARBITRARY)
+                            checkRequiredFieldNameAndPut(reader, map, "second", PartiQLValueType.DECIMAL)
                             checkOptionalFieldNameAndPut(reader, map, "offset", PartiQLValueType.INT)
                             // check remaining
                             if (reader.next() != null) {
@@ -464,7 +464,7 @@ internal class PartiQLValueIonReader(
                             checkRequiredFieldNameAndPut(reader, map, "day", PartiQLValueType.INT)
                             checkRequiredFieldNameAndPut(reader, map, "hour", PartiQLValueType.INT)
                             checkRequiredFieldNameAndPut(reader, map, "minute", PartiQLValueType.INT)
-                            checkRequiredFieldNameAndPut(reader, map, "second", PartiQLValueType.DECIMAL_ARBITRARY)
+                            checkRequiredFieldNameAndPut(reader, map, "second", PartiQLValueType.DECIMAL)
                             // check remaining
                             if (reader.next() != null) {
                                 throw IllegalArgumentException("excess field in struct")
@@ -535,7 +535,7 @@ internal class PartiQLValueIonReader(
             val v = fromIon(reader)
             when (expectedType) {
                 PartiQLValueType.INT -> destination[k] = (v as IntValue).value?.intValueExact()
-                PartiQLValueType.DECIMAL_ARBITRARY -> destination[k] = (v as DecimalValue).value
+                PartiQLValueType.DECIMAL_ARBITRARY, PartiQLValueType.DECIMAL -> destination[k] = (v as DecimalValue).value
                 else -> throw IllegalArgumentException("$expectedField should be either INT OR DECIMAL")
             }
         } else {