Skip to content

Commit a5b0dba

Browse files
committed
Rename BaseJdbcClient.getTableSchemaName to clarify
Rename `BaseJdbcClient.getTableSchemaName` to `getTableRemoteSchemaName` to clarify its semantics. In particular, Trino doesn't currently support non-lowercase schema names, yet the function is not expected to lowercase. This is a breaking change for anyone overriding or calling this method.
1 parent cb3e554 commit a5b0dba

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public List<RelationCommentMetadata> getAllTableComments(ConnectorSession sessio
213213
try (ResultSet resultSet = getTables(connection, remoteSchema, Optional.empty())) {
214214
ImmutableList.Builder<RelationCommentMetadata> list = ImmutableList.builder();
215215
while (resultSet.next()) {
216-
String remoteSchemaFromResultSet = getTableSchemaName(resultSet);
216+
String remoteSchemaFromResultSet = getTableRemoteSchemaName(resultSet);
217217
String tableSchema = identifierMapping.fromRemoteSchemaName(remoteSchemaFromResultSet);
218218
String tableName = identifierMapping.fromRemoteTableName(remoteSchemaFromResultSet, resultSet.getString("TABLE_NAME"));
219219
if (filterRemoteSchema(remoteSchemaFromResultSet)) {
@@ -387,7 +387,7 @@ public Iterator<RelationColumnsMetadata> getAllTableColumns(ConnectorSession ses
387387
ImmutableSet.Builder<RemoteTableName> visibleTables = ImmutableSet.builder();
388388
try (ResultSet tablesResultSet = getTables(connection, remoteSchema, Optional.empty())) {
389389
while (tablesResultSet.next()) {
390-
if (filterRemoteSchema(getTableSchemaName(tablesResultSet))) {
390+
if (filterRemoteSchema(getTableRemoteSchemaName(tablesResultSet))) {
391391
visibleTables.add(getRemoteTable(tablesResultSet));
392392
}
393393
}
@@ -448,7 +448,7 @@ protected RelationColumnsMetadata computeNext()
448448
try {
449449
if (currentTable == null) {
450450
currentTable = nextTable;
451-
String remoteSchemaFromResultSet = getTableSchemaName(resultSet);
451+
String remoteSchemaFromResultSet = getTableRemoteSchemaName(resultSet);
452452
currentTableVisible = visibleTables.contains(nextTable);
453453
if (currentTableVisible) {
454454
currentTableName = new SchemaTableName(
@@ -1535,7 +1535,7 @@ protected Optional<List<String>> getTableTypes()
15351535
return Optional.of(ImmutableList.of("TABLE", "VIEW"));
15361536
}
15371537

1538-
protected String getTableSchemaName(ResultSet resultSet)
1538+
protected String getTableRemoteSchemaName(ResultSet resultSet)
15391539
throws SQLException
15401540
{
15411541
return resultSet.getString("TABLE_SCHEM");

plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public ResultSet getTables(Connection connection, Optional<String> schemaName, O
308308
}
309309

310310
@Override
311-
protected String getTableSchemaName(ResultSet resultSet)
311+
protected String getTableRemoteSchemaName(ResultSet resultSet)
312312
throws SQLException
313313
{
314314
return resultSet.getString("TABLE_CAT");

plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ protected ResultSet getAllTableColumns(Connection connection, Optional<String> r
326326
}
327327

328328
@Override
329-
protected String getTableSchemaName(ResultSet resultSet)
329+
protected String getTableRemoteSchemaName(ResultSet resultSet)
330330
throws SQLException
331331
{
332332
// MariaDB uses catalogs instead of schemas

plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ public void setTableComment(ConnectorSession session, JdbcTableHandle handle, Op
474474
}
475475

476476
@Override
477-
protected String getTableSchemaName(ResultSet resultSet)
477+
protected String getTableRemoteSchemaName(ResultSet resultSet)
478478
throws SQLException
479479
{
480480
// MySQL uses catalogs instead of schemas

plugin/trino-singlestore/src/main/java/io/trino/plugin/singlestore/SingleStoreClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public void renameSchema(ConnectorSession session, String schemaName, String new
480480
}
481481

482482
@Override
483-
protected String getTableSchemaName(ResultSet resultSet)
483+
protected String getTableRemoteSchemaName(ResultSet resultSet)
484484
throws SQLException
485485
{
486486
// SingleStore uses catalogs instead of schemas

0 commit comments

Comments
 (0)