Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(database-import): Support importing a DB connection with a version set #26116

Merged
merged 1 commit into from
Dec 1, 2023
Merged

fix(database-import): Support importing a DB connection with a version set #26116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions superset/databases/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ def fix_schemas_allowed_for_csv_upload( # pylint: disable=invalid-name
allows_virtual_table_explore = fields.Boolean(required=False)
cancel_query_on_windows_unload = fields.Boolean(required=False)
disable_data_preview = fields.Boolean(required=False)
version = fields.String(required=False, allow_none=True)


class ImportV1DatabaseSchema(Schema):
Expand Down
21 changes: 21 additions & 0 deletions tests/unit_tests/databases/commands/importers/v1/import_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# pylint: disable=unused-argument, import-outside-toplevel, invalid-name

import copy
import json

import pytest
from pytest_mock import MockFixture
Expand Down Expand Up @@ -142,3 +143,23 @@ def test_import_database_without_permission(
str(excinfo.value)
== "Database doesn't exist and user doesn't have permission to create databases"
)


def test_import_database_with_version(mocker: MockFixture, session: Session) -> None:
"""
Test importing a database with a version set.
"""
from superset import security_manager
from superset.commands.database.importers.v1.utils import import_database
from superset.models.core import Database
from tests.integration_tests.fixtures.importexport import database_config

mocker.patch.object(security_manager, "can_access", return_value=True)

engine = session.get_bind()
Database.metadata.create_all(engine) # pylint: disable=no-member

config = copy.deepcopy(database_config)
config["extra"]["version"] = "1.1.1"
database = import_database(session, config)
assert json.loads(database.extra)["version"] == "1.1.1"
Loading