fix: fieldname extraction by ankush [frappe] PR#24411 (!2404) · Merge requests · Dokos / Dodock

Bot Dokos requested to merge ft-pr-24411 into develop Mar 20, 2024

From: https://github.com/frappe/frappe/pull/24411
Date: 2024-03-20 14:19:29+05:30

fix: invalid select star expansions
ci: group output and limit diff
test: add test for searching with paren
refactor: duplicate check for *
fix: only trim tab if it starts with tab
fix: remove unnecessary dummy column
fix: avoid parsing reserved keywords and simple strings
Revert "Revert "perf: cache fieldname extraction""
Revert "Revert "fix: search_link fails when txt contains parentheses (#22892)""

Diagnostics

pre-commit failed for source commit: ea193ecd48e8578f9a07825452b16127b70d5b0e
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1
- files were modified by this hook

frappe/desk/reportview.py:385:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:386:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:570:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:581:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:620:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:642:15: RUF005 Consider iterable unpacking instead of concatenation
Found 8 errors (2 fixed, 6 remaining).
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).

Format Python code.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 2 files left unchanged


pre-commit failed for source commit: 414b1beffdd6b45e0d03d20e229ccc386611199c
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/desk/reportview.py:386:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:387:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:571:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:582:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:621:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:643:15: RUF005 Consider iterable unpacking instead of concatenation
Found 6 errors.
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 3facad0a25811484f109e2df18541c488e0f09bb
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/desk/reportview.py:391:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:392:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:576:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:587:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:626:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:648:15: RUF005 Consider iterable unpacking instead of concatenation
Found 6 errors.
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: cc4e628edf304d35f8198019d0d206dd2fdadb1e
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/desk/reportview.py:390:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:391:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:575:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:586:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:625:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:647:15: RUF005 Consider iterable unpacking instead of concatenation
Found 6 errors.
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).


pre-commit failed for source commit: 5eca52b2c7e3cae3704c7cc9a2315d7c58ff05cb
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/desk/reportview.py:390:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:391:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:575:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:586:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:625:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:647:15: RUF005 Consider iterable unpacking instead of concatenation
Found 6 errors.
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).


Conflicts detected for source commit: 33547a635442ae3f4c638aab20eb2f86faf07449
- DU .github/helper/install.sh
- DU .github/helper/install_dependencies.sh
Cleaning files from denylist:
 .github/helper/install.sh              | 74 ++++++++++++++++++++++++++++++++++
 .github/helper/install_dependencies.sh | 16 ++++++++
 2 files changed, 90 insertions(+)


pre-commit failed for source commit: f642b1881f33c2b8a82e2c6466681dce4c923eb3
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

frappe/desk/reportview.py:390:10: RUF005 Consider `[_("Sr"), *get_labels(db_query.fields, doctype)]` instead of concatenation
frappe/desk/reportview.py:391:14: RUF005 Consider `[i + 1, *list(row)]` instead of concatenation
frappe/desk/reportview.py:575:13: RUF005 Consider `[*filters, [column, "!=", ""]]` instead of concatenation
frappe/desk/reportview.py:586:14: RUF005 Consider `[*filters, [column, "in", ("", ",")]]` instead of concatenation
frappe/desk/reportview.py:625:13: RUF005 Consider `[*filters, "ifnull(`%s`,'')!=''" % tag["name"]]` instead of concatenation
frappe/desk/reportview.py:647:15: RUF005 Consider iterable unpacking instead of concatenation
Found 6 errors.
No fixes available (6 hidden fixes can be enabled with the `--unsafe-fixes` option).


Conflicts detected for source commit: ea0b2664092e539d1b1d9e595456888608b8e03f
- DU .github/helper/install.sh
- DU .github/helper/install_dependencies.sh
Cleaning files from denylist:
 .github/helper/install.sh              | 74 ++++++++++++++++++++++++++++++++++
 .github/helper/install_dependencies.sh | 16 ++++++++
 2 files changed, 90 insertions(+)

Checkout instructions

# Checkout locally
git fetch upstream
git switch ft-pr-24411

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-24411

# 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

fix: fieldname extraction by ankush [frappe] PR#24411

Diagnostics

Merge request reports