(seatunnel) branch dev updated: [Improve][Jdbc] Remove MysqlType references in JdbcDialect (#7333)

[wanghailin]

This is an automated email from the ASF dual-hosted git repository.

wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 16eeb1c123 [Improve][Jdbc] Remove MysqlType references in JdbcDialect 
(#7333)
16eeb1c123 is described below

commit 16eeb1c12323b462474ad23103de96c0060a4537
Author: He Wang <wanghe...@qq.com>
AuthorDate: Wed Aug 7 14:54:46 2024 +0800

    [Improve][Jdbc] Remove MysqlType references in JdbcDialect (#7333)
---
 .../seatunnel/jdbc/internal/dialect/JdbcDialect.java       | 14 ++++----------
 .../jdbc/internal/dialect/mysql/MysqlDialect.java          |  7 +++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git 
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java
 
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java
index e59776b6f9..f98f2cb312 100644
--- 
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java
+++ 
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java
@@ -40,8 +40,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mysql.cj.MysqlType;
-
 import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -532,8 +530,7 @@ public interface JdbcDialect extends Serializable {
                     "ALTER TABLE %s drop column %s", tableName, 
quoteIdentifier(oldColumnName));
         }
         TypeConverter<?> typeConverter = 
ConverterLoader.loadTypeConverter(dialectName());
-        BasicTypeDefine<MysqlType> typeBasicTypeDefine =
-                (BasicTypeDefine<MysqlType>) 
typeConverter.reconvert(newColumn);
+        BasicTypeDefine typeBasicTypeDefine = (BasicTypeDefine) 
typeConverter.reconvert(newColumn);
 
         String basicSql = buildAlterTableBasicSql(alterOperation, tableName);
         basicSql =
@@ -616,8 +613,7 @@ public interface JdbcDialect extends Serializable {
      * @param typeBasicTypeDefine type basic type define of new column
      * @return alter table sql with nullable for sink table
      */
-    default String decorateWithNullable(
-            String basicSql, BasicTypeDefine<MysqlType> typeBasicTypeDefine) {
+    default String decorateWithNullable(String basicSql, BasicTypeDefine 
typeBasicTypeDefine) {
         StringBuilder sql = new StringBuilder(basicSql);
         if (typeBasicTypeDefine.isNullable()) {
             sql.append("NULL ");
@@ -634,8 +630,7 @@ public interface JdbcDialect extends Serializable {
      * @param typeBasicTypeDefine type basic type define of new column
      * @return alter table sql with default value for sink table
      */
-    default String decorateWithDefaultValue(
-            String basicSql, BasicTypeDefine<MysqlType> typeBasicTypeDefine) {
+    default String decorateWithDefaultValue(String basicSql, BasicTypeDefine 
typeBasicTypeDefine) {
         Object defaultValue = typeBasicTypeDefine.getDefaultValue();
         if (Objects.nonNull(defaultValue)
                 && 
needsQuotesWithDefaultValue(typeBasicTypeDefine.getColumnType())
@@ -656,8 +651,7 @@ public interface JdbcDialect extends Serializable {
      * @param typeBasicTypeDefine type basic type define of new column
      * @return alter table sql with comment for sink table
      */
-    default String decorateWithComment(
-            String basicSql, BasicTypeDefine<MysqlType> typeBasicTypeDefine) {
+    default String decorateWithComment(String basicSql, BasicTypeDefine 
typeBasicTypeDefine) {
         String comment = typeBasicTypeDefine.getComment();
         StringBuilder sql = new StringBuilder(basicSql);
         if (StringUtils.isNotBlank(comment)) {
diff --git 
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java
 
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java
index 73ef12bc47..fd0af3d9ff 100644
--- 
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java
+++ 
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java
@@ -245,13 +245,12 @@ public class MysqlDialect implements JdbcDialect {
     }
 
     @Override
-    public String decorateWithComment(
-            String basicSql, BasicTypeDefine<MysqlType> 
mysqlTypeBasicTypeDefine) {
-        MysqlType nativeType = mysqlTypeBasicTypeDefine.getNativeType();
+    public String decorateWithComment(String basicSql, BasicTypeDefine 
typeBasicTypeDefine) {
+        MysqlType nativeType = (MysqlType) typeBasicTypeDefine.getNativeType();
         if (NOT_SUPPORTED_DEFAULT_VALUES.contains(nativeType)) {
             return basicSql;
         }
-        return JdbcDialect.super.decorateWithComment(basicSql, 
mysqlTypeBasicTypeDefine);
+        return JdbcDialect.super.decorateWithComment(basicSql, 
typeBasicTypeDefine);
     }
 
     @Override