chore(dao): Organize DAOs according to SIP-92 (#24331)

Co-authored-by: JUST.in DO IT <justin.park@airbnb.com>
This commit is contained in:
John Bodley
2023-06-18 18:32:32 -07:00
committed by GitHub
parent 1bc7d63cab
commit 3e76736874
149 changed files with 426 additions and 554 deletions

View File

@@ -101,7 +101,7 @@ FROM my_catalog.my_schema.my_table
def test_get_datasource_sqlatable(session_with_data: Session) -> None:
from superset.connectors.sqla.models import SqlaTable
from superset.datasource.dao import DatasourceDAO
from superset.daos.datasource import DatasourceDAO
result = DatasourceDAO.get_datasource(
datasource_type=DatasourceType.TABLE,
@@ -115,7 +115,7 @@ def test_get_datasource_sqlatable(session_with_data: Session) -> None:
def test_get_datasource_query(session_with_data: Session) -> None:
from superset.datasource.dao import DatasourceDAO
from superset.daos.datasource import DatasourceDAO
from superset.models.sql_lab import Query
result = DatasourceDAO.get_datasource(
@@ -127,7 +127,7 @@ def test_get_datasource_query(session_with_data: Session) -> None:
def test_get_datasource_saved_query(session_with_data: Session) -> None:
from superset.datasource.dao import DatasourceDAO
from superset.daos.datasource import DatasourceDAO
from superset.models.sql_lab import SavedQuery
result = DatasourceDAO.get_datasource(
@@ -141,7 +141,7 @@ def test_get_datasource_saved_query(session_with_data: Session) -> None:
def test_get_datasource_sl_table(session_with_data: Session) -> None:
from superset.datasource.dao import DatasourceDAO
from superset.daos.datasource import DatasourceDAO
from superset.tables.models import Table
result = DatasourceDAO.get_datasource(
@@ -155,8 +155,8 @@ def test_get_datasource_sl_table(session_with_data: Session) -> None:
def test_get_datasource_sl_dataset(session_with_data: Session) -> None:
from superset.daos.datasource import DatasourceDAO
from superset.datasets.models import Dataset
from superset.datasource.dao import DatasourceDAO
result = DatasourceDAO.get_datasource(
datasource_type=DatasourceType.DATASET,
@@ -170,8 +170,8 @@ def test_get_datasource_sl_dataset(session_with_data: Session) -> None:
def test_get_datasource_w_str_param(session_with_data: Session) -> None:
from superset.connectors.sqla.models import SqlaTable
from superset.daos.datasource import DatasourceDAO
from superset.datasets.models import Dataset
from superset.datasource.dao import DatasourceDAO
from superset.tables.models import Table
assert isinstance(
@@ -201,8 +201,8 @@ def test_get_all_datasources(session_with_data: Session) -> None:
def test_not_found_datasource(session_with_data: Session) -> None:
from superset.dao.exceptions import DatasourceNotFound
from superset.datasource.dao import DatasourceDAO
from superset.daos.datasource import DatasourceDAO
from superset.daos.exceptions import DatasourceNotFound
with pytest.raises(DatasourceNotFound):
DatasourceDAO.get_datasource(