fix(trino): fix sql for querying metadata (#834)

* fix(trino): fix sql for querying metadata

* test(trino): adjust test case to prove it is fixed

ibis-server/app/model/metadata/trino.py

@@ -38,7 +38,7 @@ def get_table_list(self) -> list[Table]:
                     AND t.table_name = c.table_name
                 INNER JOIN
                     system.metadata.table_comments AS tc
-                    ON t.table_catalog = c.table_catalog
+                    ON t.table_catalog = tc.catalog_name
                     AND t.table_schema = tc.schema_name
                     AND t.table_name = tc.table_name
                 WHERE t.table_schema = '{schema}'

ibis-server/tests/routers/v2/connector/test_trino.py

@@ -346,6 +346,17 @@ def test_validate_rule_column_is_valid_without_one_parameter(
         assert response.text == "Missing required parameter: `modelName`"
 
     def test_metadata_list_tables(trino: TrinoContainer):
+        connection_info = _to_connection_info(trino)
+        response = client.post(
+            url=f"{base_url}/metadata/tables",
+            json={"connectionInfo": connection_info},
+        )
+        assert response.status_code == 200
+        tables = response.json()
+        assert len(tables) == 8
+        table = next(filter(lambda t: t["name"] == "tpch.tiny.customer", tables))
+        assert len(table["columns"]) == 8
+
         connection_info = {
             "host": trino.get_container_host_ip(),
             "port": trino.get_exposed_port(trino.port),
@@ -355,28 +366,23 @@ def test_metadata_list_tables(trino: TrinoContainer):
         }
         response = client.post(
             url=f"{base_url}/metadata/tables",
-            json={
-                "connectionInfo": connection_info,
-            },
+            json={"connectionInfo": connection_info},
         )
         assert response.status_code == 200
-
-        result = next(
-            filter(lambda x: x["name"] == "memory.default.orders", response.json())
-        )
-        assert result["name"] == "memory.default.orders"
-        assert result["primaryKey"] is not None
-        assert result["description"] == "This is a table comment"
-        assert result["properties"] == {
+        tables = response.json()
+        assert len(tables) == 1
+        table = next(filter(lambda t: t["name"] == "memory.default.orders", tables))
+        assert table["name"] == "memory.default.orders"
+        assert table["primaryKey"] is not None
+        assert table["description"] == "This is a table comment"
+        assert table["properties"] == {
             "catalog": "memory",
             "schema": "default",
             "table": "orders",
         }
-        assert len(result["columns"]) == 9
-        comment_column = next(
-            filter(lambda x: x["name"] == "comment", result["columns"])
-        )
-        assert comment_column == {
+        assert len(table["columns"]) == 9
+        column = next(filter(lambda c: c["name"] == "comment", table["columns"]))
+        assert column == {
             "name": "comment",
             "nestedColumns": None,
             "type": "UNKNOWN",
@@ -389,9 +395,7 @@ def test_metadata_list_constraints(trino: TrinoContainer):
         connection_info = _to_connection_info(trino)
         response = client.post(
             url=f"{base_url}/metadata/constraints",
-            json={
-                "connectionInfo": connection_info,
-            },
+            json={"connectionInfo": connection_info},
         )
         assert response.status_code == 200
 
@@ -403,7 +407,7 @@ def _to_connection_info(trino: TrinoContainer):
             "host": trino.get_container_host_ip(),
             "port": trino.get_exposed_port(trino.port),
             "catalog": "tpch",
-            "schema": "sf1",
+            "schema": "tiny",
             "user": "test",
         }