From 5a3c210708b2c98b0974a6d5c3584f5eedf8178c Mon Sep 17 00:00:00 2001 From: liferoad Date: Tue, 9 Sep 2025 15:06:40 -0400 Subject: [PATCH] Fix JDBC type validation to check for empty strings in Read and Write Postgres schema transform providers --- .../jdbc/providers/ReadFromPostgresSchemaTransformProvider.java | 2 +- .../jdbc/providers/WriteToPostgresSchemaTransformProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/ReadFromPostgresSchemaTransformProvider.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/ReadFromPostgresSchemaTransformProvider.java index 8755ce0ecca9..834e7a0a4927 100644 --- a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/ReadFromPostgresSchemaTransformProvider.java +++ b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/ReadFromPostgresSchemaTransformProvider.java @@ -58,7 +58,7 @@ protected String jdbcType() { public @UnknownKeyFor @NonNull @Initialized SchemaTransform from( JdbcReadSchemaTransformConfiguration configuration) { String jdbcType = configuration.getJdbcType(); - if (jdbcType != null && !jdbcType.equals(jdbcType())) { + if (jdbcType != null && !jdbcType.isEmpty() && !jdbcType.equals(jdbcType())) { throw new IllegalArgumentException( String.format("Wrong JDBC type. Expected '%s' but got '%s'", jdbcType(), jdbcType)); } diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/WriteToPostgresSchemaTransformProvider.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/WriteToPostgresSchemaTransformProvider.java index 411e1ff2c470..97074742dbed 100644 --- a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/WriteToPostgresSchemaTransformProvider.java +++ b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/providers/WriteToPostgresSchemaTransformProvider.java @@ -58,7 +58,7 @@ protected String jdbcType() { public @UnknownKeyFor @NonNull @Initialized SchemaTransform from( JdbcWriteSchemaTransformConfiguration configuration) { String jdbcType = configuration.getJdbcType(); - if (jdbcType != null && !jdbcType.equals(jdbcType())) { + if (jdbcType != null && !jdbcType.isEmpty() && !jdbcType.equals(jdbcType())) { throw new IllegalArgumentException( String.format("Wrong JDBC type. Expected '%s' but got '%s'", jdbcType(), jdbcType)); }