diff --git a/src/main/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapter.java b/src/main/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapter.java index 8d31e98..733a271 100644 --- a/src/main/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapter.java +++ b/src/main/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapter.java @@ -1009,10 +1009,10 @@ private Set getTrinoCatalogs(HttpServletRequest request, Map getTrinoCatalogsNoCache(HttpServletRequest request, Map extraCredentials) { - TableData catalogs = searchAll("select catalog_name FROM system.metadata.catalogs ORDER BY catalog_name", request, extraCredentials, null); + TableData catalogs = searchAll("SHOW CATALOGS", request, extraCredentials, null); Set catalogSet = new LinkedHashSet<>(); for (Map row : catalogs.getData()) { - String catalog = (String) row.get("catalog_name"); + String catalog = (String) row.get("Catalog"); if (applicationConfig.getHiddenCatalogs().contains(catalog.toLowerCase())) { log.debug("Ignoring catalog {}", catalog); continue; diff --git a/src/test/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapterTest.java b/src/test/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapterTest.java index b81b019..94c7f60 100644 --- a/src/test/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapterTest.java +++ b/src/test/java/com/dnastack/ga4gh/dataconnect/adapter/trino/TrinoDataConnectAdapterTest.java @@ -802,7 +802,7 @@ public void getTables_should_returnAnEmptyTableList_when_thereAreNoCatalogs() { """ { "id": "catalog-req-1", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [] } """ @@ -828,7 +828,7 @@ public void getTablesByCatalogAndSchema_should_linkToTheNextSchema_when_theCatal """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"], ["catalog2"] ] } """, @@ -887,7 +887,7 @@ public void getTablesByCatalogAndSchema_should_linkToTheFirstSchemaOfTheNextCata """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"], ["catalog2"] ], "stats": { "state": "FINISHED" } } @@ -955,7 +955,7 @@ public void getTablesByCatalogAndSchema_shouldNot_returnPagination_when_thisIsTh """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"] ] } """, @@ -1007,7 +1007,7 @@ public void getTablesByCatalogAndSchema_should_throwTrinoNoSuchCatalogException_ """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["other_catalog"] ] } """ @@ -1031,7 +1031,7 @@ public void getTablesByCatalogAndSchema_should_throwTrinoNoSuchCatalogException_ """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"] ] } """, @@ -1063,7 +1063,7 @@ public void getTablesByCatalogAndSchema_should_throwTrinoNoSuchCatalogException_ """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"] ] } """, @@ -1095,7 +1095,7 @@ public void getTablesByCatalogAndSchema_shouldNot_returnPagination_when_theOnlyC """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ ["catalog1"] ] } @@ -1232,7 +1232,7 @@ private static String catalogsPage(String... catalogs) { return """ { "id": "catalog-req", - "columns": [ { "name": "catalog_name", "typeSignature": { "rawType": "varchar" } } ], + "columns": [ { "name": "Catalog", "typeSignature": { "rawType": "varchar" } } ], "data": [ %s ], "stats": { "state": "FINISHED" } }