From ab50264ffa37a579d2432c9f7c4a4b79fd9047d0 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Thu, 12 May 2022 19:41:43 +0200 Subject: [PATCH] Fix trino deleted tables & catalog as required (#4914) * Catalog as required for SQLAlchemy * Use catalog properly for db name --- .../entity/services/connections/database/trinoConnection.json | 2 +- ingestion/src/metadata/ingestion/source/trino.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/trinoConnection.json b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/trinoConnection.json index a4a7342c4ff..b456e0b3bcd 100644 --- a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/trinoConnection.json +++ b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/trinoConnection.json @@ -92,5 +92,5 @@ } }, "additionalProperties": false, - "required": ["hostPort", "username"] + "required": ["hostPort", "username", "catalog"] } diff --git a/ingestion/src/metadata/ingestion/source/trino.py b/ingestion/src/metadata/ingestion/source/trino.py index 124f309686a..3cdf16682ba 100644 --- a/ingestion/src/metadata/ingestion/source/trino.py +++ b/ingestion/src/metadata/ingestion/source/trino.py @@ -104,7 +104,7 @@ class TrinoSource(SQLSource): schema_fqdn = get_fqdn( DatabaseSchema, self.config.serviceName, - self.service_connection.database, + self.service_connection.catalog, schema, ) yield from self.delete_tables(schema_fqdn)