Fix jdbc xlang schema type mismatch (#26480)

Abacn · Bruno Volpato · commit dbaa8dca5fb1 · 2023-04-28T21:50:08.000-04:00
* Fix jdbc xlang schema type mismatch

* Also fix fetch_size type mismatch

* Add new fields in the end
diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcSchemaIOProvider.java
@@ -67,12 +67,12 @@ public Schema configurationSchema() {
         .addNullableField("fetchSize", FieldType.INT16)
         .addNullableField("outputParallelization", FieldType.BOOLEAN)
         .addNullableField("autosharding", FieldType.BOOLEAN)
-        .addNullableField("maxConnections", FieldType.INT16)
-        .addNullableField("driverJars", FieldType.STRING)
         // Partitioning support. If you specify a partition column we will use that instead of
         // readQuery
         .addNullableField("partitionColumn", FieldType.STRING)
         .addNullableField("partitions", FieldType.INT16)
+        .addNullableField("maxConnections", FieldType.INT16)
+        .addNullableField("driverJars", FieldType.STRING)
         .build();
   }
 
diff --git a/sdks/python/apache_beam/io/jdbc.py b/sdks/python/apache_beam/io/jdbc.py
@@ -120,12 +120,12 @@ def default_io_expansion_service(classpath=None):
      ('connection_init_sqls', typing.Optional[typing.List[str]]),
      ('read_query', typing.Optional[str]),
      ('write_statement', typing.Optional[str]),
-     ('fetch_size', typing.Optional[int]),
+     ('fetch_size', typing.Optional[np.int16]),
      ('output_parallelization', typing.Optional[bool]),
      ('autosharding', typing.Optional[bool]),
      ('partition_column', typing.Optional[str]),
      ('partitions', typing.Optional[np.int16]),
-     ('max_connections', typing.Optional[int]),
+     ('max_connections', typing.Optional[np.int16]),
      ('driver_jars', typing.Optional[str])],
 )
 
