You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2023/10/31 14:35:38 UTC
(superset) 07/11: fix: dataset update uniqueness (#25756)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 01d3ac20c7204007d66a240e3311fa19ea8455fd
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Wed Oct 25 16:49:32 2023 -0400
fix: dataset update uniqueness (#25756)
(cherry picked from commit c7f8d11a7eca33b7eed187f4e757fd7b9f45f9be)
---
superset/daos/dataset.py | 6 ++-
superset/datasets/commands/update.py | 5 ++-
tests/unit_tests/dao/dataset_test.py | 83 ++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/superset/daos/dataset.py b/superset/daos/dataset.py
index 716fcd9a05..0b6c4f6271 100644
--- a/superset/daos/dataset.py
+++ b/superset/daos/dataset.py
@@ -100,11 +100,15 @@ class DatasetDAO(BaseDAO[SqlaTable]): # pylint: disable=too-many-public-methods
@staticmethod
def validate_update_uniqueness(
- database_id: int, dataset_id: int, name: str
+ database_id: int,
+ schema: str | None,
+ dataset_id: int,
+ name: str,
) -> bool:
dataset_query = db.session.query(SqlaTable).filter(
SqlaTable.table_name == name,
SqlaTable.database_id == database_id,
+ SqlaTable.schema == schema,
SqlaTable.id != dataset_id,
)
return not db.session.query(dataset_query.exists()).scalar()
diff --git a/superset/datasets/commands/update.py b/superset/datasets/commands/update.py
index a38439fb7f..dfa3a3dcf8 100644
--- a/superset/datasets/commands/update.py
+++ b/superset/datasets/commands/update.py
@@ -89,7 +89,10 @@ class UpdateDatasetCommand(UpdateMixin, BaseCommand):
table_name = self._properties.get("table_name", None)
# Validate uniqueness
if not DatasetDAO.validate_update_uniqueness(
- self._model.database_id, self._model_id, table_name
+ self._model.database_id,
+ self._model.schema,
+ self._model_id,
+ table_name,
):
exceptions.append(DatasetExistsValidationError(table_name))
# Validate/Populate database not allowed to change
diff --git a/tests/unit_tests/dao/dataset_test.py b/tests/unit_tests/dao/dataset_test.py
new file mode 100644
index 0000000000..288f68cae0
--- /dev/null
+++ b/tests/unit_tests/dao/dataset_test.py
@@ -0,0 +1,83 @@
+# 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 sqlalchemy.orm.session import Session
+
+from superset.daos.dataset import DatasetDAO
+
+
+def test_validate_update_uniqueness(session: Session) -> None:
+ """
+ Test the `validate_update_uniqueness` static method.
+
+ In particular, allow datasets with the same name in the same database as long as they
+ are in different schemas
+ """
+ from superset.connectors.sqla.models import SqlaTable
+ from superset.models.core import Database
+
+ SqlaTable.metadata.create_all(session.get_bind())
+
+ database = Database(
+ database_name="my_db",
+ sqlalchemy_uri="sqlite://",
+ )
+ dataset1 = SqlaTable(
+ table_name="my_dataset",
+ schema="main",
+ database=database,
+ )
+ dataset2 = SqlaTable(
+ table_name="my_dataset",
+ schema="dev",
+ database=database,
+ )
+ session.add_all([database, dataset1, dataset2])
+ session.flush()
+
+ # same table name, different schema
+ assert (
+ DatasetDAO.validate_update_uniqueness(
+ database_id=database.id,
+ schema=dataset1.schema,
+ dataset_id=dataset1.id,
+ name=dataset1.table_name,
+ )
+ is True
+ )
+
+ # duplicate schema and table name
+ assert (
+ DatasetDAO.validate_update_uniqueness(
+ database_id=database.id,
+ schema=dataset2.schema,
+ dataset_id=dataset1.id,
+ name=dataset1.table_name,
+ )
+ is False
+ )
+
+ # no schema
+ assert (
+ DatasetDAO.validate_update_uniqueness(
+ database_id=database.id,
+ schema=None,
+ dataset_id=dataset1.id,
+ name=dataset1.table_name,
+ )
+ is True
+ )