This is an automated email from the ASF dual-hosted git repository.
fanjia 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 dbfc8a670a [Improve][Jdbc] Fix database identifier (#5756)
dbfc8a670a is described below
commit dbfc8a670af764b376ef4c02fe4c0337795c02e9
Author: hailin0 <[email protected]>
AuthorDate: Wed Nov 1 08:36:32 2023 +0800
[Improve][Jdbc] Fix database identifier (#5756)
---
.../seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlDialect.java | 3 ++-
.../connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java | 4 +++-
.../seatunnel/cdc/sqlserver/source/source/SqlServerDialect.java | 3 ++-
.../seatunnel/jdbc/internal/dialect/DatabaseIdentifier.java | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlDialect.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlDialect.java
index 15d3b6bf7f..30e7ddf0f3 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlDialect.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlDialect.java
@@ -32,6 +32,7 @@ import
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.source.reader.fetch.b
import
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.source.reader.fetch.scan.MySqlSnapshotFetchTask;
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.utils.MySqlSchema;
import
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.utils.TableDiscoveryUtils;
+import
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.DatabaseIdentifier;
import io.debezium.jdbc.JdbcConnection;
import io.debezium.relational.TableId;
@@ -55,7 +56,7 @@ public class MySqlDialect implements JdbcDataSourceDialect {
@Override
public String getName() {
- return "MySQL";
+ return DatabaseIdentifier.MYSQL;
}
@Override
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java
index 270b0d7309..e4ae93bccb 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/source/MySqlIncrementalSource.java
@@ -45,6 +45,7 @@ import
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.config.MySqlSourceCon
import
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.source.offset.BinlogOffsetFactory;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.JdbcCatalogOptions;
import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.mysql.MySqlCatalogFactory;
+import
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.DatabaseIdentifier;
import com.google.auto.service.AutoService;
import lombok.NoArgsConstructor;
@@ -109,7 +110,8 @@ public class MySqlIncrementalSource<T> extends
IncrementalSource<T, JdbcSourceCo
SeaTunnelDataType<SeaTunnelRow> physicalRowType;
if (dataType == null) {
// TODO: support metadata keys
- try (Catalog catalog = new
MySqlCatalogFactory().createCatalog("mysql", config)) {
+ try (Catalog catalog =
+ new
MySqlCatalogFactory().createCatalog(DatabaseIdentifier.MYSQL, config)) {
catalog.open();
CatalogTable table =
catalog.getTable(
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerDialect.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerDialect.java
index 464d8637f7..c337ddc2a0 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerDialect.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/src/main/java/org/apache/seatunnel/connectors/seatunnel/cdc/sqlserver/source/source/SqlServerDialect.java
@@ -32,6 +32,7 @@ import
org.apache.seatunnel.connectors.seatunnel.cdc.sqlserver.source.source.rea
import
org.apache.seatunnel.connectors.seatunnel.cdc.sqlserver.source.source.reader.fetch.transactionlog.SqlServerTransactionLogFetchTask;
import
org.apache.seatunnel.connectors.seatunnel.cdc.sqlserver.source.utils.SqlServerSchema;
import
org.apache.seatunnel.connectors.seatunnel.cdc.sqlserver.source.utils.TableDiscoveryUtils;
+import
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.DatabaseIdentifier;
import io.debezium.jdbc.JdbcConnection;
import io.debezium.relational.TableId;
@@ -56,7 +57,7 @@ public class SqlServerDialect implements
JdbcDataSourceDialect {
@Override
public String getName() {
- return "SqlServer";
+ return DatabaseIdentifier.SQLSERVER;
}
@Override
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/DatabaseIdentifier.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/DatabaseIdentifier.java
index 697e61d81e..3b1738afb2 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/DatabaseIdentifier.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/DatabaseIdentifier.java
@@ -27,12 +27,12 @@ public class DatabaseIdentifier {
public static final String MYSQL = "MySQL";
public static final String ORACLE = "Oracle";
public static final String PHOENIX = "Phoenix";
- public static final String POSTGRESQL = "PostgreSQL";
+ public static final String POSTGRESQL = "Postgres";
public static final String REDSHIFT = "Redshift";
public static final String SAP_HANA = "SapHana";
public static final String SNOWFLAKE = "Snowflake";
public static final String SQLITE = "Sqlite";
- public static final String SQLSERVER = "Sqlserver";
+ public static final String SQLSERVER = "SqlServer";
public static final String TABLE_STORE = "Tablestore";
public static final String TERADATA = "Teradata";
public static final String VERTICA = "Vertica";
