Skip to content

Commit

Permalink
fix: Add explicit ON DELETE CASCADE for dashboard_roles (apache#25320)
Browse files Browse the repository at this point in the history
  • Loading branch information
john-bodley authored Sep 18, 2023
1 parent e652659 commit 75aeeaf
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""add on delete cascade for dashboard slices
"""add on delete cascade for dashboard_slices
Revision ID: 8ace289026f3
Revises: 2e826adca42c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""add on delete cascade for embedded dashboards
"""add on delete cascade for embedded_dashboards
Revision ID: 4448fa6deeb1
Revises: 8ace289026f3
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# 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.
"""add on delete cascade for dashboard_roles
Revision ID: 4b85906e5b91
Revises: 317970b4400c
Create Date: 2023-09-15 12:58:26.772759
"""

# revision identifiers, used by Alembic.
revision = "4b85906e5b91"
down_revision = "317970b4400c"


from superset.migrations.shared.constraints import ForeignKey, redefine

foreign_keys = [
ForeignKey(
table="dashboard_roles",
referent_table="dashboards",
local_cols=["dashboard_id"],
remote_cols=["id"],
),
ForeignKey(
table="dashboard_roles",
referent_table="ab_role",
local_cols=["role_id"],
remote_cols=["id"],
),
]


def upgrade():
for foreign_key in foreign_keys:
redefine(foreign_key, on_delete="CASCADE")


def downgrade():
for foreign_key in foreign_keys:
redefine(foreign_key)
16 changes: 14 additions & 2 deletions superset/models/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,20 @@ def copy_dashboard(_mapper: Mapper, connection: Connection, target: Dashboard) -
"dashboard_roles",
metadata,
Column("id", Integer, primary_key=True),
Column("dashboard_id", Integer, ForeignKey("dashboards.id"), nullable=False),
Column("role_id", Integer, ForeignKey("ab_role.id"), nullable=False),
Column(
"dashboard_id",
Integer,
ForeignKey("dashboards.id"),
nullable=False,
on_delete="CASCADE",
),
Column(
"role_id",
Integer,
ForeignKey("ab_role.id"),
nullable=False,
on_delete="CASCADE",
),
)


Expand Down

0 comments on commit 75aeeaf

Please sign in to comment.