Skip to content

Commit e4ce681

Browse files
committed
Fixes merge failures
1 parent 24abfc6 commit e4ce681

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterFull.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.partiql.eval.internal.operator.rel
22

3+
import org.partiql.eval.PQLValue
34
import org.partiql.eval.internal.Environment
45
import org.partiql.eval.internal.Record
56
import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
67
import org.partiql.eval.internal.helpers.ValueUtility.isTrue
7-
import org.partiql.eval.internal.helpers.toNull
88
import org.partiql.eval.internal.operator.Operator
99
import org.partiql.plan.Rel
1010
import org.partiql.value.PartiQLValueExperimental
@@ -19,12 +19,12 @@ internal class RelJoinOuterFull(
1919

2020
@OptIn(PartiQLValueExperimental::class)
2121
private val lhsPadded = Record(
22-
Array(rhsType.schema.size) { lhsType.schema[it].type.toRuntimeType().toNull().invoke() }
22+
Array(rhsType.schema.size) { PQLValue.nullValue(lhsType.schema[it].type.toRuntimeType()) }
2323
)
2424

2525
@OptIn(PartiQLValueExperimental::class)
2626
private val rhsPadded = Record(
27-
Array(rhsType.schema.size) { rhsType.schema[it].type.toRuntimeType().toNull().invoke() }
27+
Array(rhsType.schema.size) { PQLValue.nullValue(rhsType.schema[it].type.toRuntimeType()) }
2828
)
2929

3030
private lateinit var env: Environment

partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterLeft.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.partiql.eval.internal.operator.rel
22

3+
import org.partiql.eval.PQLValue
34
import org.partiql.eval.internal.Environment
45
import org.partiql.eval.internal.Record
56
import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
67
import org.partiql.eval.internal.helpers.ValueUtility.isTrue
7-
import org.partiql.eval.internal.helpers.toNull
88
import org.partiql.eval.internal.operator.Operator
99
import org.partiql.plan.Rel
1010
import org.partiql.value.PartiQLValueExperimental
@@ -18,7 +18,7 @@ internal class RelJoinOuterLeft(
1818

1919
@OptIn(PartiQLValueExperimental::class)
2020
private val rhsPadded = Record(
21-
Array(rhsType.schema.size) { rhsType.schema[it].type.toRuntimeType().toNull().invoke() }
21+
Array(rhsType.schema.size) { PQLValue.nullValue(rhsType.schema[it].type.toRuntimeType()) }
2222
)
2323

2424
private lateinit var env: Environment

partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinOuterRight.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.partiql.eval.internal.operator.rel
22

3+
import org.partiql.eval.PQLValue
34
import org.partiql.eval.internal.Environment
45
import org.partiql.eval.internal.Record
56
import org.partiql.eval.internal.helpers.TypesUtility.toRuntimeType
67
import org.partiql.eval.internal.helpers.ValueUtility.isTrue
7-
import org.partiql.eval.internal.helpers.toNull
88
import org.partiql.eval.internal.operator.Operator
99
import org.partiql.plan.Rel
1010
import org.partiql.value.PartiQLValueExperimental
@@ -18,7 +18,7 @@ internal class RelJoinOuterRight(
1818

1919
@OptIn(PartiQLValueExperimental::class)
2020
private val lhsPadded = Record(
21-
Array(lhsType.schema.size) { lhsType.schema[it].type.toRuntimeType().toNull().invoke() }
21+
Array(lhsType.schema.size) { PQLValue.nullValue(lhsType.schema[it].type.toRuntimeType()) }
2222
)
2323

2424
private lateinit var env: Environment

0 commit comments

Comments
 (0)