rebase on enhanced create catalog

liyubin117 · Jun 14, 2024 · 674a99c · 674a99c
1 parent 0305154
commit 674a99c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl b/flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl
@@ -166,7 +166,7 @@ SqlAlterCatalog SqlAlterCatalog() :
     SqlParserPos startPos;
     SqlIdentifier catalogName;
     SqlNodeList propertyList = SqlNodeList.EMPTY;
-    SqlCharStringLiteral comment = null;
+    SqlNode comment = null;
 }
 {
     <ALTER> <CATALOG> { startPos = getPos(); }
@@ -188,13 +188,12 @@ SqlAlterCatalog SqlAlterCatalog() :
                            propertyList);
         }
     |
-        <COMMENT> <QUOTED_STRING>
+        <COMMENT>
+        comment = StringLiteral()
         {
-            String p = SqlParserUtil.parseString(token.image);
-            comment = SqlLiteral.createCharString(p, getPos());
             return new SqlAlterCatalogComment(startPos.plus(getPos()),
-                           catalogName,
-                           comment);
+                                       catalogName,
+                                       comment);
         }
     )
 }

diff --git a/...link-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAlterCatalogComment.java b/...link-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAlterCatalogComment.java
@@ -24,7 +24,6 @@
 import org.apache.calcite.sql.SqlWriter;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.util.ImmutableNullableList;
-import org.apache.calcite.util.NlsString;
 
 import java.util.List;
 
@@ -33,10 +32,10 @@
 /** ALTER CATALOG catalog_name COMMENT 'comment'. */
 public class SqlAlterCatalogComment extends SqlAlterCatalog {
 
-    private final SqlCharStringLiteral comment;
+    private final SqlNode comment;
 
     public SqlAlterCatalogComment(
-            SqlParserPos position, SqlIdentifier catalogName, SqlCharStringLiteral comment) {
+            SqlParserPos position, SqlIdentifier catalogName, SqlNode comment) {
         super(position, catalogName);
         this.comment = requireNonNull(comment, "comment cannot be null");
     }
@@ -46,8 +45,8 @@ public List<SqlNode> getOperandList() {
         return ImmutableNullableList.of(catalogName, comment);
     }
 
-    public String getComment() {
-        return comment.getValueAs(NlsString.class).getValue();
+    public SqlNode getComment() {
+        return comment;
     }
 
     @Override

diff --git a/...org/apache/flink/table/planner/operations/converters/SqlAlterCatalogCommentConverter.java b/...org/apache/flink/table/planner/operations/converters/SqlAlterCatalogCommentConverter.java
@@ -22,13 +22,19 @@
 import org.apache.flink.table.operations.Operation;
 import org.apache.flink.table.operations.ddl.AlterCatalogCommentOperation;
 
+import org.apache.calcite.sql.SqlCharStringLiteral;
+import org.apache.calcite.util.NlsString;
+
 /** A converter for {@link SqlAlterCatalogComment}. */
 public class SqlAlterCatalogCommentConverter implements SqlNodeConverter<SqlAlterCatalogComment> {
 
     @Override
     public Operation convertSqlNode(
             SqlAlterCatalogComment sqlAlterCatalogComment, ConvertContext context) {
         return new AlterCatalogCommentOperation(
-                sqlAlterCatalogComment.catalogName(), sqlAlterCatalogComment.getComment());
+                sqlAlterCatalogComment.catalogName(),
+                ((SqlCharStringLiteral) sqlAlterCatalogComment.getComment())
+                        .getValueAs(NlsString.class)
+                        .getValue());
     }
 }