diff --git a/dingo-calcite/src/main/codegen/includes/Show.ftl b/dingo-calcite/src/main/codegen/includes/Show.ftl
index 8e61c3e3bd..a87ce2162f 100644
--- a/dingo-calcite/src/main/codegen/includes/Show.ftl
+++ b/dingo-calcite/src/main/codegen/includes/Show.ftl
@@ -128,6 +128,9 @@ SqlShow SqlShowCreate(Span s): {
(
tableName = CompoundTableIdentifier()
{ return new SqlShowCreateTable(s.end(this), tableName); }
+ |
+ tableName = CompoundTableIdentifier()
+ { return new SqlShowCreateTable(s.end(this), tableName); }
|
{ userName = token.image.replace("'", ""); }
diff --git a/dingo-calcite/src/main/codegen/templates/Parser.jj b/dingo-calcite/src/main/codegen/templates/Parser.jj
index 389664e70c..94ba692025 100644
--- a/dingo-calcite/src/main/codegen/templates/Parser.jj
+++ b/dingo-calcite/src/main/codegen/templates/Parser.jj
@@ -6764,7 +6764,7 @@ SqlNode BuiltinFunctionCall() :
//~ FUNCTIONS WITH SPECIAL SYNTAX ---------------------------------------
(
{ s = span(); StringBuilder aliasBuilder = new StringBuilder(this.token.image); aliasBuilder.append("("); }
- AddExpression(args, ExprContext.ACCEPT_SUB_QUERY) { aliasBuilder.append(this.token.image); }
+ AddExpression(args, ExprContext.ACCEPT_SUB_QUERY) { aliasBuilder.append(args.get(args.size() - 1).toString()); }
{ aliasBuilder.append(" ").append(this.token.image); }
(
dt = DataType() { args.add(dt); aliasBuilder.append(" ").append(dt.toString()); }