This is an automated email from the ASF dual-hosted git repository. yuqi1129 pushed a commit to branch cherry-pick-27201d34-to-branch-1.3 in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit 7299f422357f273b1afedbb9498f35a82b5c1576 Author: yuqi <[email protected]> AuthorDate: Tue Nov 3 10:09:27 2026 +0800 fix(backport): resolve PostgreSQL schema regression test conflict --- .../operation/TestPostgreSqlSchemaOperations.java | 29 ---------------------- 1 file changed, 29 deletions(-) diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java index 6802e97638..c72c6c8052 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java @@ -45,8 +45,6 @@ import org.junit.jupiter.api.Test; public class TestPostgreSqlSchemaOperations extends TestPostgreSql { @Test -<<<<<<< HEAD -======= void testCascadeDropPreservesExternalDependents() throws SQLException { String schema = RandomNameUtils.genRandomName("cascade_source"); String other = RandomNameUtils.genRandomName("cascade_other"); @@ -293,33 +291,6 @@ public class TestPostgreSqlSchemaOperations extends TestPostgreSql { } @Test - void testQuotedSchemaNamesLoadWithoutExecutingSql() throws SQLException { - for (String schema : new String[] {"quoted';CREATE SCHEMA injected_marker;--"}) { - DATABASE_OPERATIONS.create(schema, "safe comment", Map.of()); - try { - Assertions.assertEquals("safe comment", DATABASE_OPERATIONS.load(schema).comment()); - Assertions.assertEquals(schema, DATABASE_OPERATIONS.load(schema).name()); - Assertions.assertFalse(DATABASE_OPERATIONS.listDatabases().contains("injected_marker")); - } finally { - DATABASE_OPERATIONS.delete(schema, true); - } - } - } - - @Test - void testBackslashSchemaNameLoads() { - String schema = "back\\slash_%"; - DATABASE_OPERATIONS.create(schema, "comment", Map.of()); - try { - Assertions.assertEquals(schema, DATABASE_OPERATIONS.load(schema).name()); - Assertions.assertEquals("comment", DATABASE_OPERATIONS.load(schema).comment()); - } finally { - DATABASE_OPERATIONS.delete(schema, true); - } - } - - @Test ->>>>>>> 27201d342 ([#14524] fix(postgresql): preserve schema identity and contain schema drops (#14528)) public void testBaseOperationSchema() { String databaseName = RandomNameUtils.genRandomName("ct_db"); Map<String, String> properties = new HashMap<>();
