You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2026/09/16 22:03:53 UTC
(superset) branch master updated: fix(datasets): catch MultipleResultsFound in get_or_create's schema-scoped lookup (#43725)
This is an automated email from the ASF dual-hosted git repository.
eschutho 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 2884e4815bd fix(datasets): catch MultipleResultsFound in get_or_create's schema-scoped lookup (#43725)
2884e4815bd is described below
commit 2884e4815bd837c2c23a89840099c7dcd9bdb925
Author: Elizabeth Thompson <es...@gmail.com>
AuthorDate: Wed Sep 16 15:03:33 2026 -0700
fix(datasets): catch MultipleResultsFound in get_or_create's schema-scoped lookup (#43725)
Co-authored-by: Claude Opus 4.8 <no...@anthropic.com>
---
superset/datasets/api.py | 21 ++++++++--
tests/integration_tests/datasets/api_tests.py | 55 +++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index 9e2ae21a0ab..9d7a0820dbe 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -1756,7 +1756,10 @@ class DatasetRestApi(SoftDeleteApiMixin, BaseSupersetModelRestApi):
# physical Postgres/MySQL table stored with a non-NULL schema).
# If two datasets share the ``table_name`` across schemas and the
# caller omits ``schema``, surface a 400 with an actionable message
- # instead of the original 500 ``MultipleResultsFound``.
+ # instead of the original 500 ``MultipleResultsFound``. The same guard
+ # applies when the caller supplies ``schema`` but two legacy rows still
+ # match with ``catalog=None`` (the composite unique constraint treats
+ # NULL catalogs as distinct), so both branches catch the exception.
# Catalog follows the same literal-pass rule: existing datasets
# created before multi-catalog support landed are stored with
# ``catalog=None``, so applying ``database.get_default_catalog()``
@@ -1764,9 +1767,19 @@ class DatasetRestApi(SoftDeleteApiMixin, BaseSupersetModelRestApi):
schema = body.get("schema") or None
catalog = body.get("catalog") or None
if schema:
- table = DatasetDAO.get_table_by_catalog_schema_and_name(
- database_id, schema, table_name, catalog=catalog
- )
+ try:
+ table = DatasetDAO.get_table_by_catalog_schema_and_name(
+ database_id, schema, table_name, catalog=catalog
+ )
+ except MultipleResultsFound:
+ return self.response_400(
+ message=(
+ f"Multiple datasets named '{table_name}' exist in "
+ f"schema '{schema}' of this database with no catalog "
+ "set. These are duplicate legacy rows; contact an "
+ "admin to remove the duplicates."
+ )
+ )
else:
try:
table = DatasetDAO.get_table_by_name(database_id, table_name)
diff --git a/tests/integration_tests/datasets/api_tests.py b/tests/integration_tests/datasets/api_tests.py
index 29d527c0ca5..b73894c4c07 100644
--- a/tests/integration_tests/datasets/api_tests.py
+++ b/tests/integration_tests/datasets/api_tests.py
@@ -3403,6 +3403,61 @@ class TestDatasetApi(SupersetTestCase):
assert rv.status_code == 400
assert "Specify the 'schema' field" in rv.data.decode("utf-8")
+ def test_get_or_create_dataset_with_schema_returns_400_when_ambiguous(self):
+ """
+ Dataset API: regression for the ``if schema:`` branch of
+ ``get_or_create``.
+
+ Two legacy datasets can share ``(database_id, schema, table_name)``
+ while both carry ``catalog=None``: the composite unique constraint
+ treats NULL catalogs as distinct, so it does not prevent this. When
+ the caller supplies ``schema`` and two such rows match,
+ ``one_or_none()`` raises ``MultipleResultsFound``. The API must return
+ a 400 with an actionable message rather than 500-ing — mirroring the
+ no-schema guard.
+ """
+ if get_main_database().backend == "sqlite":
+ pytest.skip(
+ "SQLite has a legacy single-column unique constraint on "
+ "table_name that prevents seeding two same-name datasets in "
+ "the same schema"
+ )
+
+ self.login(ADMIN_USERNAME)
+ admin_id = self.get_user("admin").id
+ examples_db = get_example_database()
+ table_name = "test_get_or_create_ambiguous_catalog"
+ schema = "same_schema"
+
+ # Both rows share database_id + schema + table_name with catalog=None
+ # (the default), so they match the ``if schema:`` lookup ambiguously.
+ ds_a = self.insert_dataset(
+ table_name,
+ [admin_id],
+ examples_db,
+ schema=schema,
+ fetch_metadata=False,
+ )
+ ds_b = self.insert_dataset(
+ table_name,
+ [admin_id],
+ examples_db,
+ schema=schema,
+ fetch_metadata=False,
+ )
+ self.items_to_delete = [ds_a, ds_b]
+
+ rv = self.client.post(
+ "api/v1/dataset/get_or_create/",
+ json={
+ "table_name": table_name,
+ "schema": schema,
+ "database_id": examples_db.id,
+ },
+ )
+ assert rv.status_code == 400
+ assert "contact an admin to remove the duplicates" in rv.data.decode("utf-8")
+
@pytest.mark.usefixtures(
"load_energy_table_with_slice", "load_birth_names_dashboard_with_slices"
)