You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2023/03/01 11:32:12 UTC
[superset] branch master updated: fix(dao): use explicit id filter (#23246)
This is an automated email from the ASF dual-hosted git repository.
villebro 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 5a099e0762 fix(dao): use explicit id filter (#23246)
5a099e0762 is described below
commit 5a099e0762ff26dbace04e2a11557c351bc00541
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Wed Mar 1 13:32:04 2023 +0200
fix(dao): use explicit id filter (#23246)
---
superset/dao/base.py | 4 ++--
tests/integration_tests/charts/api_tests.py | 18 +++++++++++-------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/superset/dao/base.py b/superset/dao/base.py
index 28cfdf2cc6..0cffb0f334 100644
--- a/superset/dao/base.py
+++ b/superset/dao/base.py
@@ -65,9 +65,9 @@ class BaseDAO:
query = cls.base_filter( # pylint: disable=not-callable
cls.id_column_name, data_model
).apply(query, None)
- id_filter = {cls.id_column_name: model_id}
+ id_column = getattr(cls.model_cls, cls.id_column_name)
try:
- return query.filter_by(**id_filter).one_or_none()
+ return query.filter(id_column == model_id).one_or_none()
except StatementError:
# can happen if int is passed instead of a string or similar
return None
diff --git a/tests/integration_tests/charts/api_tests.py b/tests/integration_tests/charts/api_tests.py
index 965a9c137b..38fa1b7a6c 100644
--- a/tests/integration_tests/charts/api_tests.py
+++ b/tests/integration_tests/charts/api_tests.py
@@ -609,17 +609,21 @@ class TestChartApi(SupersetTestCase, ApiOwnersTestCaseMixin, InsertChartMixin):
"""
Chart API: Test update set new owner implicitly adds logged in owner
"""
- gamma = self.get_user("gamma")
+ gamma = self.get_user("gamma_no_csv")
alpha = self.get_user("alpha")
- chart_id = self.insert_chart("title", [alpha.id], 1).id
- chart_data = {"slice_name": "title1_changed", "owners": [gamma.id]}
- self.login(username="alpha")
+ chart_id = self.insert_chart("title", [gamma.id], 1).id
+ chart_data = {
+ "slice_name": (new_name := "title1_changed"),
+ "owners": [alpha.id],
+ }
+ self.login(username=gamma.username)
uri = f"api/v1/chart/{chart_id}"
rv = self.put_assert_metric(uri, chart_data, "put")
- self.assertEqual(rv.status_code, 200)
+ assert rv.status_code == 200
model = db.session.query(Slice).get(chart_id)
- self.assertIn(alpha, model.owners)
- self.assertIn(gamma, model.owners)
+ assert model.slice_name == new_name
+ assert alpha in model.owners
+ assert gamma in model.owners
db.session.delete(model)
db.session.commit()