Skip to content

Add test for 'COMMENT ON COLUMN' statement #13938

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
Aug 31, 2022
Merged

Add test for 'COMMENT ON COLUMN' statement #13938

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
29 changes: 29 additions & 0 deletions core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Verify.verifyNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static io.trino.metadata.MetadataManager.createTestMetadataManager;
Expand Down Expand Up @@ -139,6 +141,11 @@ protected static QualifiedName qualifiedName(String name)
return QualifiedName.of(TEST_CATALOG_NAME, SCHEMA, name);
}

protected static QualifiedName qualifiedColumnName(String tableName, String columnName)
{
return QualifiedName.of(TEST_CATALOG_NAME, SCHEMA, tableName, columnName);
}

protected static QualifiedObjectName asQualifiedObjectName(QualifiedName viewName)
{
return QualifiedObjectName.valueOf(viewName.toString());
Expand Down Expand Up @@ -420,6 +427,21 @@ public void setViewComment(Session session, QualifiedObjectName viewName, Option
view.getRunAsIdentity()));
}

@Override
public void setColumnComment(Session session, TableHandle tableHandle, ColumnHandle column, Optional<String> comment)
{
ConnectorTableMetadata tableMetadata = getTableMetadata(tableHandle);
TestingColumnHandle columnHandle = (TestingColumnHandle) column;
ConnectorTableMetadata newTableMetadata = new ConnectorTableMetadata(
tableMetadata.getTable(),
tableMetadata.getColumns().stream()
.map(tableColumn -> Objects.equals(tableColumn.getName(), columnHandle.getName()) ? withComment(tableColumn, comment) : tableColumn)
Comment thread
ebyhr marked this conversation as resolved.
Outdated
.collect(toImmutableList()),
tableMetadata.getProperties(),
tableMetadata.getComment());
tables.put(tableMetadata.getTable(), newTableMetadata);
}

@Override
public void renameMaterializedView(Session session, QualifiedObjectName source, QualifiedObjectName target)
{
Expand All @@ -433,5 +455,12 @@ public ResolvedFunction getCoercion(Session session, OperatorType operatorType,
{
return delegate.getCoercion(session, operatorType, fromType, toType);
}

private static ColumnMetadata withComment(ColumnMetadata tableColumn, Optional<String> comment)
{
return ColumnMetadata.builderFrom(tableColumn)
.setComment(comment)
.build();
}
}
}
19 changes: 17 additions & 2 deletions core/trino-main/src/test/java/io/trino/execution/TestCommentTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import com.google.common.util.concurrent.ListenableFuture;
import io.trino.execution.warnings.WarningCollector;
import io.trino.metadata.QualifiedObjectName;
import io.trino.metadata.TableHandle;
import io.trino.security.AllowAllAccessControl;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.sql.tree.Comment;
import io.trino.sql.tree.QualifiedName;
import org.testng.annotations.Test;
Expand All @@ -26,6 +28,7 @@

import static io.airlift.concurrent.MoreFutures.getFutureValue;
import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND;
import static io.trino.sql.tree.Comment.Type.COLUMN;
import static io.trino.sql.tree.Comment.Type.TABLE;
import static io.trino.sql.tree.Comment.Type.VIEW;
import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
Expand All @@ -36,8 +39,6 @@
public class TestCommentTask
extends BaseDataDefinitionTaskTest
{
// TODO: Add test for 'COMMENT ON COLUMN' statements

@Test
public void testCommentTable()
{
Expand Down Expand Up @@ -106,6 +107,20 @@ public void testCommentViewOnMaterializedView()
.hasMessage("View '%s' does not exist, but a materialized view with that name exists. Setting comments on materialized views is unsupported.", materializedViewName);
}

@Test
public void testCommentTableColumn()
{
QualifiedObjectName tableName = qualifiedObjectName("existing_table");
QualifiedName columnName = qualifiedColumnName("existing_table", "test");
metadata.createTable(testSession, TEST_CATALOG_NAME, someTable(tableName), false);

getFutureValue(setComment(COLUMN, columnName, Optional.of("new test column comment")));
TableHandle tableHandle = metadata.getTableHandle(testSession, tableName).get();
ConnectorTableMetadata connectorTableMetadata = metadata.getTableMetadata(testSession, tableHandle).getMetadata();
assertThat(Optional.ofNullable(connectorTableMetadata.getColumns().stream().filter(column -> "test".equals(column.getName())).findFirst().get().getComment()))
.isEqualTo(Optional.of("new test column comment"));
}

private ListenableFuture<Void> setComment(Comment.Type type, QualifiedName viewName, Optional<String> comment)
{
return new CommentTask(metadata, new AllowAllAccessControl()).execute(new Comment(type, viewName, comment), queryStateMachine, ImmutableList.of(), WarningCollector.NOOP);
Expand Down