Skip to content
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

Support query table function and cleanup tests in Snowflake #20968

Merged
merged 6 commits into from
Mar 8, 2024
Merged

Support query table function and cleanup tests in Snowflake #20968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9b4a7e
Remove redundant override in Snowflake
ebyhr Mar 7, 2024
782b443
Support query table function in Snowflake
ebyhr Mar 7, 2024
2645e40
Return Optional.empty() in Snowflake getTableComment
ebyhr Mar 7, 2024
4d50853
Set max schema and table name length in Snowflake test
ebyhr Mar 7, 2024
2bfa41c
Fix handling for unsupported types in Snowflake
ebyhr Mar 8, 2024
3213d5b
Specify schema name in testInsertInPresenceOfNotSupportedColumn
ebyhr Mar 8, 2024
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
4 changes: 3 additions & 1 deletion plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ public void testInsertInPresenceOfNotSupportedColumn()
try (TestTable testTable = createTableWithUnsupportedColumn()) {
String unqualifiedTableName = testTable.getName().replaceAll("^\\w+\\.", "");
// Check that column 'two' is not supported.
assertQuery("SELECT column_name FROM information_schema.columns WHERE table_name = '" + unqualifiedTableName + "'", "VALUES 'one', 'three'");
assertQuery(
"SELECT column_name FROM information_schema.columns WHERE table_schema = '" + getSession().getSchema().orElseThrow() + "' AND table_name = '" + unqualifiedTableName + "'",
"VALUES 'one', 'three'");
assertUpdate("INSERT INTO " + testTable.getName() + " (one, three) VALUES (123, 'test')", 1);
assertQuery("SELECT one, three FROM " + testTable.getName(), "SELECT 123, 'test'");
}
Expand Down
10 changes: 8 additions & 2 deletions plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
return columnMappingFunction.convert(typeHandle);
}

// Code should never reach here so throw an error.
throw new TrinoException(NOT_SUPPORTED, "Unsupported column type(" + type + "):" + jdbcTypeName);
return Optional.empty();
}

@Override
Expand Down Expand Up @@ -272,6 +271,13 @@ public boolean isLimitGuaranteed(ConnectorSession session)
return true;
}

@Override
public Optional<String> getTableComment(ResultSet resultSet)
{
// Don't return a comment until the connector supports creating tables with comment
return Optional.empty();
}

@Override
public void setColumnType(ConnectorSession session, JdbcTableHandle handle, JdbcColumnHandle column, Type type)
{
Expand Down
4 changes: 4 additions & 0 deletions plugin/trino-snowflake/src/main/java/io/trino/plugin/snowflake/SnowflakeClientModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
import io.trino.plugin.jdbc.JdbcClient;
import io.trino.plugin.jdbc.TypeHandlingJdbcConfig;
import io.trino.plugin.jdbc.credential.CredentialProvider;
import io.trino.plugin.jdbc.ptf.Query;
import io.trino.spi.TrinoException;
import io.trino.spi.function.table.ConnectorTableFunction;
import net.snowflake.client.jdbc.SnowflakeDriver;

import java.net.MalformedURLException;
import java.net.URL;
import java.util.Properties;

import static com.google.inject.multibindings.Multibinder.newSetBinder;
import static io.airlift.configuration.ConfigBinder.configBinder;
import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED;

Expand All @@ -45,6 +48,7 @@ public void configure(Binder binder)
binder.bind(JdbcClient.class).annotatedWith(ForBaseJdbc.class).to(SnowflakeClient.class).in(Scopes.SINGLETON);
configBinder(binder).bindConfig(SnowflakeConfig.class);
configBinder(binder).bindConfig(TypeHandlingJdbcConfig.class);
newSetBinder(binder, ConnectorTableFunction.class).addBinding().toProvider(Query.class).in(Scopes.SINGLETON);
}

@Singleton
Expand Down
Loading