From 18fc0cce071dce3c1da4252b7799e41f1023d5c4 Mon Sep 17 00:00:00 2001 From: Mihai Budiu Date: Mon, 25 Sep 2023 13:06:34 -0700 Subject: [PATCH] Add one more test with a charset Signed-off-by: Mihai Budiu --- .../java/org/apache/calcite/rel/rel2sql/SqlImplementor.java | 2 +- .../org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 index 3c444c7263d..ab6dce662ba 100644 --- a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java +++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java @@ -1412,7 +1412,7 @@ public static SqlNode toSql(RexLiteral literal) { + " has null SqlTypeFamily, and is SqlTypeName is " + typeName); switch (family) { case CHARACTER: { - NlsString value = literal.getValueAs(NlsString.class); + final NlsString value = literal.getValueAs(NlsString.class); if (value != null) { String charsetName = value.getCharsetName(); if (charsetName != null 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 index 635847f1105..0e97580cb6f 100644 --- a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java +++ b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java @@ -83,6 +83,7 @@ import org.apache.calcite.tools.RelBuilder; import org.apache.calcite.tools.RuleSet; import org.apache.calcite.tools.RuleSets; +import org.apache.calcite.util.ConversionUtil; import org.apache.calcite.util.ImmutableBitSet; import org.apache.calcite.util.TestUtil; import org.apache.calcite.util.Util; @@ -288,6 +289,9 @@ private static String toSql(RelNode root, SqlDialect dialect, sql("select _UTF8'\u4F60\u597D'") .withMysql() // produces a simpler output query .ok("SELECT _UTF-8'\u4F60\u597D'"); + sql("select _UTF16'" + ConversionUtil.TEST_UNICODE_STRING + "'") + .withMysql() + .ok("SELECT _UTF-16LE'" + ConversionUtil.TEST_UNICODE_STRING + "'"); } /** Test case for