eschutho commented on code in PR #20030: URL: https://github.com/apache/superset/pull/20030#discussion_r870850877
########## superset/dao/datasource/dao.py: ########## @@ -0,0 +1,146 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from typing import Any, Dict, List, Optional, Set, Union + +from flask_babel import _ +from sqlalchemy import or_ +from sqlalchemy.orm import Session, subqueryload +from sqlalchemy.orm.exc import NoResultFound + +from superset.connectors.sqla.models import SqlaTable +from superset.dao.base import BaseDAO +from superset.datasets.commands.exceptions import DatasetNotFoundError +from superset.datasets.models import Dataset +from superset.models.core import Database +from superset.models.sql_lab import Query, SavedQuery +from superset.tables.models import Table +from superset.utils.core import DatasourceType + +Datasource = Union[Dataset, SqlaTable, Table, Query, SavedQuery, Any] + + +class DatasourceDAO(BaseDAO): + + sources: Dict[DatasourceType, Datasource] = { + DatasourceType.SQLATABLE: SqlaTable, + DatasourceType.QUERY: Query, + DatasourceType.SAVEDQUERY: SavedQuery, + DatasourceType.DATASET: Dataset, + DatasourceType.TABLE: Table, + } + + @classmethod + def get_datasource( + cls, datasource_type: DatasourceType, datasource_id: int, session: Session + ) -> Datasource: + if datasource_type not in cls.sources: + raise DatasetNotFoundError() + + datasource = ( + session.query(cls.sources[datasource_type]) + .filter_by(id=datasource_id) + .one_or_none() + ) + + if not datasource: + raise DatasetNotFoundError() Review Comment: same thing here re what Beto said above. This could be a missing Table or Query. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
