diff --git a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryCaseInsensitiveMapping.java b/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryCaseInsensitiveMapping.java index 0ec7b7ced959..9415dabefe2c 100644 --- a/plugin/trino-bigquery/src/test/java/io/trino/plugin/bigquery/BaseBigQueryCaseInsensitiveMapping.java +++ b/plugin/trino-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 index f81bbac4a50a..760fd967ca22 100644 --- 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"); } }