Skip to content

Commit 13cd265

Browse files
elbinpallimalilibmtdcmeehan
authored andcommitted
Check for null schema when querying from system.jdbc.columns
1 parent aa4de13 commit 13cd265

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

presto-base-arrow-flight/src/main/java/com/facebook/plugin/arrow/ArrowMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
169169
tables = ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));
170170
}
171171
else {
172-
tables = listTables(session, Optional.of(prefix.getSchemaName()));
172+
tables = listTables(session, Optional.ofNullable(prefix.getSchemaName()));
173173
}
174174

175175
for (SchemaTableName tableName : tables) {

presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/TestArrowFlightQueries.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,20 @@ public void testSelectTime()
145145
assertTrue(actualRow.equals(expectedRow));
146146
}
147147

148+
@Test
149+
public void testSystemJdbcColumns()
150+
{
151+
MaterializedResult actualRow = computeActual("SELECT * from system.jdbc.columns");
152+
assertTrue(actualRow.getRowCount() > 0);
153+
}
154+
155+
@Test
156+
public void testSystemJdbcTables()
157+
{
158+
MaterializedResult actualRow = computeActual("SELECT * from system.jdbc.tables");
159+
assertTrue(actualRow.getRowCount() > 0);
160+
}
161+
148162
@Test
149163
public void testDescribeUnknownTable()
150164
{

0 commit comments

Comments
 (0)