fix: datasourcedao datasource not found error (#20725)

* first fix

* remove prints

* run pc

* fix linter

* commit
This commit is contained in:
Phillip Kelley-Dotson 2022-07-19 13:45:46 -07:00 committed by GitHub
parent 84d4302628
commit 1d9d505a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View File

@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
import logging
from typing import Dict, Type, Union
from sqlalchemy.orm import Session
@ -27,6 +28,8 @@ from superset.models.sql_lab import Query, SavedQuery
from superset.tables.models import Table
from superset.utils.core import DatasourceType
logger = logging.getLogger(__name__)
Datasource = Union[Dataset, SqlaTable, Table, Query, SavedQuery]
@ -57,6 +60,11 @@ class DatasourceDAO(BaseDAO):
)
if not datasource:
logger.warning(
"Datasource not found datasource_type: %s, datasource_id: %s",
datasource_type,
datasource_id,
)
raise DatasourceNotFound()
return datasource

View File

@ -815,7 +815,7 @@ class Superset(BaseSupersetView): # pylint: disable=too-many-public-methods
try:
datasource = DatasourceDAO.get_datasource(
db.session,
DatasourceType(cast(str, datasource_type)),
DatasourceType("table"),
datasource_id,
)
except DatasetNotFoundError: