This is an automated email from the ASF dual-hosted git repository.
johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new dd58b31cc4 chore(sqlalchemy): Remove erroneous SQLAlchemy ORM
session.merge operations (#24776)
dd58b31cc4 is described below
commit dd58b31cc45452e79ce5daca4b3e3b3880cd51e0
Author: John Bodley <[email protected]>
AuthorDate: Mon Nov 20 17:25:41 2023 -0800
chore(sqlalchemy): Remove erroneous SQLAlchemy ORM session.merge operations
(#24776)
---
superset/examples/bart_lines.py | 2 +-
superset/examples/country_map.py | 2 +-
superset/examples/css_templates.py | 4 ++--
superset/examples/deck.py | 2 +-
superset/examples/energy.py | 2 +-
superset/examples/flights.py | 2 +-
superset/examples/long_lat.py | 2 +-
superset/examples/misc_dashboard.py | 2 +-
superset/examples/multiformat_time_series.py | 2 +-
superset/examples/paris.py | 2 +-
superset/examples/random_time_series.py | 2 +-
superset/examples/sf_population_polygons.py | 2 +-
superset/examples/tabbed_dashboard.py | 3 +--
superset/examples/world_bank.py | 4 ++--
superset/key_value/commands/update.py | 1 -
superset/key_value/commands/upsert.py | 1 -
superset/migrations/shared/migrate_viz/base.py | 12 ++++--------
superset/migrations/shared/security_converge.py | 1 -
...2016-04-25_08-54_c3a8f8611885_materializing_permission.py | 1 -
.../2016-09-07_23-50_33d996bcc382_update_slice_model.py | 2 --
.../2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py | 1 -
...-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py | 1 -
.../2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py | 1 -
.../2017-12-17_11-06_21e88bc06c02_annotation_migration.py | 2 --
.../versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py | 2 --
...04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py | 1 -
...7-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py | 1 -
.../migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py | 1 -
..._16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py | 2 --
...2020-02-07_14-13_3325d4caccc8_dashboard_scoped_filters.py | 2 --
...-12_00-24_978245563a02_migrate_iframe_to_dash_markdown.py | 1 -
...-28_17-57_b56500de1855_add_uuid_column_to_import_mixin.py | 1 -
...-14_11-46_1412ec1e5a7b_legacy_force_directed_to_echart.py | 2 --
...3_6d3c6f9d665d_fix_table_chart_conditional_formatting_.py | 1 -
superset/reports/commands/execute.py | 2 --
superset/security/manager.py | 2 --
tests/integration_tests/charts/data/api_tests.py | 3 ---
tests/integration_tests/conftest.py | 8 +++++---
tests/integration_tests/dashboard_tests.py | 7 ++-----
tests/integration_tests/dashboard_utils.py | 2 +-
tests/integration_tests/dashboards/dao_tests.py | 2 --
tests/integration_tests/dashboards/dashboard_test_utils.py | 2 --
.../dashboards/security/security_dataset_tests.py | 4 ++--
tests/integration_tests/datasource_tests.py | 1 -
tests/integration_tests/fixtures/energy_dashboard.py | 2 --
.../c747c78868b6_migrating_legacy_treemap__tests.py | 4 ++--
tests/integration_tests/reports/commands_tests.py | 2 --
tests/integration_tests/security/migrate_roles_tests.py | 1 -
tests/unit_tests/migrations/viz/utils.py | 4 ++--
49 files changed, 34 insertions(+), 82 deletions(-)
diff --git a/superset/examples/bart_lines.py b/superset/examples/bart_lines.py
index e18f6e4632..ad96aecac4 100644
--- a/superset/examples/bart_lines.py
+++ b/superset/examples/bart_lines.py
@@ -60,9 +60,9 @@ def load_bart_lines(only_metadata: bool = False, force: bool
= False) -> None:
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = "BART lines"
tbl.database = database
tbl.filter_select_enabled = True
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
diff --git a/superset/examples/country_map.py b/superset/examples/country_map.py
index 4331033ca8..3caf637584 100644
--- a/superset/examples/country_map.py
+++ b/superset/examples/country_map.py
@@ -80,13 +80,13 @@ def load_country_map_data(only_metadata: bool = False,
force: bool = False) -> N
obj = db.session.query(table).filter_by(table_name=tbl_name).first()
if not obj:
obj = table(table_name=tbl_name, schema=schema)
+ db.session.add(obj)
obj.main_dttm_col = "dttm"
obj.database = database
obj.filter_select_enabled = True
if not any(col.metric_name == "avg__2004" for col in obj.metrics):
col = str(column("2004").compile(db.engine))
obj.metrics.append(SqlMetric(metric_name="avg__2004",
expression=f"AVG({col})"))
- db.session.merge(obj)
db.session.commit()
obj.fetch_metadata()
tbl = obj
diff --git a/superset/examples/css_templates.py
b/superset/examples/css_templates.py
index 4f3f355895..2f67d2e1fa 100644
--- a/superset/examples/css_templates.py
+++ b/superset/examples/css_templates.py
@@ -27,6 +27,7 @@ def load_css_templates() -> None:
obj = db.session.query(CssTemplate).filter_by(template_name="Flat").first()
if not obj:
obj = CssTemplate(template_name="Flat")
+ db.session.add(obj)
css = textwrap.dedent(
"""\
.navbar {
@@ -51,12 +52,12 @@ def load_css_templates() -> None:
"""
)
obj.css = css
- db.session.merge(obj)
db.session.commit()
obj = db.session.query(CssTemplate).filter_by(template_name="Courier
Black").first()
if not obj:
obj = CssTemplate(template_name="Courier Black")
+ db.session.add(obj)
css = textwrap.dedent(
"""\
h2 {
@@ -96,5 +97,4 @@ def load_css_templates() -> None:
"""
)
obj.css = css
- db.session.merge(obj)
db.session.commit()
diff --git a/superset/examples/deck.py b/superset/examples/deck.py
index fc1e8ba00c..326977054e 100644
--- a/superset/examples/deck.py
+++ b/superset/examples/deck.py
@@ -532,6 +532,7 @@ def load_deck_dash() -> None: # pylint:
disable=too-many-statements
if not dash:
dash = Dashboard()
+ db.session.add(dash)
dash.published = True
js = POSITION_JSON
pos = json.loads(js)
@@ -540,5 +541,4 @@ def load_deck_dash() -> None: # pylint:
disable=too-many-statements
dash.dashboard_title = title
dash.slug = slug
dash.slices = slices
- db.session.merge(dash)
db.session.commit()
diff --git a/superset/examples/energy.py b/superset/examples/energy.py
index 6688e5d088..998ee97a30 100644
--- a/superset/examples/energy.py
+++ b/superset/examples/energy.py
@@ -66,6 +66,7 @@ def load_energy(
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = "Energy consumption"
tbl.database = database
tbl.filter_select_enabled = True
@@ -76,7 +77,6 @@ def load_energy(
SqlMetric(metric_name="sum__value", expression=f"SUM({col})")
)
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
diff --git a/superset/examples/flights.py b/superset/examples/flights.py
index 7c8f980298..c7890cfa18 100644
--- a/superset/examples/flights.py
+++ b/superset/examples/flights.py
@@ -63,10 +63,10 @@ def load_flights(only_metadata: bool = False, force: bool =
False) -> None:
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = "Random set of flights in the US"
tbl.database = database
tbl.filter_select_enabled = True
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
print("Done loading table!")
diff --git a/superset/examples/long_lat.py b/superset/examples/long_lat.py
index 88b45548f4..6f7cc64020 100644
--- a/superset/examples/long_lat.py
+++ b/superset/examples/long_lat.py
@@ -92,10 +92,10 @@ def load_long_lat_data(only_metadata: bool = False, force:
bool = False) -> None
obj = db.session.query(table).filter_by(table_name=tbl_name).first()
if not obj:
obj = table(table_name=tbl_name, schema=schema)
+ db.session.add(obj)
obj.main_dttm_col = "datetime"
obj.database = database
obj.filter_select_enabled = True
- db.session.merge(obj)
db.session.commit()
obj.fetch_metadata()
tbl = obj
diff --git a/superset/examples/misc_dashboard.py
b/superset/examples/misc_dashboard.py
index 4146ea1bd3..6336a78820 100644
--- a/superset/examples/misc_dashboard.py
+++ b/superset/examples/misc_dashboard.py
@@ -34,6 +34,7 @@ def load_misc_dashboard() -> None:
if not dash:
dash = Dashboard()
+ db.session.add(dash)
js = textwrap.dedent(
"""\
{
@@ -215,5 +216,4 @@ def load_misc_dashboard() -> None:
dash.position_json = json.dumps(pos, indent=4)
dash.slug = DASH_SLUG
dash.slices = slices
- db.session.merge(dash)
db.session.commit()
diff --git a/superset/examples/multiformat_time_series.py
b/superset/examples/multiformat_time_series.py
index 6bad2a7ac2..4c1e796316 100644
--- a/superset/examples/multiformat_time_series.py
+++ b/superset/examples/multiformat_time_series.py
@@ -82,6 +82,7 @@ def load_multiformat_time_series( # pylint:
disable=too-many-locals
obj = db.session.query(table).filter_by(table_name=tbl_name).first()
if not obj:
obj = table(table_name=tbl_name, schema=schema)
+ db.session.add(obj)
obj.main_dttm_col = "ds"
obj.database = database
obj.filter_select_enabled = True
@@ -100,7 +101,6 @@ def load_multiformat_time_series( # pylint:
disable=too-many-locals
col.python_date_format = dttm_and_expr[0]
col.database_expression = dttm_and_expr[1]
col.is_dttm = True
- db.session.merge(obj)
db.session.commit()
obj.fetch_metadata()
tbl = obj
diff --git a/superset/examples/paris.py b/superset/examples/paris.py
index 1180c428fe..fa5c77b84d 100644
--- a/superset/examples/paris.py
+++ b/superset/examples/paris.py
@@ -57,9 +57,9 @@ def load_paris_iris_geojson(only_metadata: bool = False,
force: bool = False) ->
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = "Map of Paris"
tbl.database = database
tbl.filter_select_enabled = True
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
diff --git a/superset/examples/random_time_series.py
b/superset/examples/random_time_series.py
index 9a296ec2c4..4a2d10aee9 100644
--- a/superset/examples/random_time_series.py
+++ b/superset/examples/random_time_series.py
@@ -67,10 +67,10 @@ def load_random_time_series_data(
obj = db.session.query(table).filter_by(table_name=tbl_name).first()
if not obj:
obj = table(table_name=tbl_name, schema=schema)
+ db.session.add(obj)
obj.main_dttm_col = "ds"
obj.database = database
obj.filter_select_enabled = True
- db.session.merge(obj)
db.session.commit()
obj.fetch_metadata()
tbl = obj
diff --git a/superset/examples/sf_population_polygons.py
b/superset/examples/sf_population_polygons.py
index 76c039afb8..ba5905f58a 100644
--- a/superset/examples/sf_population_polygons.py
+++ b/superset/examples/sf_population_polygons.py
@@ -59,9 +59,9 @@ def load_sf_population_polygons(
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = "Population density of San Francisco"
tbl.database = database
tbl.filter_select_enabled = True
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
diff --git a/superset/examples/tabbed_dashboard.py
b/superset/examples/tabbed_dashboard.py
index 58c0ba3e4c..b057263345 100644
--- a/superset/examples/tabbed_dashboard.py
+++ b/superset/examples/tabbed_dashboard.py
@@ -33,6 +33,7 @@ def load_tabbed_dashboard(_: bool = False) -> None:
if not dash:
dash = Dashboard()
+ db.session.add(dash)
js = textwrap.dedent(
"""
@@ -556,6 +557,4 @@ def load_tabbed_dashboard(_: bool = False) -> None:
dash.slices = slices
dash.dashboard_title = "Tabbed Dashboard"
dash.slug = slug
-
- db.session.merge(dash)
db.session.commit()
diff --git a/superset/examples/world_bank.py b/superset/examples/world_bank.py
index 31d956f5fd..5e86cff1e4 100644
--- a/superset/examples/world_bank.py
+++ b/superset/examples/world_bank.py
@@ -87,6 +87,7 @@ def load_world_bank_health_n_pop( # pylint:
disable=too-many-locals, too-many-s
tbl = db.session.query(table).filter_by(table_name=tbl_name).first()
if not tbl:
tbl = table(table_name=tbl_name, schema=schema)
+ db.session.add(tbl)
tbl.description = utils.readfile(
os.path.join(get_examples_folder(), "countries.md")
)
@@ -110,7 +111,6 @@ def load_world_bank_health_n_pop( # pylint:
disable=too-many-locals, too-many-s
SqlMetric(metric_name=metric, expression=f"{aggr_func}({col})")
)
- db.session.merge(tbl)
db.session.commit()
tbl.fetch_metadata()
@@ -126,6 +126,7 @@ def load_world_bank_health_n_pop( # pylint:
disable=too-many-locals, too-many-s
if not dash:
dash = Dashboard()
+ db.session.add(dash)
dash.published = True
pos = dashboard_positions
slices = update_slice_ids(pos)
@@ -134,7 +135,6 @@ def load_world_bank_health_n_pop( # pylint:
disable=too-many-locals, too-many-s
dash.position_json = json.dumps(pos, indent=4)
dash.slug = slug
dash.slices = slices
- db.session.merge(dash)
db.session.commit()
diff --git a/superset/key_value/commands/update.py
b/superset/key_value/commands/update.py
index 4bcd496243..ca940adf60 100644
--- a/superset/key_value/commands/update.py
+++ b/superset/key_value/commands/update.py
@@ -84,7 +84,6 @@ class UpdateKeyValueCommand(BaseCommand):
entry.expires_on = self.expires_on
entry.changed_on = datetime.now()
entry.changed_by_fk = get_user_id()
- db.session.merge(entry)
db.session.commit()
return Key(id=entry.id, uuid=entry.uuid)
diff --git a/superset/key_value/commands/upsert.py
b/superset/key_value/commands/upsert.py
index 9a4092c002..66d6785f2e 100644
--- a/superset/key_value/commands/upsert.py
+++ b/superset/key_value/commands/upsert.py
@@ -88,7 +88,6 @@ class UpsertKeyValueCommand(BaseCommand):
entry.expires_on = self.expires_on
entry.changed_on = datetime.now()
entry.changed_by_fk = get_user_id()
- db.session.merge(entry)
db.session.commit()
return Key(entry.id, entry.uuid)
diff --git a/superset/migrations/shared/migrate_viz/base.py
b/superset/migrations/shared/migrate_viz/base.py
index a3360d365b..f9e1b9d3c9 100644
--- a/superset/migrations/shared/migrate_viz/base.py
+++ b/superset/migrations/shared/migrate_viz/base.py
@@ -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)
diff --git a/superset/migrations/shared/security_converge.py
b/superset/migrations/shared/security_converge.py
index 9b1730a2a1..42a68acb24 100644
--- a/superset/migrations/shared/security_converge.py
+++ b/superset/migrations/shared/security_converge.py
@@ -243,7 +243,6 @@ def migrate_roles(
if new_pvm not in role.permissions:
logger.info(f"Add {new_pvm} to {role}")
role.permissions.append(new_pvm)
- session.merge(role)
# Delete old permissions
_delete_old_permissions(session, pvm_map)
diff --git
a/superset/migrations/versions/2016-04-25_08-54_c3a8f8611885_materializing_permission.py
b/superset/migrations/versions/2016-04-25_08-54_c3a8f8611885_materializing_permission.py
index b92378f092..c3d04e875a 100644
---
a/superset/migrations/versions/2016-04-25_08-54_c3a8f8611885_materializing_permission.py
+++
b/superset/migrations/versions/2016-04-25_08-54_c3a8f8611885_materializing_permission.py
@@ -56,7 +56,6 @@ def upgrade():
for slc in session.query(Slice).all():
if slc.datasource:
slc.perm = slc.datasource.perm
- session.merge(slc)
session.commit()
db.session.close()
diff --git
a/superset/migrations/versions/2016-09-07_23-50_33d996bcc382_update_slice_model.py
b/superset/migrations/versions/2016-09-07_23-50_33d996bcc382_update_slice_model.py
index f4373a3f38..8f4542cb3c 100644
---
a/superset/migrations/versions/2016-09-07_23-50_33d996bcc382_update_slice_model.py
+++
b/superset/migrations/versions/2016-09-07_23-50_33d996bcc382_update_slice_model.py
@@ -56,7 +56,6 @@ def upgrade():
slc.datasource_id = slc.druid_datasource_id
if slc.table_id:
slc.datasource_id = slc.table_id
- session.merge(slc)
session.commit()
session.close()
@@ -69,7 +68,6 @@ def downgrade():
slc.druid_datasource_id = slc.datasource_id
if slc.datasource_type == "table":
slc.table_id = slc.datasource_id
- session.merge(slc)
session.commit()
session.close()
op.drop_column("slices", "datasource_id")
diff --git
a/superset/migrations/versions/2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py
b/superset/migrations/versions/2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py
index 1f3dbab636..0bae8cd9a3 100644
---
a/superset/migrations/versions/2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py
+++
b/superset/migrations/versions/2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py
@@ -57,7 +57,6 @@ def upgrade():
try:
d = json.loads(slc.params or "{}")
slc.params = json.dumps(d, indent=2, sort_keys=True)
- session.merge(slc)
session.commit()
print(f"Upgraded ({i}/{slice_len}): {slc.slice_name}")
except Exception as ex:
diff --git
a/superset/migrations/versions/2017-02-08_14-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
b/superset/migrations/versions/2017-02-08_14-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
index 8e97ada3cd..8dafb77bee 100644
---
a/superset/migrations/versions/2017-02-08_14-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
+++
b/superset/migrations/versions/2017-02-08_14-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
@@ -80,7 +80,6 @@ def upgrade():
"/".join(split[:-1]) + "/?form_data=" +
parse.quote_plus(json.dumps(d))
)
url.url = newurl
- session.merge(url)
session.commit()
print(f"Updating url ({i}/{urls_len})")
session.close()
diff --git
a/superset/migrations/versions/2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py
b/superset/migrations/versions/2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py
index 6073e8b84c..81bbb47914 100644
---
a/superset/migrations/versions/2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py
+++
b/superset/migrations/versions/2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py
@@ -58,7 +58,6 @@ def upgrade():
del params["latitude"]
del params["longitude"]
slc.params = json.dumps(params)
- session.merge(slc)
session.commit()
session.close()
diff --git
a/superset/migrations/versions/2017-12-17_11-06_21e88bc06c02_annotation_migration.py
b/superset/migrations/versions/2017-12-17_11-06_21e88bc06c02_annotation_migration.py
index 4b1b807a6f..785e282397 100644
---
a/superset/migrations/versions/2017-12-17_11-06_21e88bc06c02_annotation_migration.py
+++
b/superset/migrations/versions/2017-12-17_11-06_21e88bc06c02_annotation_migration.py
@@ -69,7 +69,6 @@ def upgrade():
)
params["annotation_layers"] = new_layers
slc.params = json.dumps(params)
- session.merge(slc)
session.commit()
session.close()
@@ -86,6 +85,5 @@ def downgrade():
if layers:
params["annotation_layers"] = [layer["value"] for layer in layers]
slc.params = json.dumps(params)
- session.merge(slc)
session.commit()
session.close()
diff --git
a/superset/migrations/versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py
b/superset/migrations/versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py
index bf6276d702..6241ab2a39 100644
--- a/superset/migrations/versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py
+++ b/superset/migrations/versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py
@@ -62,7 +62,6 @@ def upgrade():
pos["v"] = 1
dashboard.position_json = json.dumps(positions, indent=2)
- session.merge(dashboard)
session.commit()
session.close()
@@ -85,6 +84,5 @@ def downgrade():
pos["v"] = 0
dashboard.position_json = json.dumps(positions, indent=2)
- session.merge(dashboard)
session.commit()
pass
diff --git
a/superset/migrations/versions/2018-04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py
b/superset/migrations/versions/2018-04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py
index 49b19b9c69..2aa703cfec 100644
---
a/superset/migrations/versions/2018-04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py
+++
b/superset/migrations/versions/2018-04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py
@@ -59,7 +59,6 @@ def upgrade():
params["metrics"] = [params.get("metric")]
del params["metric"]
slc.params = json.dumps(params, indent=2, sort_keys=True)
- session.merge(slc)
session.commit()
print(f"Upgraded ({i}/{slice_len}): {slc.slice_name}")
except Exception as ex:
diff --git
a/superset/migrations/versions/2018-07-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py
b/superset/migrations/versions/2018-07-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py
index 620e2c5008..3dc0bcc455 100644
---
a/superset/migrations/versions/2018-07-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py
+++
b/superset/migrations/versions/2018-07-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py
@@ -647,7 +647,6 @@ def upgrade():
sorted_by_key = collections.OrderedDict(sorted(v2_layout.items()))
dashboard.position_json = json.dumps(sorted_by_key, indent=2)
- session.merge(dashboard)
session.commit()
else:
print(f"Skip converted dash_id: {dashboard.id}")
diff --git a/superset/migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py
b/superset/migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py
index 02021799e9..111cea4506 100644
--- a/superset/migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py
+++ b/superset/migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py
@@ -76,7 +76,6 @@ def upgrade():
dashboard.id, len(original_text), len(text)
)
)
- session.merge(dashboard)
session.commit()
diff --git
a/superset/migrations/versions/2019-04-09_16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
b/superset/migrations/versions/2019-04-09_16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
index c6361009ee..47c8a6cbcc 100644
---
a/superset/migrations/versions/2019-04-09_16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
+++
b/superset/migrations/versions/2019-04-09_16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
@@ -80,7 +80,6 @@ def upgrade():
dashboard.position_json = json.dumps(
layout, indent=None, separators=(",", ":"), sort_keys=True
)
- session.merge(dashboard)
except Exception as ex:
logging.exception(ex)
@@ -110,7 +109,6 @@ def downgrade():
dashboard.position_json = json.dumps(
layout, indent=None, separators=(",", ":"), sort_keys=True
)
- session.merge(dashboard)
except Exception as ex:
logging.exception(ex)
diff --git
a/superset/migrations/versions/2020-02-07_14-13_3325d4caccc8_dashboard_scoped_filters.py
b/superset/migrations/versions/2020-02-07_14-13_3325d4caccc8_dashboard_scoped_filters.py
index 5aa38fd13a..ec02a8ca84 100644
---
a/superset/migrations/versions/2020-02-07_14-13_3325d4caccc8_dashboard_scoped_filters.py
+++
b/superset/migrations/versions/2020-02-07_14-13_3325d4caccc8_dashboard_scoped_filters.py
@@ -99,8 +99,6 @@ def upgrade():
)
else:
dashboard.json_metadata = None
-
- session.merge(dashboard)
except Exception as ex:
logging.exception(f"dashboard {dashboard.id} has error: {ex}")
diff --git
a/superset/migrations/versions/2020-08-12_00-24_978245563a02_migrate_iframe_to_dash_markdown.py
b/superset/migrations/versions/2020-08-12_00-24_978245563a02_migrate_iframe_to_dash_markdown.py
index 4202de4560..70f1fcc07c 100644
---
a/superset/migrations/versions/2020-08-12_00-24_978245563a02_migrate_iframe_to_dash_markdown.py
+++
b/superset/migrations/versions/2020-08-12_00-24_978245563a02_migrate_iframe_to_dash_markdown.py
@@ -163,7 +163,6 @@ def upgrade():
separators=(",", ":"),
sort_keys=True,
)
- session.merge(dashboard)
# remove iframe, separator and markup charts
slices_to_remove = (
diff --git
a/superset/migrations/versions/2020-09-28_17-57_b56500de1855_add_uuid_column_to_import_mixin.py
b/superset/migrations/versions/2020-09-28_17-57_b56500de1855_add_uuid_column_to_import_mixin.py
index 9ff117b1e2..574ca1536a 100644
---
a/superset/migrations/versions/2020-09-28_17-57_b56500de1855_add_uuid_column_to_import_mixin.py
+++
b/superset/migrations/versions/2020-09-28_17-57_b56500de1855_add_uuid_column_to_import_mixin.py
@@ -96,7 +96,6 @@ def update_position_json(dashboard, session, uuid_map):
del object_["meta"]["uuid"]
dashboard.position_json = json.dumps(layout, indent=4)
- session.merge(dashboard)
def update_dashboards(session, uuid_map):
diff --git
a/superset/migrations/versions/2021-02-14_11-46_1412ec1e5a7b_legacy_force_directed_to_echart.py
b/superset/migrations/versions/2021-02-14_11-46_1412ec1e5a7b_legacy_force_directed_to_echart.py
index 4407c1f8b7..24a81270d1 100644
---
a/superset/migrations/versions/2021-02-14_11-46_1412ec1e5a7b_legacy_force_directed_to_echart.py
+++
b/superset/migrations/versions/2021-02-14_11-46_1412ec1e5a7b_legacy_force_directed_to_echart.py
@@ -70,7 +70,6 @@ def upgrade():
slc.params = json.dumps(params)
slc.viz_type = "graph_chart"
- session.merge(slc)
session.commit()
session.close()
@@ -100,6 +99,5 @@ def downgrade():
slc.params = json.dumps(params)
slc.viz_type = "directed_force"
- session.merge(slc)
session.commit()
session.close()
diff --git
a/superset/migrations/versions/2022-08-16_15-23_6d3c6f9d665d_fix_table_chart_conditional_formatting_.py
b/superset/migrations/versions/2022-08-16_15-23_6d3c6f9d665d_fix_table_chart_conditional_formatting_.py
index 30caf7efa1..8d9f070935 100644
---
a/superset/migrations/versions/2022-08-16_15-23_6d3c6f9d665d_fix_table_chart_conditional_formatting_.py
+++
b/superset/migrations/versions/2022-08-16_15-23_6d3c6f9d665d_fix_table_chart_conditional_formatting_.py
@@ -72,7 +72,6 @@ def upgrade():
new_conditional_formatting.append(formatter)
params["conditional_formatting"] = new_conditional_formatting
slc.params = json.dumps(params)
- session.merge(slc)
session.commit()
session.close()
diff --git a/superset/reports/commands/execute.py
b/superset/reports/commands/execute.py
index 301bac4531..7cd8203a51 100644
--- a/superset/reports/commands/execute.py
+++ b/superset/reports/commands/execute.py
@@ -123,8 +123,6 @@ class BaseReportState:
self._report_schedule.last_state = state
self._report_schedule.last_eval_dttm = datetime.utcnow()
-
- self._session.merge(self._report_schedule)
self._session.commit()
def create_log(self, error_message: Optional[str] = None) -> None:
diff --git a/superset/security/manager.py b/superset/security/manager.py
index c8d2c236ab..5cfa6a15c5 100644
--- a/superset/security/manager.py
+++ b/superset/security/manager.py
@@ -876,7 +876,6 @@ class SupersetSecurityManager( # pylint:
disable=too-many-public-methods
):
role_from_permissions.append(permission_view)
role_to.permissions = role_from_permissions
- self.get_session.merge(role_to)
self.get_session.commit()
def set_role(
@@ -898,7 +897,6 @@ class SupersetSecurityManager( # pylint:
disable=too-many-public-methods
permission_view for permission_view in pvms if
pvm_check(permission_view)
]
role.permissions = role_pvms
- self.get_session.merge(role)
self.get_session.commit()
def _is_admin_only(self, pvm: PermissionView) -> bool:
diff --git a/tests/integration_tests/charts/data/api_tests.py
b/tests/integration_tests/charts/data/api_tests.py
index 32a4be160c..5a62ce0a82 100644
--- a/tests/integration_tests/charts/data/api_tests.py
+++ b/tests/integration_tests/charts/data/api_tests.py
@@ -1293,7 +1293,6 @@ def test_chart_cache_timeout(
slice_with_cache_timeout = load_energy_table_with_slice[0]
slice_with_cache_timeout.cache_timeout = 20
- db.session.merge(slice_with_cache_timeout)
datasource: SqlaTable = (
db.session.query(SqlaTable)
@@ -1301,7 +1300,6 @@ def test_chart_cache_timeout(
.first()
)
datasource.cache_timeout = 1254
- db.session.merge(datasource)
db.session.commit()
@@ -1331,7 +1329,6 @@ def test_chart_cache_timeout_not_present(
.first()
)
datasource.cache_timeout = 1980
- db.session.merge(datasource)
db.session.commit()
rv = test_client.post(CHART_DATA_URI, json=physical_query_context)
diff --git a/tests/integration_tests/conftest.py
b/tests/integration_tests/conftest.py
index 28da7b7913..3e6aa96307 100644
--- a/tests/integration_tests/conftest.py
+++ b/tests/integration_tests/conftest.py
@@ -326,7 +326,8 @@ def virtual_dataset():
TableColumn(column_name="col5", type="VARCHAR(255)", table=dataset)
SqlMetric(metric_name="count", expression="count(*)", table=dataset)
- db.session.merge(dataset)
+ db.session.add(dataset)
+ db.session.commit()
yield dataset
@@ -390,7 +391,7 @@ def physical_dataset():
table=dataset,
)
SqlMetric(metric_name="count", expression="count(*)", table=dataset)
- db.session.merge(dataset)
+ db.session.add(dataset)
db.session.commit()
yield dataset
@@ -425,7 +426,8 @@ def virtual_dataset_comma_in_column_value():
TableColumn(column_name="col2", type="VARCHAR(255)", table=dataset)
SqlMetric(metric_name="count", expression="count(*)", table=dataset)
- db.session.merge(dataset)
+ db.session.add(dataset)
+ db.session.commit()
yield dataset
diff --git a/tests/integration_tests/dashboard_tests.py
b/tests/integration_tests/dashboard_tests.py
index 0df9b22267..0275152231 100644
--- a/tests/integration_tests/dashboard_tests.py
+++ b/tests/integration_tests/dashboard_tests.py
@@ -78,8 +78,8 @@ class TestDashboard(SupersetTestCase):
hidden_dash.slices = [slice]
hidden_dash.published = False
- db.session.merge(published_dash)
- db.session.merge(hidden_dash)
+ db.session.add(published_dash)
+ db.session.add(hidden_dash)
yield db.session.commit()
self.revoke_public_access_to_table(table)
@@ -137,8 +137,6 @@ class TestDashboard(SupersetTestCase):
# Make the births dash published so it can be seen
births_dash =
db.session.query(Dashboard).filter_by(slug="births").one()
births_dash.published = True
-
- db.session.merge(births_dash)
db.session.commit()
# Try access before adding appropriate permissions.
@@ -180,7 +178,6 @@ class TestDashboard(SupersetTestCase):
dash = db.session.query(Dashboard).filter_by(slug="births").first()
dash.owners = [security_manager.find_user("admin")]
dash.created_by = security_manager.find_user("admin")
- db.session.merge(dash)
db.session.commit()
res: Response = self.client.get("/superset/dashboard/births/")
diff --git a/tests/integration_tests/dashboard_utils.py
b/tests/integration_tests/dashboard_utils.py
index c08a3ec292..41dd8dc978 100644
--- a/tests/integration_tests/dashboard_utils.py
+++ b/tests/integration_tests/dashboard_utils.py
@@ -59,11 +59,11 @@ def create_table_metadata(
normalize_columns=False,
always_filter_main_dttm=False,
)
+ db.session.add(table)
if fetch_values_predicate:
table.fetch_values_predicate = fetch_values_predicate
table.database = database
table.description = table_description
- db.session.merge(table)
db.session.commit()
return table
diff --git a/tests/integration_tests/dashboards/dao_tests.py
b/tests/integration_tests/dashboards/dao_tests.py
index 91e27af3b6..8f73e5c2f8 100644
--- a/tests/integration_tests/dashboards/dao_tests.py
+++ b/tests/integration_tests/dashboards/dao_tests.py
@@ -113,7 +113,6 @@ class TestDashboardDAO(SupersetTestCase):
data.update({"foo": "bar"})
DashboardDAO.set_dash_metadata(dashboard, data)
- db.session.merge(dashboard)
db.session.commit()
new_changed_on = DashboardDAO.get_dashboard_changed_on(dashboard)
assert old_changed_on.replace(microsecond=0) < new_changed_on
@@ -125,7 +124,6 @@ class TestDashboardDAO(SupersetTestCase):
)
DashboardDAO.set_dash_metadata(dashboard, original_data)
- db.session.merge(dashboard)
db.session.commit()
@pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
diff --git a/tests/integration_tests/dashboards/dashboard_test_utils.py
b/tests/integration_tests/dashboards/dashboard_test_utils.py
index ee8001cdba..39bce02caa 100644
--- a/tests/integration_tests/dashboards/dashboard_test_utils.py
+++ b/tests/integration_tests/dashboards/dashboard_test_utils.py
@@ -110,12 +110,10 @@ def random_str():
def grant_access_to_dashboard(dashboard, role_name):
role = security_manager.find_role(role_name)
dashboard.roles.append(role)
- db.session.merge(dashboard)
db.session.commit()
def revoke_access_to_dashboard(dashboard, role_name):
role = security_manager.find_role(role_name)
dashboard.roles.remove(role)
- db.session.merge(dashboard)
db.session.commit()
diff --git
a/tests/integration_tests/dashboards/security/security_dataset_tests.py
b/tests/integration_tests/dashboards/security/security_dataset_tests.py
index 54e8b81442..550d25ab59 100644
--- a/tests/integration_tests/dashboards/security/security_dataset_tests.py
+++ b/tests/integration_tests/dashboards/security/security_dataset_tests.py
@@ -61,8 +61,8 @@ class TestDashboardDatasetSecurity(DashboardTestCase):
hidden_dash.slices = [slice]
hidden_dash.published = False
- db.session.merge(published_dash)
- db.session.merge(hidden_dash)
+ db.session.add(published_dash)
+ db.session.add(hidden_dash)
yield db.session.commit()
self.revoke_public_access_to_table(table)
diff --git a/tests/integration_tests/datasource_tests.py
b/tests/integration_tests/datasource_tests.py
index c2865f7b63..802c67e852 100644
--- a/tests/integration_tests/datasource_tests.py
+++ b/tests/integration_tests/datasource_tests.py
@@ -550,7 +550,6 @@ def test_get_samples_with_incorrect_cc(test_client,
login_as_admin, virtual_data
table=virtual_dataset,
expression="INCORRECT SQL",
)
- db.session.merge(virtual_dataset)
uri = (
f"/datasource/samples?datasource_id={virtual_dataset.id}&datasource_type=table"
diff --git a/tests/integration_tests/fixtures/energy_dashboard.py
b/tests/integration_tests/fixtures/energy_dashboard.py
index 5b4690f572..9687fb4aff 100644
--- a/tests/integration_tests/fixtures/energy_dashboard.py
+++ b/tests/integration_tests/fixtures/energy_dashboard.py
@@ -82,8 +82,6 @@ def _create_energy_table() -> list[Slice]:
table.metrics.append(
SqlMetric(metric_name="sum__value", expression=f"SUM({col})")
)
- db.session.merge(table)
- db.session.commit()
table.fetch_metadata()
slices = []
diff --git
a/tests/integration_tests/migrations/c747c78868b6_migrating_legacy_treemap__tests.py
b/tests/integration_tests/migrations/c747c78868b6_migrating_legacy_treemap__tests.py
index 3e9ef33092..e67d87fa13 100644
---
a/tests/integration_tests/migrations/c747c78868b6_migrating_legacy_treemap__tests.py
+++
b/tests/integration_tests/migrations/c747c78868b6_migrating_legacy_treemap__tests.py
@@ -68,7 +68,7 @@ def test_treemap_migrate(app_context: SupersetApp) -> None:
query_context=f'{{"form_data": {treemap_form_data}}}',
)
- slc = MigrateTreeMap.upgrade_slice(slc)
+ MigrateTreeMap.upgrade_slice(slc)
assert slc.viz_type == MigrateTreeMap.target_viz_type
# verify form_data
new_form_data = json.loads(slc.params)
@@ -84,7 +84,7 @@ def test_treemap_migrate(app_context: SupersetApp) -> None:
assert new_query_context["form_data"]["viz_type"] == "treemap_v2"
# downgrade
- slc = MigrateTreeMap.downgrade_slice(slc)
+ MigrateTreeMap.downgrade_slice(slc)
assert slc.viz_type == MigrateTreeMap.source_viz_type
assert json.dumps(json.loads(slc.params), sort_keys=True) == json.dumps(
json.loads(treemap_form_data), sort_keys=True
diff --git a/tests/integration_tests/reports/commands_tests.py
b/tests/integration_tests/reports/commands_tests.py
index 120559f8fd..11ec170121 100644
--- a/tests/integration_tests/reports/commands_tests.py
+++ b/tests/integration_tests/reports/commands_tests.py
@@ -1919,7 +1919,6 @@ def test_grace_period_error_flap(
# Change report_schedule to valid
create_invalid_sql_alert_email_chart.sql = "SELECT 1 AS metric"
create_invalid_sql_alert_email_chart.grace_period = 0
- db.session.merge(create_invalid_sql_alert_email_chart)
db.session.commit()
with freeze_time("2020-01-01T00:31:00Z"):
@@ -1936,7 +1935,6 @@ def test_grace_period_error_flap(
create_invalid_sql_alert_email_chart.sql = "SELECT 'first'"
create_invalid_sql_alert_email_chart.grace_period = 10
- db.session.merge(create_invalid_sql_alert_email_chart)
db.session.commit()
# assert that after a success, when back to error we send the error
notification
diff --git a/tests/integration_tests/security/migrate_roles_tests.py
b/tests/integration_tests/security/migrate_roles_tests.py
index ae89fea068..39d66a82aa 100644
--- a/tests/integration_tests/security/migrate_roles_tests.py
+++ b/tests/integration_tests/security/migrate_roles_tests.py
@@ -62,7 +62,6 @@ def create_old_role(pvm_map: PvmMigrationMapType,
external_pvms):
db.session.query(Role).filter(Role.name == "Dummy
Role").one_or_none()
)
new_role.permissions = []
- db.session.merge(new_role)
for old_pvm, new_pvms in pvm_map.items():
security_manager.del_permission_view_menu(old_pvm.permission,
old_pvm.view)
for new_pvm in new_pvms:
diff --git a/tests/unit_tests/migrations/viz/utils.py
b/tests/unit_tests/migrations/viz/utils.py
index 92d2eccd70..9da90c853f 100644
--- a/tests/unit_tests/migrations/viz/utils.py
+++ b/tests/unit_tests/migrations/viz/utils.py
@@ -79,7 +79,7 @@ def migrate_and_assert(
)
# upgrade
- slc = cls.upgrade_slice(slc)
+ cls.upgrade_slice(slc)
# verify form_data
new_form_data = json.loads(slc.params)
@@ -91,6 +91,6 @@ def migrate_and_assert(
assert new_query_context["form_data"]["viz_type"] == cls.target_viz_type
# downgrade
- slc = cls.downgrade_slice(slc)
+ cls.downgrade_slice(slc)
assert slc.viz_type == cls.source_viz_type
assert json.loads(slc.params) == source
