Throw semantic exception when '?' is passed for parameter

Used to throw NullPointerException
trinodb · Jul 24, 2020 · 02c5bf1 · 02c5bf1
1 parent 063a747
commit 02c5bf1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/presto-main/src/main/java/io/prestosql/sql/analyzer/ExpressionAnalyzer.java b/presto-main/src/main/java/io/prestosql/sql/analyzer/ExpressionAnalyzer.java
@@ -1108,7 +1108,11 @@ protected Type visitParameter(Parameter node, StackableAstVisitorContext<Context
                 throw semanticException(INVALID_PARAMETER_USAGE, node, "Invalid parameter index %s, max value is %s", node.getPosition(), parameters.size() - 1);
             }
 
-            Type resultType = process(parameters.get(NodeRef.of(node)), context);
+            Expression providedValue = parameters.get(NodeRef.of(node));
+            if (providedValue == null) {
+                throw semanticException(INVALID_PARAMETER_USAGE, node, "No value provided for parameter");
+            }
+            Type resultType = process(providedValue, context);
             return setExpressionType(node, resultType);
         }
 

diff --git a/presto-tests/src/test/java/io/prestosql/tests/AbstractTestEngineOnlyQueries.java b/presto-tests/src/test/java/io/prestosql/tests/AbstractTestEngineOnlyQueries.java
@@ -720,6 +720,20 @@ public void testParametersNonPreparedStatement()
                 "line 1:1: Incorrect number of parameters: expected 1 but found 0");
     }
 
+    @Test
+    public void testParameterInParameter()
+    {
+        String query = "SELECT a FROM (VALUES 1) t(a) where a = ?";
+        Session session = Session.builder(getSession())
+                .addPreparedStatement("my_query", query)
+                .build();
+
+        assertQueryFails(
+                session,
+                "EXECUTE my_query USING ?",
+                "\\Qline 1:24: No value provided for parameter\\E");
+    }
+
     @Test
     public void testDescribeInput()
     {