JDBC连接器：修复pg无法读取postgresql数据库，修复xugu无法获取其他模式

LeonYoah · Jul 5, 2024 · 6619073 · 6619073
1 parent 6a51f11
commit 6619073
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 5 deletions.
diff --git a/...ain/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java b/...ain/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java
@@ -100,7 +100,7 @@ public class PostgresCatalog extends AbstractJdbcCatalog {
         SYS_DATABASES.add("pg_toast");
         SYS_DATABASES.add("pg_temp_1");
         SYS_DATABASES.add("pg_toast_temp_1");
-        SYS_DATABASES.add("postgres");
+        //SYS_DATABASES.add("postgres");
         SYS_DATABASES.add("template0");
         SYS_DATABASES.add("template1");
     }

diff --git a/...rc/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java b/...rc/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java
@@ -162,8 +162,10 @@ protected String getDropTableSql(TablePath tablePath) {
 
     @Override
     protected String getListTableSql(String databaseName) {
-        return "SELECT user_name ,table_name FROM all_users au \n" +
-                "INNER JOIN all_tables at ON au.user_id=at.user_id AND au.db_id=at.db_id";
+        return "select s.schema_name,t.table_name \n" +
+                "from all_schemas s,all_tables t\n" +
+                "where\n" +
+                "s.schema_id=t.schema_id";
     }
 
     @Override

diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/pom.xml b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.seatunnel</groupId>
         <artifactId>seatunnel-connector-v2-e2e</artifactId>
-        <version>${revision}</version>
+        <version>2.3.4</version>
     </parent>
 
     <artifactId>connector-hive-e2e</artifactId>

diff --git a/...ne-examples/src/main/java/org/apache/seatunnel/example/engine/SeaTunnelEngineExample.java b/...ne-examples/src/main/java/org/apache/seatunnel/example/engine/SeaTunnelEngineExample.java
@@ -31,7 +31,7 @@ public class SeaTunnelEngineExample {
 
     public static void main(String[] args)
             throws FileNotFoundException, URISyntaxException, CommandException {
-        String configurePath = args.length > 0 ? args[0] : "/examples/jdbc/sybaseTest";
+        String configurePath = args.length > 0 ? args[0] : "/examples/jdbc/xugu多模式测试.sh";
         String configFile = getTestConfigFile(configurePath);
         ClientCommandArgs clientCommandArgs = new ClientCommandArgs();
         clientCommandArgs.setConfigFile(configFile);

diff --git a/seatunnel-examples/seatunnel-engine-examples/src/main/resources/examples/jdbc/xugu多模式测试.sh b/seatunnel-examples/seatunnel-engine-examples/src/main/resources/examples/jdbc/xugu多模式测试.sh
@@ -0,0 +1,44 @@
+env {
+	job.mode = "BATCH"
+	parallelism = "1"
+	job.retry.times = "0"
+}
+
+source {
+	MappingJdbc {
+		result_table_name = "tmp_table_jdbc_184f2"
+		query = "select * from TEST1.TEST"
+		parallelism = 1
+		fetch_size = 3000
+		password_decrypt = true
+		table_path = "TEST1.TEST"
+		partition_num = 1
+		driver = "com.xugu.cloudjdbc.Driver"
+		url = "jdbc:xugu://10.28.23.110:5138/system"
+		user = "sysdba"
+		password = "FgulyLo9GktJHHWg9ctrdn2nQzyxhWJJLOO5+6J2K1gtp1Kf2BrVhxSr6ukJ9KZhvMXFTCJNE+pSy7MuKmi5pSYw8o9fKbKin+LmrdcYbxA+hnggUNhiIqxWnroPcu+zjh8WI0BDi6EKEh6HV9vNPUUknNQAwpOO6UNkAn9kJFg="
+	}
+}
+
+transform {
+}
+
+sink {
+	MappingJdbc {
+		database = "SYSTEM"
+		table = "TEST1.TEST2"
+		batch_size = 3000
+		generate_sink_sql = true
+		parallelism = 1
+		field_mapper = {"ID":"ID"}
+		source_table_name = "tmp_table_jdbc_184f2"
+		password_decrypt = true
+		data_save_mode = "APPEND_DATA"
+		schema_save_mode = "ERROR_WHEN_SCHEMA_NOT_EXIST"
+		enable_upsert = false
+		driver = "com.xugu.cloudjdbc.Driver"
+		url = "jdbc:xugu://10.28.23.110:5138/system"
+		user = "sysdba"
+		password = "FgulyLo9GktJHHWg9ctrdn2nQzyxhWJJLOO5+6J2K1gtp1Kf2BrVhxSr6ukJ9KZhvMXFTCJNE+pSy7MuKmi5pSYw8o9fKbKin+LmrdcYbxA+hnggUNhiIqxWnroPcu+zjh8WI0BDi6EKEh6HV9vNPUUknNQAwpOO6UNkAn9kJFg="
+	}
+}