(doris-flink-connector) branch master updated: [fix](cdc)resolve the issue of automatic table creation failure in SQL Server due to the presence of the `systranschemas` (#302)

[diwu]

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

diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-flink-connector.git


The following commit(s) were added to refs/heads/master by this push:
     new 480a2aa  [fix](cdc)resolve the issue of automatic table creation 
failure in SQL Server due to the presence of the `systranschemas`  (#302)
480a2aa is described below

commit 480a2aaccccb2766883f86c57b4767433d357db1
Author: Petrichor <31833513+vinle...@users.noreply.github.com>
AuthorDate: Wed Jan 24 17:08:05 2024 +0800

    [fix](cdc)resolve the issue of automatic table creation failure in SQL 
Server due to the presence of the `systranschemas`  (#302)
---
 .../apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java  | 3 +--
 .../doris/flink/tools/cdc/sqlserver/SqlServerDatabaseSync.java   | 9 ++++-----
 .../apache/doris/flink/tools/cdc/sqlserver/SqlServerType.java    | 2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java
 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java
index 0dd4262..ef2e7ac 100644
--- 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java
+++ 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java
@@ -230,7 +230,6 @@ public class OracleDatabaseSync extends DatabaseSync {
 
     @Override
     public String getTableListPrefix() {
-        String schemaName = config.get(OracleSourceOptions.SCHEMA_NAME);
-        return schemaName;
+        return config.get(OracleSourceOptions.SCHEMA_NAME);
     }
 }
diff --git 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerDatabaseSync.java
 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerDatabaseSync.java
index fcdb6b1..da96f08 100644
--- 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerDatabaseSync.java
+++ 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerDatabaseSync.java
@@ -99,7 +99,7 @@ public class SqlServerDatabaseSync extends DatabaseSync {
         try (Connection conn = getConnection()) {
             DatabaseMetaData metaData = conn.getMetaData();
             try (ResultSet tables =
-                    metaData.getTables(databaseName, null, "%", new String[] 
{"TABLE"})) {
+                    metaData.getTables(databaseName, schemaName, "%", new 
String[] {"TABLE"})) {
                 while (tables.next()) {
                     String tableName = tables.getString("TABLE_NAME");
                     String tableComment = tables.getString("REMARKS");
@@ -108,7 +108,7 @@ public class SqlServerDatabaseSync extends DatabaseSync {
                     }
                     SourceSchema sourceSchema =
                             new SqlServerSchema(
-                                    metaData, databaseName, null, tableName, 
tableComment);
+                                    metaData, databaseName, schemaName, 
tableName, tableComment);
                     sourceSchema.setModel(
                             !sourceSchema.primaryKeys.isEmpty()
                                     ? DataModel.UNIQUE
@@ -129,7 +129,7 @@ public class SqlServerDatabaseSync extends DatabaseSync {
 
         String tableName = config.get(JdbcSourceOptions.TABLE_NAME);
         String hostname = config.get(JdbcSourceOptions.HOSTNAME);
-        Integer port = config.getInteger(PORT, 1433);
+        int port = config.getInteger(PORT, 1433);
         String username = config.get(JdbcSourceOptions.USERNAME);
         String password = config.get(JdbcSourceOptions.PASSWORD);
 
@@ -204,7 +204,6 @@ public class SqlServerDatabaseSync extends DatabaseSync {
 
     @Override
     public String getTableListPrefix() {
-        String schemaName = config.get(JdbcSourceOptions.SCHEMA_NAME);
-        return schemaName;
+        return config.get(JdbcSourceOptions.SCHEMA_NAME);
     }
 }
diff --git 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerType.java
 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerType.java
index dace43f..6c92ae4 100644
--- 
a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerType.java
+++ 
b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/sqlserver/SqlServerType.java
@@ -102,6 +102,8 @@ public class SqlServerType {
             case DATETIMEOFFSET:
             case TIMESTAMP:
             case UNIQUEIDENTIFIER:
+            case BINARY:
+            case VARBINARY:
                 return DorisType.STRING;
             default:
                 throw new UnsupportedOperationException(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org