iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Improving handling for tag relationship when deleting assets (#29117)

This commit is contained in:
Vitor Avila 2024-06-10 20:14:26 -03:00 committed by GitHub
parent 024cfd86e4
commit dd67772ad9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
superset/models/dashboard.py
View File

@ -150,11 +150,12 @@ class Dashboard(AuditMixinNullable, ImportExportMixin, Model):
)
tags = relationship(
"Tag",
overlaps="objects,tag,tags,tags",
overlaps="objects,tag,tags",
secondary="tagged_object",
primaryjoin="and_(Dashboard.id == TaggedObject.object_id)",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id, "
primaryjoin="and_(Dashboard.id == TaggedObject.object_id, "
"TaggedObject.object_type == 'dashboard')",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id)",
passive_deletes=True,
)
published = Column(Boolean, default=False)
is_managed_externally = Column(Boolean, nullable=False, default=False)

5
superset/models/slice.py
View File

@ -104,9 +104,10 @@ class Slice( # pylint: disable=too-many-public-methods
"Tag",
secondary="tagged_object",
overlaps="objects,tag,tags",
primaryjoin="and_(Slice.id == TaggedObject.object_id)",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id, "
primaryjoin="and_(Slice.id == TaggedObject.object_id, "
"TaggedObject.object_type == 'chart')",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id)",
passive_deletes=True,
)
table = relationship(
"SqlaTable",

7
superset/models/sql_lab.py
View File

@ -415,10 +415,11 @@ class SavedQuery(
tags = relationship(
"Tag",
secondary="tagged_object",
overlaps="tags",
primaryjoin="and_(SavedQuery.id == TaggedObject.object_id)",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id, "
overlaps="objects,tag,tags",
primaryjoin="and_(SavedQuery.id == TaggedObject.object_id, "
"TaggedObject.object_type == 'query')",
secondaryjoin="and_(TaggedObject.tag_id == Tag.id)",
passive_deletes=True,
)
export_parent = "database"