chore(connector): Cleanup base models and views

john-bodley · Nov 17, 2023 · c39eefc · c39eefc
1 parent 326ac4a
commit c39eefc
Show file tree

Hide file tree

Showing 26 changed files with 680 additions and 914 deletions.
diff --git a/superset/charts/data/api.py b/superset/charts/data/api.py
@@ -42,7 +42,7 @@
 from superset.charts.post_processing import apply_post_process
 from superset.charts.schemas import ChartDataQueryContextSchema
 from superset.common.chart_data import ChartDataResultFormat, ChartDataResultType
-from superset.connectors.base.models import BaseDatasource
+from superset.connectors.sqla.models import BaseDatasource
 from superset.daos.exceptions import DatasourceNotFound
 from superset.exceptions import QueryObjectValidationError
 from superset.extensions import event_logger

diff --git a/superset/charts/post_processing.py b/superset/charts/post_processing.py
@@ -40,7 +40,7 @@
 )
 
 if TYPE_CHECKING:
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
     from superset.models.sql_lab import Query
 
 

diff --git a/superset/commands/utils.py b/superset/commands/utils.py
@@ -33,7 +33,7 @@
 from superset.utils.core import DatasourceType, get_user_id
 
 if TYPE_CHECKING:
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
 
 
 def populate_owners(

diff --git a/superset/common/query_actions.py b/superset/common/query_actions.py
@@ -24,7 +24,7 @@
 from superset import app
 from superset.common.chart_data import ChartDataResultType
 from superset.common.db_query_status import QueryStatus
-from superset.connectors.base.models import BaseDatasource
+from superset.connectors.sqla.models import BaseDatasource
 from superset.exceptions import QueryObjectValidationError
 from superset.utils.core import (
     extract_column_dtype,

diff --git a/superset/common/query_context.py b/superset/common/query_context.py
@@ -30,7 +30,7 @@
 from superset.models.slice import Slice
 
 if TYPE_CHECKING:
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
     from superset.models.helpers import QueryResult
 
 

diff --git a/superset/common/query_context_factory.py b/superset/common/query_context_factory.py
@@ -29,7 +29,7 @@
 from superset.utils.core import DatasourceDict, DatasourceType, is_adhoc_column
 
 if TYPE_CHECKING:
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
 
 config = app.config
 

diff --git a/superset/common/query_context_processor.py b/superset/common/query_context_processor.py
@@ -36,7 +36,7 @@
     get_since_until_from_query_object,
     get_since_until_from_time_range,
 )
-from superset.connectors.base.models import BaseDatasource
+from superset.connectors.sqla.models import BaseDatasource
 from superset.constants import CacheRegion, TimeGrain
 from superset.daos.annotation import AnnotationLayerDAO
 from superset.daos.chart import ChartDAO

diff --git a/superset/common/query_object.py b/superset/common/query_object.py
@@ -49,7 +49,7 @@
 from superset.utils.hashing import md5_sha_from_dict
 
 if TYPE_CHECKING:
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
 
 logger = logging.getLogger(__name__)
 

diff --git a/superset/common/query_object_factory.py b/superset/common/query_object_factory.py
@@ -35,7 +35,7 @@
 if TYPE_CHECKING:
     from sqlalchemy.orm import sessionmaker
 
-    from superset.connectors.base.models import BaseDatasource
+    from superset.connectors.sqla.models import BaseDatasource
     from superset.daos.datasource import DatasourceDAO
 
 

diff --git a/superset/connectors/base/__init__.py b/superset/connectors/base/__init__.py