From 64ced60f62d87c7a3978fcbe17b0064b320cddd3 Mon Sep 17 00:00:00 2001 From: Stepan <66589759+Always-prog@users.noreply.github.com> Date: Fri, 28 Jul 2023 20:33:08 +0300 Subject: [PATCH] fix(datasets): give possibility to add dataset with slashes in name (#24796) --- superset/databases/api.py | 8 ++++---- superset/views/core.py | 4 +++- tests/integration_tests/databases/api_tests.py | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/superset/databases/api.py b/superset/databases/api.py index 98932e28e2..caa46d3164 100644 --- a/superset/databases/api.py +++ b/superset/databases/api.py @@ -672,7 +672,7 @@ class DatabaseRestApi(BaseSupersetModelRestApi): except DatabaseTablesUnexpectedError as ex: return self.response_422(ex.message) - @expose("//table///", methods=("GET",)) + @expose("//table///", methods=("GET",)) @protect() @check_datasource_access @safe @@ -735,7 +735,7 @@ class DatabaseRestApi(BaseSupersetModelRestApi): self.incr_stats("success", self.table_metadata.__name__) return self.response(200, **table_info) - @expose("//table_extra///", methods=("GET",)) + @expose("//table_extra///", methods=("GET",)) @protect() @check_datasource_access @safe @@ -798,8 +798,8 @@ class DatabaseRestApi(BaseSupersetModelRestApi): ) return self.response(200, **payload) - @expose("//select_star//", methods=("GET",)) - @expose("//select_star///", methods=("GET",)) + @expose("//select_star//", methods=("GET",)) + @expose("//select_star///", methods=("GET",)) @protect() @check_datasource_access @safe diff --git a/superset/views/core.py b/superset/views/core.py index 3655da0ed4..79fb3fbd8b 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -935,7 +935,9 @@ class Superset(BaseSupersetView): # pylint: disable=too-many-public-methods @has_access @event_logger.log_this @expose("/fetch_datasource_metadata") - @deprecated(new_target="api/v1/database//table///") + @deprecated( + new_target="api/v1/database//table///" + ) def fetch_datasource_metadata(self) -> FlaskResponse: """ Fetch the datasource metadata. diff --git a/tests/integration_tests/databases/api_tests.py b/tests/integration_tests/databases/api_tests.py index ebf94219c3..bd39d96574 100644 --- a/tests/integration_tests/databases/api_tests.py +++ b/tests/integration_tests/databases/api_tests.py @@ -686,6 +686,22 @@ class TestDatabaseApi(SupersetTestCase): # the DB should not be created assert model is None + def test_get_table_details_with_slash_in_table_name(self): + table_name = "table_with/slash" + database = get_example_database() + query = f'CREATE TABLE IF NOT EXISTS "{table_name}" (col VARCHAR(256))' + if database.backend == "mysql": + query = query.replace('"', "`") + + with database.get_sqla_engine_with_context() as engine: + engine.execute(query) + + self.login(username="admin") + uri = f"api/v1/database/{database.id}/table/{table_name}/null/" + rv = self.client.get(uri) + + self.assertEqual(rv.status_code, 200) + def test_create_database_invalid_configuration_method(self): """ Database API: Test create with an invalid configuration method.