Merge remote-tracking branch 'mygit/feature/postgresql-catalog-uuid-type-support' into feature/postgresql-catalog-uuid-type-support

och5351 · och5351 · commit ed5e4ff6eba9 · 2025-12-09T14:59:34.000+09:00
# Conflicts: # flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java
@@ -201,7 +201,9 @@ void testUuidTypes() {
                         tEnv.sqlQuery(String.format("select * from %s", TABLE_UUID_TYPE))
                                 .execute()
                                 .collect());
-        assertThat(results).hasToString("[+I[1, 123e4567-e89b-12d3-a456-426614174000]]");
+        assertThat(results)
+                .hasToString(
+                        "[+I[1, 123e4567-e89b-12d3-a456-426614174000]]");
     }
 
     @Test
@@ -211,6 +213,8 @@ void testNullUuidTypes() {
                         tEnv.sqlQuery(String.format("select * from %s", TABLE_UUID_TYPE2))
                                 .execute()
                                 .collect());
-        assertThat(results).hasToString("[+I[1, NULL]]");
+        assertThat(results)
+                .hasToString(
+                        "[+I[1, null]]");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,9 @@ void testUuidTypes() {`
`201`	`201`	`tEnv.sqlQuery(String.format("select * from %s", TABLE_UUID_TYPE))`
`202`	`202`	`.execute()`
`203`	`203`	`.collect());`
`204`		`- assertThat(results).hasToString("[+I[1, 123e4567-e89b-12d3-a456-426614174000]]");`
	`204`	`+ assertThat(results)`
	`205`	`+ .hasToString(`
	`206`	`+ "[+I[1, 123e4567-e89b-12d3-a456-426614174000]]");`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`@Test`
`@@ -211,6 +213,8 @@ void testNullUuidTypes() {`
`211`	`213`	`tEnv.sqlQuery(String.format("select * from %s", TABLE_UUID_TYPE2))`
`212`	`214`	`.execute()`
`213`	`215`	`.collect());`
`214`		`- assertThat(results).hasToString("[+I[1, NULL]]");`
	`216`	`+ assertThat(results)`
	`217`	`+ .hasToString(`
	`218`	`+ "[+I[1, null]]");`
`215`	`219`	`}`
`216`	`220`	`}`