Skip to content

map special jdbc (presto 'unsupported') column types to unbounded varchar type #11833

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

Closed
guyco33 wants to merge 2 commits into from
Closed

map special jdbc (presto 'unsupported') column types to unbounded varchar type #11833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7579d9e
resolving issue #11821 - map 'special' (presto unsupported) jdbc colu…
guyco33 Nov 1, 2018
02928dc
fix testUnsupportedDataType in TestPostgreSqlTypeMapping
guyco33 Nov 1, 2018
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: 2 additions & 2 deletions presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/StandardReadMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public static Optional<ReadMapping> jdbcTypeToPrestoType(JdbcTypeHandle type)
int decimalDigits = type.getDecimalDigits();
int precision = columnSize + max(-decimalDigits, 0); // Map decimal(p, -s) (negative scale) to decimal(p+s, 0).
if (precision > Decimals.MAX_PRECISION) {
return Optional.empty();
return Optional.of(varcharReadMapping(createUnboundedVarcharType()));
}
return Optional.of(decimalReadMapping(createDecimalType(precision, max(decimalDigits, 0))));

Expand Down Expand Up @@ -232,6 +232,6 @@ public static Optional<ReadMapping> jdbcTypeToPrestoType(JdbcTypeHandle type)
case Types.TIMESTAMP:
return Optional.of(timestampReadMapping());
}
return Optional.empty();
return Optional.of(varcharReadMapping(createUnboundedVarcharType()));
}
}
4 changes: 2 additions & 2 deletions presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ private void testUnsupportedDataType(String databaseDataType)
jdbcSqlExecutor.execute(format("CREATE TABLE tpch.test_unsupported_data_type(supported_column varchar(5), unsupported_column %s)", databaseDataType));
try {
assertQuery(
"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = 'tpch' AND TABLE_NAME = 'test_unsupported_data_type'",
"VALUES 'supported_column'"); // no 'unsupported_column'
"SELECT COLUMN_NAME,DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = 'tpch' AND TABLE_NAME = 'test_unsupported_data_type'",
"VALUES ('supported_column','varchar(5)'),('unsupported_column','varchar')"); // 'unsupported_column' is mapped to an unbounded varchar
}
finally {
jdbcSqlExecutor.execute("DROP TABLE tpch.test_unsupported_data_type");
Expand Down
6 changes: 1 addition & 5 deletions ...c/test/java/com/facebook/presto/plugin/postgresql/TestPostgreSqlIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ public void testTableWithNoSupportedColumns()
AutoCloseable ignore3 = withTable("tpch.no_columns", "()")) {
assertThat(computeActual("SHOW TABLES").getOnlyColumnAsSet()).contains("orders", "no_supported_columns", "supported_columns", "no_columns");

assertQueryFails("SELECT c FROM no_supported_columns", "Table 'tpch.no_supported_columns' not found");
assertQueryFails("SELECT * FROM no_supported_columns", "Table 'tpch.no_supported_columns' not found");
assertQueryFails("SELECT 'a' FROM no_supported_columns", "Table 'tpch.no_supported_columns' not found");

assertQueryFails("SELECT c FROM no_columns", "Table 'tpch.no_columns' not found");
assertQueryFails("SELECT * FROM no_columns", "Table 'tpch.no_columns' not found");
assertQueryFails("SELECT 'a' FROM no_columns", "Table 'tpch.no_columns' not found");
Expand All @@ -140,7 +136,6 @@ public void testTableWithNoSupportedColumns()
assertQueryFails("SELECT * FROM non_existent", ".* Table .*tpch.non_existent.* does not exist");
assertQueryFails("SELECT 'a' FROM non_existent", ".* Table .*tpch.non_existent.* does not exist");

assertQuery("SHOW COLUMNS FROM no_supported_columns", "SELECT 'nothing' WHERE false");
assertQuery("SHOW COLUMNS FROM no_columns", "SELECT 'nothing' WHERE false");

// Other tables should be visible in SHOW TABLES (the no_supported_columns might be included or might be not) and information_schema.tables
Expand All @@ -151,6 +146,7 @@ public void testTableWithNoSupportedColumns()

// Other tables should be introspectable with SHOW COLUMNS and information_schema.columns
assertQuery("SHOW COLUMNS FROM supported_columns", "VALUES ('good', 'varchar(5)', '', '')");
assertQuery("SHOW COLUMNS FROM no_supported_columns", "VALUES ('c', 'varchar', '', '')");

// Listing columns in all tables should not fail due to tables with no columns
computeActual("SELECT column_name FROM information_schema.columns WHERE table_schema = 'tpch'");
Expand Down
2 changes: 1 addition & 1 deletion ...gresql/src/test/java/com/facebook/presto/plugin/postgresql/TestPostgreSqlTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ private void testUnsupportedDataType(String databaseDataType)
try {
assertQuery(
"SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = 'tpch' AND TABLE_NAME = 'test_unsupported_data_type'",
"VALUES 'key'"); // no 'unsupported_column'
"VALUES ('key'),('unsupported_column')"); // 'unsupported_column' is mapped to an unbounded varchar
}
finally {
jdbcSqlExecutor.execute("DROP TABLE tpch.test_unsupported_data_type");
Expand Down