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

Revert "chore: Cleanup database sessions (#10427)" (#10537)

Browse Source 
This reverts commit 7645fc85c3.
This commit is contained in:
Erik Ritter
2020-08-06 15:33:48 -07:00
committed by GitHub
parent 2055ecc1ba
commit fd2d1c58c5
39 changed files with 637 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
superset/models/dashboard.py
View File

@@ -37,7 +37,7 @@ from sqlalchemy import (
UniqueConstraint,
)
from sqlalchemy.engine.base import Connection
from sqlalchemy.orm import relationship, subqueryload
from sqlalchemy.orm import relationship, sessionmaker, subqueryload
from sqlalchemy.orm.mapper import Mapper
from superset import app, ConnectorRegistry, db, is_feature_enabled, security_manager
@@ -62,17 +62,18 @@ config = app.config
logger = logging.getLogger(__name__)
def copy_dashboard( # pylint: disable=unused-argument
mapper: Mapper, connection: Connection, target: "Dashboard"
) -> None:
def copy_dashboard(mapper: Mapper, connection: Connection, target: "Dashboard") -> None:
# pylint: disable=unused-argument
dashboard_id = config["DASHBOARD_TEMPLATE_ID"]
if dashboard_id is None:
return
new_user = db.session.query(User).filter_by(id=target.id).first()
session_class = sessionmaker(autoflush=False)
session = session_class(bind=connection)
new_user = session.query(User).filter_by(id=target.id).first()
# copy template dashboard to user
template = db.session.query(Dashboard).filter_by(id=int(dashboard_id)).first()
template = session.query(Dashboard).filter_by(id=int(dashboard_id)).first()
dashboard = Dashboard(
dashboard_title=template.dashboard_title,
position_json=template.position_json,
@@ -82,15 +83,15 @@ def copy_dashboard( # pylint: disable=unused-argument
slices=template.slices,
owners=[new_user],
)
db.session.add(dashboard)
db.session.commit()
session.add(dashboard)
session.commit()
# set dashboard as the welcome dashboard
extra_attributes = UserAttribute(
user_id=target.id, welcome_dashboard_id=dashboard.id
)
db.session.add(extra_attributes)
db.session.commit()
session.add(extra_attributes)
session.commit()
sqla.event.listen(User, "after_insert", copy_dashboard)
@@ -306,6 +307,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
logger.info(
"Started import of the dashboard: %s", dashboard_to_import.to_json()
)
session = db.session
logger.info("Dashboard has %d slices", len(dashboard_to_import.slices))
# copy slices object as Slice.import_slice will mutate the slice
# and will remove the existing dashboard - slice association
@@ -322,7 +324,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
i_params_dict = dashboard_to_import.params_dict
remote_id_slice_map = {
slc.params_dict["remote_id"]: slc
for slc in db.session.query(Slice).all()
for slc in session.query(Slice).all()
if "remote_id" in slc.params_dict
}
for slc in slices:
@@ -373,7 +375,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
# override the dashboard
existing_dashboard = None
for dash in db.session.query(Dashboard).all():
for dash in session.query(Dashboard).all():
if (
"remote_id" in dash.params_dict
and dash.params_dict["remote_id"] == dashboard_to_import.id
@@ -400,7 +402,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
)
new_slices = (
db.session.query(Slice)
session.query(Slice)
.filter(Slice.id.in_(old_to_new_slc_id_dict.values()))
.all()
)
@@ -408,12 +410,12 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
if existing_dashboard:
existing_dashboard.override(dashboard_to_import)
existing_dashboard.slices = new_slices
db.session.flush()
session.flush()
return existing_dashboard.id
dashboard_to_import.slices = new_slices
db.session.add(dashboard_to_import)
db.session.flush()
session.add(dashboard_to_import)
session.flush()
return dashboard_to_import.id # type: ignore
@classmethod
@@ -455,7 +457,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
eager_datasources = []
for datasource_id, datasource_type in datasource_ids:
eager_datasource = ConnectorRegistry.get_eager_datasource(
datasource_type, datasource_id
db.session, datasource_type, datasource_id
)
copied_datasource = eager_datasource.copy()
copied_datasource.alter_params(