Address PR comments

partiql · Oct 20, 2023 · 11ff840 · 11ff840
1 parent c8fdd60
commit 11ff840
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/partiql-ast/src/test/kotlin/org/partiql/ast/normalize/NormalizeTest.kt b/partiql-ast/src/test/kotlin/org/partiql/ast/normalize/NormalizeTest.kt
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/Env.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/Env.kt
@@ -11,7 +11,6 @@ import org.partiql.plan.identifierQualified
 import org.partiql.plan.identifierSymbol
 import org.partiql.planner.typer.FunctionResolver
 import org.partiql.planner.typer.Mapping
-import org.partiql.planner.typer.isNullOrMissing
 import org.partiql.planner.typer.toRuntimeType
 import org.partiql.spi.BindingCase
 import org.partiql.spi.BindingName
@@ -205,7 +204,6 @@ internal class Env(
             if (!hadMissingArg && arg.type.isMissable()) {
                 hadMissingArg = true
             }
-            arg.type.isNullOrMissing()
             FunctionParameter("arg-$i", arg.type.toRuntimeType())
         }
         val match = functionResolver.match(candidates, parameters)
@@ -228,7 +226,6 @@ internal class Env(
             if (!hadMissingArg && arg.type.isMissable()) {
                 hadMissingArg = true
             }
-            arg.type.isNullOrMissing()
             FunctionParameter("arg-$i", arg.type.toRuntimeType())
         }
         val match = functionResolver.match(candidates, parameters)

diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/typer/PlanTyper.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/typer/PlanTyper.kt
@@ -963,7 +963,7 @@ internal class PlanTyper(
             var missingArg = false
             val args = arguments.map {
                 val arg = visitRex(it, null)
-                if (arg.type == MissingType) missingArg = true
+                if (arg.type.isMissable()) missingArg = true
                 arg
             }
 
@@ -989,7 +989,7 @@ internal class PlanTyper(
 
                     // Some operators can return MISSING during runtime
                     if (match.isMissable) {
-                        type = StaticType.unionOf(type, StaticType.MISSING)
+                        type = StaticType.unionOf(type, StaticType.MISSING).flatten()
                     }
 
                     // Finally, rewrite this node

diff --git a/partiql-types/src/main/kotlin/org/partiql/types/function/FunctionSignature.kt b/partiql-types/src/main/kotlin/org/partiql/types/function/FunctionSignature.kt
@@ -113,7 +113,8 @@ public sealed class FunctionSignature(
                 other.name != name ||
                 other.returns != returns ||
                 other.parameters.size != parameters.size ||
-                other.isDecomposable != isDecomposable
+                other.isDecomposable != isDecomposable ||
+                other.isNullable != isNullable
             ) {
                 return false
             }
@@ -131,12 +132,12 @@ public sealed class FunctionSignature(
             result = 31 * result + returns.hashCode()
             result = 31 * result + parameters.hashCode()
             result = 31 * result + isDecomposable.hashCode()
+            result = 31 * result + isNullable.hashCode()
             result = 31 * result + (description?.hashCode() ?: 0)
             return result
         }
     }
 
-
     // // Logic for writing a [FunctionSignature] using SQL `CREATE FUNCTION` syntax.
     //
     // /**