You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by zh...@apache.org on 2024/01/15 13:11:57 UTC

(seatunnel) branch dev updated: [Feature] Support `uuid` in postgres jdbc (#6185)

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

zhouyao2023 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 f56855098b [Feature] Support `uuid` in postgres jdbc (#6185)
f56855098b is described below

commit f56855098bad52a5d14c6f3b57e34f14e1d34bca
Author: Jia Fan <fa...@qq.com>
AuthorDate: Mon Jan 15 21:11:52 2024 +0800

    [Feature] Support `uuid` in postgres jdbc (#6185)
    
    * [Feature] Support `uuid` in postgres jdbc
    
    * update
    
    * update doc
---
 docs/en/connector-v2/sink/PostgreSql.md            | 44 +++++++++++-----------
 docs/en/connector-v2/source/PostgreSQL.md          | 44 +++++++++++-----------
 .../catalog/psql/PostgresDataTypeConvertor.java    |  3 +-
 .../internal/dialect/psql/PostgresTypeMapper.java  |  2 +
 .../connectors/seatunnel/jdbc/JdbcPostgresIT.java  |  6 +++
 .../resources/jdbc_postgres_source_and_sink.conf   |  2 +-
 .../jdbc_postgres_source_and_sink_parallel.conf    |  6 +--
 ...tgres_source_and_sink_parallel_upper_lower.conf |  6 +--
 .../jdbc_postgres_source_and_sink_xa.conf          |  6 +--
 9 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/docs/en/connector-v2/sink/PostgreSql.md b/docs/en/connector-v2/sink/PostgreSql.md
index 31f30b7346..0868d64dc5 100644
--- a/docs/en/connector-v2/sink/PostgreSql.md
+++ b/docs/en/connector-v2/sink/PostgreSql.md
@@ -36,28 +36,28 @@ semantics (using XA transaction guarantee).
 
 ## Data Type Mapping
 
-|                                  PostgreSQL Data type                                   |                                                              SeaTunnel Data type                                                               |
-|-----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| BOOL<br/>                                                                               | BOOLEAN                                                                                                                                        |
-| _BOOL<br/>                                                                              | ARRAY&LT;BOOLEAN&GT;                                                                                                                           |
-| BYTEA<br/>                                                                              | BYTES                                                                                                                                          |
-| _BYTEA<br/>                                                                             | ARRAY&LT;TINYINT&GT;                                                                                                                           |
-| INT2<br/>SMALLSERIAL<br/>INT4<br/>SERIAL<br/>                                           | INT                                                                                                                                            |
-| _INT2<br/>_INT4<br/>                                                                    | ARRAY&LT;INT&GT;                                                                                                                               |
-| INT8<br/>BIGSERIAL<br/>                                                                 | BIGINT                                                                                                                                         |
-| _INT8<br/>                                                                              | ARRAY&LT;BIGINT&GT;                                                                                                                            |
-| FLOAT4<br/>                                                                             | FLOAT                                                                                                                                          |
-| _FLOAT4<br/>                                                                            | ARRAY&LT;FLOAT&GT;                                                                                                                             |
-| FLOAT8<br/>                                                                             | DOUBLE                                                                                                                                         |
-| _FLOAT8<br/>                                                                            | ARRAY&LT;DOUBLE&GT;                                                                                                                            |
-| NUMERIC(Get the designated column's specified column size>0)                            | DECIMAL(Get the designated column's specified column size,Gets the number of digits in the specified column to the right of the decimal point) |
-| NUMERIC(Get the designated column's specified column size<0)                            | DECIMAL(38, 18)                                                                                                                                |
-| BPCHAR<br/>CHARACTER<br/>VARCHAR<br/>TEXT<br/>GEOMETRY<br/>GEOGRAPHY<br/>JSON<br/>JSONB | STRING                                                                                                                                         |
-| _BPCHAR<br/>_CHARACTER<br/>_VARCHAR<br/>_TEXT                                           | ARRAY&LT;STRING&GT;                                                                                                                            |
-| TIMESTAMP<br/>                                                                          | TIMESTAMP                                                                                                                                      |
-| TIME<br/>                                                                               | TIME                                                                                                                                           |
-| DATE<br/>                                                                               | DATE                                                                                                                                           |
-| OTHER DATA TYPES                                                                        | NOT SUPPORTED YET                                                                                                                              |
+|                                       PostgreSQL Data type                                       |                                                              SeaTunnel Data type                                                               |
+|--------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
+| BOOL<br/>                                                                                        | BOOLEAN                                                                                                                                        |
+| _BOOL<br/>                                                                                       | ARRAY&LT;BOOLEAN&GT;                                                                                                                           |
+| BYTEA<br/>                                                                                       | BYTES                                                                                                                                          |
+| _BYTEA<br/>                                                                                      | ARRAY&LT;TINYINT&GT;                                                                                                                           |
+| INT2<br/>SMALLSERIAL<br/>INT4<br/>SERIAL<br/>                                                    | INT                                                                                                                                            |
+| _INT2<br/>_INT4<br/>                                                                             | ARRAY&LT;INT&GT;                                                                                                                               |
+| INT8<br/>BIGSERIAL<br/>                                                                          | BIGINT                                                                                                                                         |
+| _INT8<br/>                                                                                       | ARRAY&LT;BIGINT&GT;                                                                                                                            |
+| FLOAT4<br/>                                                                                      | FLOAT                                                                                                                                          |
+| _FLOAT4<br/>                                                                                     | ARRAY&LT;FLOAT&GT;                                                                                                                             |
+| FLOAT8<br/>                                                                                      | DOUBLE                                                                                                                                         |
+| _FLOAT8<br/>                                                                                     | ARRAY&LT;DOUBLE&GT;                                                                                                                            |
+| NUMERIC(Get the designated column's specified column size>0)                                     | DECIMAL(Get the designated column's specified column size,Gets the number of digits in the specified column to the right of the decimal point) |
+| NUMERIC(Get the designated column's specified column size<0)                                     | DECIMAL(38, 18)                                                                                                                                |
+| BPCHAR<br/>CHARACTER<br/>VARCHAR<br/>TEXT<br/>GEOMETRY<br/>GEOGRAPHY<br/>JSON<br/>JSONB<br/>UUID | STRING                                                                                                                                         |
+| _BPCHAR<br/>_CHARACTER<br/>_VARCHAR<br/>_TEXT                                                    | ARRAY&LT;STRING&GT;                                                                                                                            |
+| TIMESTAMP<br/>                                                                                   | TIMESTAMP                                                                                                                                      |
+| TIME<br/>                                                                                        | TIME                                                                                                                                           |
+| DATE<br/>                                                                                        | DATE                                                                                                                                           |
+| OTHER DATA TYPES                                                                                 | NOT SUPPORTED YET                                                                                                                              |
 
 ## Options
 
diff --git a/docs/en/connector-v2/source/PostgreSQL.md b/docs/en/connector-v2/source/PostgreSQL.md
index 7d43c13906..a29b9b102c 100644
--- a/docs/en/connector-v2/source/PostgreSQL.md
+++ b/docs/en/connector-v2/source/PostgreSQL.md
@@ -38,28 +38,28 @@ Read external data source data through JDBC.
 
 ## Data Type Mapping
 
-|                                  PostgreSQL Data type                                   |                                                              SeaTunnel Data type                                                               |
-|-----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| BOOL<br/>                                                                               | BOOLEAN                                                                                                                                        |
-| _BOOL<br/>                                                                              | ARRAY&LT;BOOLEAN&GT;                                                                                                                           |
-| BYTEA<br/>                                                                              | BYTES                                                                                                                                          |
-| _BYTEA<br/>                                                                             | ARRAY&LT;TINYINT&GT;                                                                                                                           |
-| INT2<br/>SMALLSERIAL<br/>INT4<br/>SERIAL<br/>                                           | INT                                                                                                                                            |
-| _INT2<br/>_INT4<br/>                                                                    | ARRAY&LT;INT&GT;                                                                                                                               |
-| INT8<br/>BIGSERIAL<br/>                                                                 | BIGINT                                                                                                                                         |
-| _INT8<br/>                                                                              | ARRAY&LT;BIGINT&GT;                                                                                                                            |
-| FLOAT4<br/>                                                                             | FLOAT                                                                                                                                          |
-| _FLOAT4<br/>                                                                            | ARRAY&LT;FLOAT&GT;                                                                                                                             |
-| FLOAT8<br/>                                                                             | DOUBLE                                                                                                                                         |
-| _FLOAT8<br/>                                                                            | ARRAY&LT;DOUBLE&GT;                                                                                                                            |
-| NUMERIC(Get the designated column's specified column size>0)                            | DECIMAL(Get the designated column's specified column size,Gets the number of digits in the specified column to the right of the decimal point) |
-| NUMERIC(Get the designated column's specified column size<0)                            | DECIMAL(38, 18)                                                                                                                                |
-| BPCHAR<br/>CHARACTER<br/>VARCHAR<br/>TEXT<br/>GEOMETRY<br/>GEOGRAPHY<br/>JSON<br/>JSONB | STRING                                                                                                                                         |
-| _BPCHAR<br/>_CHARACTER<br/>_VARCHAR<br/>_TEXT                                           | ARRAY&LT;STRING&GT;                                                                                                                            |
-| TIMESTAMP<br/>                                                                          | TIMESTAMP                                                                                                                                      |
-| TIME<br/>                                                                               | TIME                                                                                                                                           |
-| DATE<br/>                                                                               | DATE                                                                                                                                           |
-| OTHER DATA TYPES                                                                        | NOT SUPPORTED YET                                                                                                                              |
+|                                       PostgreSQL Data type                                       |                                                              SeaTunnel Data type                                                               |
+|--------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
+| BOOL<br/>                                                                                        | BOOLEAN                                                                                                                                        |
+| _BOOL<br/>                                                                                       | ARRAY&LT;BOOLEAN&GT;                                                                                                                           |
+| BYTEA<br/>                                                                                       | BYTES                                                                                                                                          |
+| _BYTEA<br/>                                                                                      | ARRAY&LT;TINYINT&GT;                                                                                                                           |
+| INT2<br/>SMALLSERIAL<br/>INT4<br/>SERIAL<br/>                                                    | INT                                                                                                                                            |
+| _INT2<br/>_INT4<br/>                                                                             | ARRAY&LT;INT&GT;                                                                                                                               |
+| INT8<br/>BIGSERIAL<br/>                                                                          | BIGINT                                                                                                                                         |
+| _INT8<br/>                                                                                       | ARRAY&LT;BIGINT&GT;                                                                                                                            |
+| FLOAT4<br/>                                                                                      | FLOAT                                                                                                                                          |
+| _FLOAT4<br/>                                                                                     | ARRAY&LT;FLOAT&GT;                                                                                                                             |
+| FLOAT8<br/>                                                                                      | DOUBLE                                                                                                                                         |
+| _FLOAT8<br/>                                                                                     | ARRAY&LT;DOUBLE&GT;                                                                                                                            |
+| NUMERIC(Get the designated column's specified column size>0)                                     | DECIMAL(Get the designated column's specified column size,Gets the number of digits in the specified column to the right of the decimal point) |
+| NUMERIC(Get the designated column's specified column size<0)                                     | DECIMAL(38, 18)                                                                                                                                |
+| BPCHAR<br/>CHARACTER<br/>VARCHAR<br/>TEXT<br/>GEOMETRY<br/>GEOGRAPHY<br/>JSON<br/>JSONB<br/>UUID | STRING                                                                                                                                         |
+| _BPCHAR<br/>_CHARACTER<br/>_VARCHAR<br/>_TEXT                                                    | ARRAY&LT;STRING&GT;                                                                                                                            |
+| TIMESTAMP<br/>                                                                                   | TIMESTAMP                                                                                                                                      |
+| TIME<br/>                                                                                        | TIME                                                                                                                                           |
+| DATE<br/>                                                                                        | DATE                                                                                                                                           |
+| OTHER DATA TYPES                                                                                 | NOT SUPPORTED YET                                                                                                                              |
 
 ## Options
 
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresDataTypeConvertor.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresDataTypeConvertor.java
index f0cb40f22f..a9d34e31bb 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresDataTypeConvertor.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresDataTypeConvertor.java
@@ -109,6 +109,7 @@ public class PostgresDataTypeConvertor implements DataTypeConvertor<String> {
     public static final String PG_JSON = "json";
     public static final String PG_JSONB = "jsonb";
     public static final String PG_XML = "xml";
+    public static final String PG_UUID = "uuid";
 
     @Override
     public SeaTunnelDataType<?> toSeaTunnelType(String field, String connectorDataType) {
@@ -153,7 +154,6 @@ public class PostgresDataTypeConvertor implements DataTypeConvertor<String> {
             case PG_NUMERIC:
                 int precision =
                         MapUtils.getInteger(dataTypeProperties, PRECISION, DEFAULT_PRECISION);
-                ;
                 int scale = MapUtils.getInteger(dataTypeProperties, SCALE, DEFAULT_SCALE);
                 return new DecimalType(precision, scale);
             case PG_CHAR:
@@ -166,6 +166,7 @@ public class PostgresDataTypeConvertor implements DataTypeConvertor<String> {
             case PG_JSON:
             case PG_JSONB:
             case PG_XML:
+            case PG_UUID:
                 return BasicType.STRING_TYPE;
             case PG_CHAR_ARRAY:
             case PG_CHARACTER_ARRAY:
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresTypeMapper.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresTypeMapper.java
index da4b03f2a9..12d8e4df55 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresTypeMapper.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresTypeMapper.java
@@ -89,6 +89,7 @@ public class PostgresTypeMapper implements JdbcDialectTypeMapper {
     private static final String PG_JSON = "json";
     private static final String PG_JSONB = "jsonb";
     private static final String PG_XML = "xml";
+    public static final String PG_UUID = "uuid";
 
     @Override
     public SeaTunnelDataType<?> mapping(ResultSetMetaData metadata, int colIndex)
@@ -144,6 +145,7 @@ public class PostgresTypeMapper implements JdbcDialectTypeMapper {
             case PG_JSON:
             case PG_JSONB:
             case PG_XML:
+            case PG_UUID:
                 return BasicType.STRING_TYPE;
             case PG_CHAR_ARRAY:
             case PG_CHARACTER_ARRAY:
diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
index a47aa09d79..a0181fbf81 100644
--- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
+++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIT.java
@@ -76,6 +76,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
     private static final String PG_SOURCE_DDL =
             "CREATE TABLE IF NOT EXISTS pg_e2e_source_table (\n"
                     + "  gid SERIAL PRIMARY KEY,\n"
+                    + "  uuid_col UUID,\n"
                     + "  text_col TEXT,\n"
                     + "  varchar_col VARCHAR(255),\n"
                     + "  char_col CHAR(10),\n"
@@ -110,6 +111,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
     private static final String PG_SINK_DDL =
             "CREATE TABLE IF NOT EXISTS pg_e2e_sink_table (\n"
                     + "    gid SERIAL PRIMARY KEY,\n"
+                    + "    uuid_col UUID,\n"
                     + "    text_col TEXT,\n"
                     + "    varchar_col VARCHAR(255),\n"
                     + "    char_col CHAR(10),\n"
@@ -144,6 +146,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
     private static final String SOURCE_SQL =
             "select \n"
                     + "gid,\n"
+                    + "uuid_col, \n"
                     + "text_col,\n"
                     + "varchar_col,\n"
                     + "char_col,\n"
@@ -178,6 +181,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
     private static final String SINK_SQL =
             "select\n"
                     + "  gid,\n"
+                    + "uuid_col, \n"
                     + "   text_col,\n"
                     + "   varchar_col,\n"
                     + "   char_col,\n"
@@ -309,6 +313,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
                 statement.addBatch(
                         "INSERT INTO\n"
                                 + "  pg_e2e_source_table (gid,\n"
+                                + "    uuid_col,\n"
                                 + "    text_col,\n"
                                 + "    varchar_col,\n"
                                 + "    char_col,\n"
@@ -345,6 +350,7 @@ public class JdbcPostgresIT extends TestSuiteBase implements TestResource {
                                 + "    '"
                                 + i
                                 + "',\n"
+                                + "    gen_random_uuid(),\n"
                                 + "    'Hello World',\n"
                                 + "    'Test',\n"
                                 + "    'Testing',\n"
diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink.conf b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink.conf
index 5b00078006..76879bc769 100644
--- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink.conf
+++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink.conf
@@ -26,7 +26,7 @@ source{
         driver = "org.postgresql.Driver"
         user = "test"
         password = "test"
-        query ="""select gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
+        query ="""select gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
                          smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point, linestring, polygon_colums, multipoint,
                          multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col,xml_col from pg_e2e_source_table"""
       partition_column = "varchar_col"
diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel.conf b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel.conf
index 937b3dcd22..7d772c546f 100644
--- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel.conf
+++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel.conf
@@ -26,7 +26,7 @@ source{
         driver = "org.postgresql.Driver"
         user = "test"
         password = "test"
-        query ="""select gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
+        query ="""select gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
                          smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point, linestring, polygon_colums, multipoint,
                          multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col,xml_col from pg_e2e_source_table"""
         partition_column= "gid"
@@ -45,9 +45,9 @@ sink {
         user = "test"
         password = "test"
         connection_check_timeout_sec = 100
-        query ="""INSERT INTO pg_e2e_sink_table ( gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
+        query ="""INSERT INTO pg_e2e_sink_table ( gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
                                                        double_precision_col, smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point,
                                                        linestring, polygon_colums, multipoint, multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col,xml_col)
-                                          VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,? )"""
+                                          VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,? )"""
     }
 }
diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel_upper_lower.conf b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel_upper_lower.conf
index c717dacc3e..6a54335d2c 100644
--- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel_upper_lower.conf
+++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_parallel_upper_lower.conf
@@ -26,7 +26,7 @@ source{
         driver = "org.postgresql.Driver"
         user = "test"
         password = "test"
-        query ="""select gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
+        query ="""select gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
                          smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point, linestring, polygon_colums, multipoint,
                          multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col,xml_col from pg_e2e_source_table"""
         partition_column= "gid"
@@ -49,9 +49,9 @@ sink {
         user = "test"
         password = "test"
         connection_check_timeout_sec = 100
-        query ="""INSERT INTO pg_e2e_sink_table ( gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
+        query ="""INSERT INTO pg_e2e_sink_table ( gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
                                                        double_precision_col, smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point,
                                                        linestring, polygon_colums, multipoint, multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col,xml_col )
-                                          VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,?)"""
+                                          VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,?)"""
     }
 }
diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_xa.conf b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_xa.conf
index bfaa90d94d..01fb9b1c4b 100644
--- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_xa.conf
+++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-3/src/test/resources/jdbc_postgres_source_and_sink_xa.conf
@@ -26,7 +26,7 @@ source {
         driver = "org.postgresql.Driver"
         user = "test"
         password = "test"
-        query ="""select gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
+        query ="""select gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col, double_precision_col,
                          smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point, linestring, polygon_colums, multipoint,
                          multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col ,xml_col from pg_e2e_source_table"""
     }
@@ -42,10 +42,10 @@ sink {
         user = "test"
         password = "test"
         max_retries = 0
-        query ="""INSERT INTO pg_e2e_sink_table ( gid, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
+        query ="""INSERT INTO pg_e2e_sink_table ( gid, uuid_col, text_col, varchar_col, char_col, boolean_col, smallint_col, integer_col, bigint_col, decimal_col, numeric_col, real_col,
                                                        double_precision_col, smallserial_col, serial_col, bigserial_col, date_col, timestamp_col, bpchar_col, age, name, point,
                                                        linestring, polygon_colums, multipoint, multilinestring, multipolygon, geometrycollection, geog, json_col, jsonb_col ,xml_col)
-                                          VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)"""
+                                          VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)"""
 
         is_exactly_once = "true"