Skip to content

Support table comment for redshift connector #17372

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
Jul 3, 2023
Merged

Support table comment for redshift connector #17372

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: 26 additions & 3 deletions plugin/trino-redshift/src/main/java/io/trino/plugin/redshift/RedshiftClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.amazon.redshift.jdbc.RedshiftPreparedStatement;
import com.amazon.redshift.util.RedshiftObject;
import com.google.common.base.CharMatcher;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import io.airlift.slice.Slice;
Expand Down Expand Up @@ -62,6 +63,7 @@
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.connector.ColumnMetadata;
import io.trino.spi.connector.ConnectorSession;
import io.trino.spi.connector.ConnectorTableMetadata;
import io.trino.spi.connector.JoinCondition;
import io.trino.spi.connector.JoinStatistics;
import io.trino.spi.connector.JoinType;
Expand Down Expand Up @@ -175,6 +177,7 @@
import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.lang.String.format;
import static java.lang.String.join;
import static java.math.RoundingMode.UNNECESSARY;
import static java.time.temporal.ChronoField.NANO_OF_SECOND;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -304,10 +307,30 @@ public Connection getConnection(ConnectorSession session, JdbcSplit split, JdbcT
}

@Override
public Optional<String> getTableComment(ResultSet resultSet)
protected List<String> createTableSqls(RemoteTableName remoteTableName, List<String> columns, ConnectorTableMetadata tableMetadata)
{
// Don't return a comment until the connector supports creating tables with comment
return Optional.empty();
checkArgument(tableMetadata.getProperties().isEmpty(), "Unsupported table properties: %s", tableMetadata.getProperties());
ImmutableList.Builder<String> createTableSqlsBuilder = ImmutableList.builder();
createTableSqlsBuilder.add(format("CREATE TABLE %s (%s)", quoted(remoteTableName), join(", ", columns)));
Optional<String> tableComment = tableMetadata.getComment();
if (tableComment.isPresent()) {
createTableSqlsBuilder.add(buildTableCommentSql(remoteTableName, tableComment));
}
return createTableSqlsBuilder.build();
}

@Override
public void setTableComment(ConnectorSession session, JdbcTableHandle handle, Optional<String> comment)
{
execute(session, buildTableCommentSql(handle.asPlainTable().getRemoteTableName(), comment));
}

private String buildTableCommentSql(RemoteTableName remoteTableName, Optional<String> tableComment)
{
return format(
"COMMENT ON TABLE %s IS %s",
quoted(remoteTableName),
tableComment.map(RedshiftClient::redshiftVarcharLiteral).orElse("NULL"));
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions plugin/trino-redshift/src/test/java/io/trino/plugin/redshift/TestRedshiftConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,9 @@ protected QueryRunner createQueryRunner()
protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior)
{
switch (connectorBehavior) {
case SUPPORTS_COMMENT_ON_TABLE:
return false;
case SUPPORTS_COMMENT_ON_COLUMN:
return true;

case SUPPORTS_CREATE_TABLE_WITH_TABLE_COMMENT:
case SUPPORTS_CREATE_TABLE_WITH_COLUMN_COMMENT:
return false;

Expand Down