Fixes merge failures

partiql · May 2, 2024 · e4ce681 · e4ce681
1 parent 24abfc6
commit e4ce681
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterFull.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterFull.kt
@@ -1,10 +1,10 @@
 package org.partiql.eval.internal.operator.rel
 
+import org.partiql.eval.PQLValue
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
-import org.partiql.eval.internal.helpers.toNull
 import org.partiql.eval.internal.operator.Operator
 import org.partiql.plan.Rel
 import org.partiql.value.PartiQLValueExperimental
@@ -19,12 +19,12 @@ internal class RelJoinOuterFull(
 
     @OptIn(PartiQLValueExperimental::class)
     private val lhsPadded = Record(
-        Array(rhsType.schema.size) { lhsType.schema[it].type.toRuntimeType().toNull().invoke() }
+        Array(rhsType.schema.size) { PQLValue.nullValue(lhsType.schema[it].type.toRuntimeType()) }
     )
 
     @OptIn(PartiQLValueExperimental::class)
     private val rhsPadded = Record(
-        Array(rhsType.schema.size) { rhsType.schema[it].type.toRuntimeType().toNull().invoke() }
+        Array(rhsType.schema.size) { PQLValue.nullValue(rhsType.schema[it].type.toRuntimeType()) }
     )
 
     private lateinit var env: Environment

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterLeft.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterLeft.kt
@@ -1,10 +1,10 @@
 package org.partiql.eval.internal.operator.rel
 
+import org.partiql.eval.PQLValue
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
-import org.partiql.eval.internal.helpers.toNull
 import org.partiql.eval.internal.operator.Operator
 import org.partiql.plan.Rel
 import org.partiql.value.PartiQLValueExperimental
@@ -18,7 +18,7 @@ internal class RelJoinOuterLeft(
 
     @OptIn(PartiQLValueExperimental::class)
     private val rhsPadded = Record(
-        Array(rhsType.schema.size) { rhsType.schema[it].type.toRuntimeType().toNull().invoke() }
+        Array(rhsType.schema.size) { PQLValue.nullValue(rhsType.schema[it].type.toRuntimeType()) }
     )
 
     private lateinit var env: Environment

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterRight.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterRight.kt
@@ -1,10 +1,10 @@
 package org.partiql.eval.internal.operator.rel
 
+import org.partiql.eval.PQLValue
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
-import org.partiql.eval.internal.helpers.toNull
 import org.partiql.eval.internal.operator.Operator
 import org.partiql.plan.Rel
 import org.partiql.value.PartiQLValueExperimental
@@ -18,7 +18,7 @@ internal class RelJoinOuterRight(
 
     @OptIn(PartiQLValueExperimental::class)
     private val lhsPadded = Record(
-        Array(lhsType.schema.size) { lhsType.schema[it].type.toRuntimeType().toNull().invoke() }
+        Array(lhsType.schema.size) { PQLValue.nullValue(lhsType.schema[it].type.toRuntimeType()) }
     )
 
     private lateinit var env: Environment