Merge pull request DataLinkDC#145 from zhu-mingye/dev

[fixbug]修复flinksqlDDL注释中存在单双引号引起语法校验失败的问题优化SQLDDL中字段添加`` 防止关键字问题造成校验失败
aiwenmo · Feb 17, 2022 · 2408187 · 2408187
2 parents f3e2817 + b60b3cd
commit 2408187
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/dlink-common/src/main/java/com/dlink/model/Table.java b/dlink-common/src/main/java/com/dlink/model/Table.java
@@ -82,9 +82,13 @@ public String getFlinkTableSql(String catalogName, Map<String, String> typeConve
             if (i > 0) {
                 sb.append(",");
             }
-            sb.append(columns.get(i).getName() + " " + type);
+            sb.append("`" + columns.get(i).getName() + "` " + type);
             if (Asserts.isNotNullString(columns.get(i).getComment())) {
-                sb.append(" COMMENT '"+columns.get(i).getComment() + "'");
+                if(columns.get(i).getComment().contains("\'") | columns.get(i).getComment().contains("\"")) {
+                    sb.append(" COMMENT '" + columns.get(i).getComment().replaceAll("\"|'","") + "'");
+                }else {
+                    sb.append(" COMMENT '" + columns.get(i).getComment() + "'");
+                }
             }
             sb.append("\n");
             if (columns.get(i).isKeyFlag()) {
@@ -96,7 +100,7 @@ public String getFlinkTableSql(String catalogName, Map<String, String> typeConve
             if (i > 0) {
                 pksb.append(",");
             }
-            pksb.append(pks.get(i));
+            pksb.append("`"+pks.get(i)+"`");
         }
         pksb.append(" ) NOT ENFORCED\n");
         if (pks.size() > 0) {
@@ -105,24 +109,42 @@ public String getFlinkTableSql(String catalogName, Map<String, String> typeConve
         }
         sb.append(")");
         if(Asserts.isNotNullString(comment)){
-            sb.append(" COMMENT '"+comment+"'\n");
+            if(comment.contains("\'") | comment.contains("\"")) {
+                sb.append(" COMMENT '" + comment.replaceAll("\"|'","") + "'\n");
+            }else {
+                sb.append(" COMMENT '" + comment + "'\n");
+            }
         }
         sb.append(" WITH (\n");
         sb.append(getFlinkTableWith(flinkConfig));
         sb.append("\n);\n");
         return sb.toString();
     }
 
+
     public String getSqlSelect(String catalogName) {
         StringBuilder sb = new StringBuilder("SELECT\n");
         for (int i = 0; i < columns.size(); i++) {
             sb.append("    ");
             if (i > 0) {
                 sb.append(",");
             }
-            sb.append(columns.get(i).getName() + "\n");
+            String columnComment= columns.get(i).getComment();
+            if(columnComment.contains("\'") | columnComment.contains("\"")) {
+                columnComment = columnComment.replaceAll("\"|'","");
+            }
+            if(Asserts.isNotNullString(columnComment)){
+                sb.append("`"+columns.get(i).getName() + "`  --  " + columnComment + " \n");
+            }else {
+                sb.append("`"+columns.get(i).getName() + "` \n");
+
+            }
+        }
+        if(Asserts.isNotNullString(comment)){
+            sb.append(" FROM " + catalogName + "." + schema + "." + name + ";" + " -- " + comment + "\n");
+        }else {
+            sb.append(" FROM " + catalogName + "." + schema + "." + name +";\n");
         }
-        sb.append(" FROM " + catalogName + "." + schema + "." + name + ";\n");
         return sb.toString();
     }
 }
diff --git a/...adata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java b/...adata/dlink-metadata-base/src/main/java/com/dlink/metadata/driver/AbstractJdbcDriver.java
@@ -166,7 +166,10 @@ public List<Column> listColumns(String schemaName, String tableName) {
                 field.setName(columnName);
                 field.setType(results.getString(dbQuery.columnType()));
                 field.setJavaType(getTypeConvert().convert(field.getType()).getType());
-                field.setComment(results.getString(dbQuery.columnComment()));
+
+                String columnComment=results.getString(dbQuery.columnComment()).replaceAll("\"|'","");
+                field.setComment(columnComment);
+
                 field.setNullable(Asserts.isEqualsIgnoreCase(results.getString(dbQuery.isNullable()),"YES"));
                 field.setCharacterSet(results.getString(dbQuery.characterSet()));
                 field.setCollation(results.getString(dbQuery.collation()));