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.

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: prevent multiple pvm errors on migration #31332

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions superset/migrations/shared/catalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ def upgrade_schema_perms(
.filter_by(name=current_perm)
.one_or_none()
):
existing_pvm.name = new_perm
# check that new_perm does not exist
if not session.query(ViewMenu).filter_by(name=new_perm).one_or_none():
existing_pvm.name = new_perm
elif new_perm:
# new schema discovered, need to create a new permission
perms[new_perm] = ("schema_access",)
Expand Down Expand Up @@ -683,7 +685,9 @@ def downgrade_schema_perms(
None,
schema,
)
pvms_to_rename.append((pvm, new_name))
# check to see if the new name already exists
if not session.query(ViewMenu).filter_by(name=new_name).one_or_none():
pvms_to_rename.append((pvm, new_name))
else:
# non-default catalog, delete schema perm
pvms_to_delete.append(pvm)
Expand Down
Loading