Fix JDBC constant rewrites for NULL literal

trinodb · Jul 29, 2022 · 2c5ce56 · 2c5ce56
1 parent f1122d3
commit 2c5ce56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/...-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteExactNumericConstant.java b/...-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteExactNumericConstant.java
@@ -46,6 +46,10 @@ public Pattern<Constant> getPattern()
     @Override
     public Optional<String> rewrite(Constant constant, Captures captures, RewriteContext<String> context)
     {
+        if (constant.getValue() == null) {
+            return Optional.empty();
+        }
+
         Type type = constant.getType();
         if (constant.getValue() == null) {
             return Optional.empty();

diff --git a/...trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteVarcharConstant.java b/...trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/RewriteVarcharConstant.java
@@ -43,6 +43,9 @@ public Optional<String> rewrite(Constant constant, Captures captures, RewriteCon
             return Optional.empty();
         }
         Slice slice = (Slice) constant.getValue();
+        if (slice == null) {
+            return Optional.empty();
+        }
         return Optional.of("'" + slice.toStringUtf8().replace("'", "''") + "'");
     }
 }