You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by jo...@apache.org on 2023/08/14 19:07:12 UTC
[superset] branch master updated: chore(dao): Remove redundant convenience methods (#24967)
This is an automated email from the ASF dual-hosted git repository.
johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 0879b9215c chore(dao): Remove redundant convenience methods (#24967)
0879b9215c is described below
commit 0879b9215c85b067556c19ba034bfe244f12b5fc
Author: John Bodley <45...@users.noreply.github.com>
AuthorDate: Mon Aug 14 12:07:04 2023 -0700
chore(dao): Remove redundant convenience methods (#24967)
---
superset/daos/dataset.py | 52 ----------------------------
superset/datasets/columns/commands/delete.py | 4 +--
superset/datasets/metrics/commands/delete.py | 4 +--
3 files changed, 4 insertions(+), 56 deletions(-)
diff --git a/superset/daos/dataset.py b/superset/daos/dataset.py
index ee3541801f..5589f05de9 100644
--- a/superset/daos/dataset.py
+++ b/superset/daos/dataset.py
@@ -301,31 +301,6 @@ class DatasetDAO(BaseDAO[SqlaTable]): # pylint: disable=too-many-public-methods
.one_or_none()
)
- @classmethod
- def update_column(
- cls,
- model: TableColumn,
- properties: dict[str, Any],
- commit: bool = True,
- ) -> TableColumn:
- return DatasetColumnDAO.update(model, properties, commit=commit)
-
- @classmethod
- def create_column(
- cls, properties: dict[str, Any], commit: bool = True
- ) -> TableColumn:
- """
- Creates a Dataset model on the metadata DB
- """
- return DatasetColumnDAO.create(attributes=properties, commit=commit)
-
- @classmethod
- def delete_column(cls, model: TableColumn, commit: bool = True) -> None:
- """
- Deletes a Dataset column
- """
- DatasetColumnDAO.delete(model, commit=commit)
-
@classmethod
def find_dataset_metric(cls, dataset_id: int, metric_id: int) -> SqlMetric | None:
# We want to apply base dataset filters
@@ -334,33 +309,6 @@ class DatasetDAO(BaseDAO[SqlaTable]): # pylint: disable=too-many-public-methods
return None
return db.session.query(SqlMetric).get(metric_id)
- @classmethod
- def delete_metric(cls, model: SqlMetric, commit: bool = True) -> None:
- """
- Deletes a Dataset metric
- """
- DatasetMetricDAO.delete(model, commit=commit)
-
- @classmethod
- def update_metric(
- cls,
- model: SqlMetric,
- properties: dict[str, Any],
- commit: bool = True,
- ) -> SqlMetric:
- return DatasetMetricDAO.update(model, properties, commit=commit)
-
- @classmethod
- def create_metric(
- cls,
- properties: dict[str, Any],
- commit: bool = True,
- ) -> SqlMetric:
- """
- Creates a Dataset model on the metadata DB
- """
- return DatasetMetricDAO.create(attributes=properties, commit=commit)
-
@classmethod
def delete(
cls,
diff --git a/superset/datasets/columns/commands/delete.py b/superset/datasets/columns/commands/delete.py
index d377141e13..23b0d93b6a 100644
--- a/superset/datasets/columns/commands/delete.py
+++ b/superset/datasets/columns/commands/delete.py
@@ -20,7 +20,7 @@ from typing import Optional
from superset import security_manager
from superset.commands.base import BaseCommand
from superset.connectors.sqla.models import TableColumn
-from superset.daos.dataset import DatasetDAO
+from superset.daos.dataset import DatasetColumnDAO, DatasetDAO
from superset.daos.exceptions import DAODeleteFailedError
from superset.datasets.columns.commands.exceptions import (
DatasetColumnDeleteFailedError,
@@ -43,7 +43,7 @@ class DeleteDatasetColumnCommand(BaseCommand):
assert self._model
try:
- DatasetDAO.delete_column(self._model)
+ DatasetColumnDAO.delete(self._model)
except DAODeleteFailedError as ex:
logger.exception(ex.exception)
raise DatasetColumnDeleteFailedError() from ex
diff --git a/superset/datasets/metrics/commands/delete.py b/superset/datasets/metrics/commands/delete.py
index 2e1f0897b9..8f27e98a3d 100644
--- a/superset/datasets/metrics/commands/delete.py
+++ b/superset/datasets/metrics/commands/delete.py
@@ -20,7 +20,7 @@ from typing import Optional
from superset import security_manager
from superset.commands.base import BaseCommand
from superset.connectors.sqla.models import SqlMetric
-from superset.daos.dataset import DatasetDAO
+from superset.daos.dataset import DatasetDAO, DatasetMetricDAO
from superset.daos.exceptions import DAODeleteFailedError
from superset.datasets.metrics.commands.exceptions import (
DatasetMetricDeleteFailedError,
@@ -43,7 +43,7 @@ class DeleteDatasetMetricCommand(BaseCommand):
assert self._model
try:
- DatasetDAO.delete_metric(self._model)
+ DatasetMetricDAO.delete(self._model)
except DAODeleteFailedError as ex:
logger.exception(ex.exception)
raise DatasetMetricDeleteFailedError() from ex