Skip to content

Implement renameSchema for ClickHouse #10594

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
ebyhr merged 1 commit into from
Jan 17, 2022
Merged

Implement renameSchema for ClickHouse #10594

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
3 changes: 3 additions & 0 deletions docs/src/main/sphinx/connector/clickhouse.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,6 @@ statements, the connector supports the following features:
* :doc:`/sql/drop-table`
* :doc:`/sql/create-schema`
* :doc:`/sql/drop-schema`
* :doc:`/sql/alter-schema`

.. include:: alter-schema-limitation.fragment
5 changes: 2 additions & 3 deletions plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,9 @@ public void dropSchema(ConnectorSession session, String schemaName)
}

@Override
public void renameSchema(ConnectorSession session, String schemaName, String newSchemaName)
protected String renameSchemaSql(String remoteSchemaName, String newRemoteSchemaName)
{
// TODO: https://github.com/trinodb/trino/issues/10558
throw new TrinoException(NOT_SUPPORTED, "This connector does not support renaming schemas");
return "RENAME DATABASE " + quoted(remoteSchemaName) + " TO " + quoted(newRemoteSchemaName);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion ...clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public abstract class BaseClickHouseConnectorSmokeTest
protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
{
switch (connectorBehavior) {
case SUPPORTS_RENAME_SCHEMA:
case SUPPORTS_DELETE:
return false;
default:
Expand Down
25 changes: 24 additions & 1 deletion ...clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,43 @@
import io.trino.testing.QueryRunner;

import static io.trino.plugin.clickhouse.ClickHouseQueryRunner.createClickHouseQueryRunner;
import static io.trino.testing.sql.TestTable.randomTableSuffix;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class TestClickHouseConnectorSmokeTest
extends BaseClickHouseConnectorSmokeTest
{
protected TestingClickHouseServer clickHouseServer;

@Override
protected QueryRunner createQueryRunner()
throws Exception
{
clickHouseServer = closeAfterClass(new TestingClickHouseServer());
return createClickHouseQueryRunner(
closeAfterClass(new TestingClickHouseServer()),
clickHouseServer,
ImmutableMap.of(),
ImmutableMap.<String, String>builder()
.put("clickhouse.map-string-as-varchar", "true")
.build(),
REQUIRED_TPCH_TABLES);
}

@Override
public void testRenameSchema()
{
// Override because the default database engine in version < v20.10.2.20-stable doesn't allow renaming schemas
assertThatThrownBy(super::testRenameSchema)
.hasMessageMatching("ClickHouse exception, code: 48,.* Ordinary: RENAME DATABASE is not supported .*\\n");

String schemaName = "test_rename_schema_" + randomTableSuffix();
try {
clickHouseServer.execute("CREATE DATABASE " + schemaName + " ENGINE = Atomic");
assertUpdate("ALTER SCHEMA " + schemaName + " RENAME TO " + schemaName + "_renamed");
}
finally {
assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
assertUpdate("DROP SCHEMA IF EXISTS " + schemaName + "_renamed");
}
}
}
22 changes: 19 additions & 3 deletions ...rino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestClickHouseConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
case SUPPORTS_DELETE:
return false;

case SUPPORTS_RENAME_SCHEMA:
return false;

default:
return super.hasBehavior(connectorBehavior);
}
Expand All @@ -102,6 +99,25 @@ public void testColumnName(String columnName)
throw new SkipException("TODO: test not implemented yet");
}

@Test
@Override
public void testRenameSchema()
{
// Override because the default database engine in version < v20.10.2.20-stable doesn't allow renaming schemas
assertThatThrownBy(super::testRenameSchema)
.hasMessageMatching("ClickHouse exception, code: 48,.* Ordinary: RENAME DATABASE is not supported .*\\n");

String schemaName = "test_rename_schema_" + randomTableSuffix();
try {
onRemoteDatabase().execute("CREATE DATABASE " + schemaName + " ENGINE = Atomic");
assertUpdate("ALTER SCHEMA " + schemaName + " RENAME TO " + schemaName + "_renamed");
}
finally {
assertUpdate("DROP SCHEMA IF EXISTS " + schemaName);
assertUpdate("DROP SCHEMA IF EXISTS " + schemaName + "_renamed");
}
}

@Override
public void testRenameColumn()
{
Expand Down