Skip to content

Normalize name when dropping catalogs #22826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wendigo merged 1 commit into from
Jul 26, 2024
Merged

Normalize name when dropping catalogs #22826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/trino-main/src/main/java/io/trino/execution/DropCatalogTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import static com.google.common.util.concurrent.Futures.immediateVoidFuture;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;

public class DropCatalogTask
Expand Down Expand Up @@ -59,8 +60,9 @@ public ListenableFuture<Void> execute(
throw new TrinoException(NOT_SUPPORTED, "CASCADE is not yet supported for DROP SCHEMA");
}

accessControl.checkCanDropCatalog(stateMachine.getSession().toSecurityContext(), statement.getCatalogName().toString());
catalogManager.dropCatalog(new CatalogName(statement.getCatalogName().toString()), statement.isExists());
String catalogName = statement.getCatalogName().getValue().toLowerCase(ENGLISH);
accessControl.checkCanDropCatalog(stateMachine.getSession().toSecurityContext(), catalogName);
catalogManager.dropCatalog(new CatalogName(catalogName), statement.isExists());
return immediateVoidFuture();
}
}
12 changes: 12 additions & 0 deletions core/trino-main/src/test/java/io/trino/execution/TestDropCatalogTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
import static io.trino.testing.TestingSession.testSession;
import static java.util.Collections.emptyList;
import static java.util.Locale.ENGLISH;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
Expand Down Expand Up @@ -98,6 +99,17 @@ public void testDuplicatedCreateCatalogIfNotExists()
assertThat(queryRunner.getPlannerContext().getMetadata().catalogExists(createNewQuery().getSession(), TEST_CATALOG)).isFalse();
}

@Test
void testCaseInsensitiveDropCatalog()
{
queryRunner.createCatalog(TEST_CATALOG, "tpch", ImmutableMap.of());
assertThat(queryRunner.getPlannerContext().getMetadata().catalogExists(createNewQuery().getSession(), TEST_CATALOG)).isTrue();

DropCatalog statement = new DropCatalog(new Identifier(TEST_CATALOG.toUpperCase(ENGLISH)), false, false);
getFutureValue(task.execute(statement, createNewQuery(), emptyList(), WarningCollector.NOOP));
assertThat(queryRunner.getPlannerContext().getMetadata().catalogExists(createNewQuery().getSession(), TEST_CATALOG)).isFalse();
}

private QueryStateMachine createNewQuery()
{
return QueryStateMachine.begin(
Expand Down