Trino: handle table not found in SQLLab

superset/databases/api.py

@@ -804,9 +804,12 @@
 
         parsed_schema = parse_js_uri_path_item(schema_name, eval_undefined=True)
         table_name = cast(str, parse_js_uri_path_item(table_name))
-        payload = database.db_engine_spec.extra_table_metadata(
-            database, table_name, parsed_schema
-        )
+        try:
+            payload = database.db_engine_spec.extra_table_metadata(
+                database, table_name, parsed_schema
+            )
+        except NoSuchTableError:
+            return self.response_404()
         return self.response(200, **payload)
 
     @expose("/<int:pk>/select_star/<path:table_name>/", methods=("GET",))

tests/integration_tests/databases/api_tests.py

@@ -1340,6 +1340,21 @@ def test_get_invalid_table_table_extra_metadata(self):
         self.assertEqual(rv.status_code, 200)
         self.assertEqual(data, {})
 
+    def test_get_invalid_table_table_extra_metadata_trino(self):
+        """
+        Database API: Test get invalid table from table extra metadata
+        """
+        from superset.utils.database import get_or_create_db
+
+        trino_db = get_or_create_db("trino_examples", "trino://42/sd")
+        uri = f"api/v1/database/{trino_db.id}/table_extra/wrong_table/null/"
+        self.login(username="admin")
+        rv = self.client.get(uri)
+        data = json.loads(rv.data.decode("utf-8"))
+
+        self.assertEqual(rv.status_code, 404)
+        self.assertEqual(data, {"message": "Not found"})
+
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     def test_get_select_star(self):
         """