QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-20 16:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(sqlalchemy): Remove erroneous SQLAlchemy ORM session.merge operations (#24776)

Browse Source
This commit is contained in:
John Bodley
2023-11-20 17:25:41 -08:00
committed by GitHub
parent e7797b65d1
commit dd58b31cc4
49 changed files with 34 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
superset/migrations/shared/migrate_viz/base.py
View File

@@ -123,7 +123,7 @@ class MigrateViz:
]
@classmethod
def upgrade_slice(cls, slc: Slice) -> Slice:
def upgrade_slice(cls, slc: Slice) -> None:
clz = cls(slc.params)
form_data_bak = copy.deepcopy(clz.data)
@@ -141,10 +141,9 @@ class MigrateViz:
if "form_data" in (query_context := try_load_json(slc.query_context)):
query_context["form_data"] = clz.data
slc.query_context = json.dumps(query_context)
return slc
@classmethod
def downgrade_slice(cls, slc: Slice) -> Slice:
def downgrade_slice(cls, slc: Slice) -> None:
form_data = try_load_json(slc.params)
if "viz_type" in (form_data_bak := form_data.get(FORM_DATA_BAK_FIELD_NAME, {})):
slc.params = json.dumps(form_data_bak)
@@ -153,7 +152,6 @@ class MigrateViz:
if "form_data" in query_context:
query_context["form_data"] = form_data_bak
slc.query_context = json.dumps(query_context)
return slc
@classmethod
def upgrade(cls, session: Session) -> None:
@@ -162,8 +160,7 @@ class MigrateViz:
slices,
lambda current, total: print(f"Upgraded {current}/{total} charts"),
):
new_viz = cls.upgrade_slice(slc)
session.merge(new_viz)
cls.upgrade_slice(slc)
@classmethod
def downgrade(cls, session: Session) -> None:
@@ -177,5 +174,4 @@ class MigrateViz:
slices,
lambda current, total: print(f"Downgraded {current}/{total} charts"),
):
new_viz = cls.downgrade_slice(slc)
session.merge(new_viz)
cls.downgrade_slice(slc)