fix(qb): track field aliases by akhilnarang [frappe] PR#34799
From: https://github.com/frappe/frappe/pull/34799
Date: 2025-11-20 18:30:32+05:30
- Merge pull request #34799 from akhilnarang/fix-field-aliases
- fix(qb): track field aliases
Diagnostics
pre-commit failed for source commit: ba192648f3a0254268ee05b2e96376031fb50d11
warning: The following rules have been removed and ignoring them has no effect:
- UP038
F821 Undefined name `db_query_compat`
--> frappe/database/query.py:92:26
|
90 | self.function_aliases = set()
91 | self.field_aliases = set()
92 | self.db_query_compat = db_query_compat
| ^^^^^^^^^^^^^^^
93 |
94 | if isinstance(table, Table):
|
RUF005 Consider `[*self.fields, "parent", "parentfield"]` instead of concatenation
--> frappe/database/query.py:1265:11
|
1263 | return frappe.qb.get_query(
1264 | self.doctype,
1265 | fields=self.fields + ["parent", "parentfield"],
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1266 | filters=filters,
1267 | order_by="idx asc",
|
help: Replace with `[*self.fields, "parent", "parentfield"]`
Found 2 errors.
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
pre-commit failed for source commit: 19fe4703e80cd176c6ed3b182503b48556fd97c8
warning: The following rules have been removed and ignoring them has no effect:
- UP038
F811 Redefinition of unused `test_field_alias_in_group_by` from line 1613
--> frappe/tests/test_query.py:1636:6
|
1634 | self.assertIn("GROUP BY `created_date`", sql)
1635 |
1636 | def test_field_alias_in_group_by(self):
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `test_field_alias_in_group_by` redefined here
1637 | query = frappe.qb.get_query(
1638 | "User",
|
::: frappe/tests/test_query.py:1613:6
|
1611 | )
1612 |
1613 | def test_field_alias_in_group_by(self):
| ---------------------------- previous definition of `test_field_alias_in_group_by` here
1614 | query = frappe.qb.get_query(
1615 | "User",
|
help: Remove definition: `test_field_alias_in_group_by`
F811 Redefinition of unused `test_field_alias_permission_check` from line 1626
--> frappe/tests/test_query.py:1649:6
|
1647 | self.assertIn("`creation` `created_date`", sql)
1648 |
1649 | def test_field_alias_permission_check(self):
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `test_field_alias_permission_check` redefined here
1650 | query = frappe.qb.get_query(
1651 | "User",
|
::: frappe/tests/test_query.py:1626:6
|
1624 | self.assertIn("`creation` `created_date`", sql)
1625 |
1626 | def test_field_alias_permission_check(self):
| --------------------------------- previous definition of `test_field_alias_permission_check` here
1627 | query = frappe.qb.get_query(
1628 | "User",
|
help: Remove definition: `test_field_alias_permission_check`
Found 2 errors.
Suspicious merge commit detected: 19fe4703e80cd176c6ed3b182503b48556fd97c8
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-34799
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-34799
# Make changes then rebase
git rebase -i develop
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease