Clean up leftover schema for BigQuery tests

trinodb · Jan 28, 2025 · 57a8c6c · 57a8c6c
1 parent 798eb19
commit 57a8c6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...o-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryCaseInsensitiveMapping.java b/...o-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryCaseInsensitiveMapping.java
@@ -205,10 +205,14 @@ public void testTableNameClash()
     @Test
     public void testCreateSchema()
     {
-        String schemaName = "Test_Create_Case_Sensitive_" + randomNameSuffix();
-        assertUpdate("CREATE SCHEMA " + schemaName.toLowerCase(ENGLISH));
-        assertQuery(format("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '%s'", schemaName.toLowerCase(ENGLISH)), format("VALUES '%s'", schemaName.toLowerCase(ENGLISH)));
-        assertUpdate("DROP SCHEMA " + schemaName.toLowerCase(ENGLISH));
+        String schemaName = "Test_Create_Case_Sensitive_" + randomNameSuffix().toLowerCase(ENGLISH);
+        try {
+            assertUpdate("CREATE SCHEMA " + schemaName);
+            assertQuery(format("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '%s'", schemaName), format("VALUES '%s'", schemaName));
+        }
+        finally {
+            assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
+        }
     }
 
     @Test

diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryConnectorTest.java
@@ -353,8 +353,8 @@ protected boolean isColumnNameRejected(Exception exception, String columnName, b
     public void testStreamCommentTableSpecialCharacter()
     {
         String schemaName = "test_comment" + randomNameSuffix();
-        assertUpdate("CREATE SCHEMA " + schemaName);
         try {
+            assertUpdate("CREATE SCHEMA " + schemaName);
             assertUpdate("CREATE TABLE " + schemaName + ".test_comment_semicolon (a integer) COMMENT " + varcharLiteral("a;semicolon"));
             assertUpdate("CREATE TABLE " + schemaName + ".test_comment_at (a integer) COMMENT " + varcharLiteral("an@at"));
             assertUpdate("CREATE TABLE " + schemaName + ".test_comment_quote (a integer) COMMENT " + varcharLiteral("a\"quote"));
@@ -379,7 +379,7 @@ public void testStreamCommentTableSpecialCharacter()
                             "('test_comment_bracket', " + varcharLiteral("[square bracket]") + ")");
         }
         finally {
-            assertUpdate("DROP SCHEMA " + schemaName + " CASCADE");
+            assertUpdate("DROP SCHEMA IF EXISTS " + schemaName + " CASCADE");
         }
     }