Address review comments

Signed-off-by: Mihai Budiu <[email protected]>
apache · Sep 14, 2023 · 34f52c5 · 34f52c5
1 parent b6679d0
commit 34f52c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
@@ -1438,7 +1438,7 @@ public static SqlNode toSql(RexLiteral literal) {
           castNonNull(literal.getValueAs(TimestampString.class)),
           literal.getType().getPrecision(), POS);
     case BINARY:
-      return SqlLiteral.createBinaryString(requireNonNull(literal.getValueAs(byte[].class)), POS);
+      return SqlLiteral.createBinaryString(castNonNull(literal.getValueAs(byte[].class)), POS);
     case ANY:
     case NULL:
       switch (typeName) {

diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
@@ -224,10 +224,14 @@ private static String toSql(RelNode root, SqlDialect dialect,
    * Test for <a href="https://issues.apache.org/jira/browse/CALCITE-5988">[CALCITE-5988]</a>
    * SqlImplementor.toSql cannot emit VARBINARY literals.
    */
-  @Test void testBinary() {
+  @Test void testBinaryLiteral() {
     String query = "SELECT x'ABCD'";
     String expected = "SELECT X'ABCD'";
+    // We use Mysql here because using the default Calcite dialect
+    // the expected string is a bit too verbose:
+    // "SELECT *\nFROM (VALUES (X'ABCD')) AS \"t\" (\"EXPR$0\")"
     sql(query).withMysql().ok(expected);
+    sql("SELECT cast(null as binary)").withMysql().ok("SELECT NULL");
   }
 
   @Test void testGroupByBooleanLiteral() {