Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fieldname extraction (backport #24411) #25670

Merged
merged 10 commits into from Mar 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

Re of #22892

TODO:

  • Handle edge case where column names are reserved SQL terms

This is an automatic backport of pull request #24411 done by [Mergify](https://mergify.com).

…22892)""

This reverts commit c0cf13b.

(cherry picked from commit ea193ec)

# Conflicts:
#	frappe/model/db_query.py
This reverts commit ffe84c9.

(cherry picked from commit 414b1be)
(cherry picked from commit 0656742)
Verbose outut is MASSIVE and unreadable.

(cherry picked from commit 33547a6)
(cherry picked from commit f642b18)
@mergify mergify bot requested a review from a team as a code owner March 27, 2024 09:24
@mergify mergify bot added the conflicts label Mar 27, 2024
@mergify mergify bot requested review from ankush and removed request for a team March 27, 2024 09:24
@mergify mergify bot assigned ankush Mar 27, 2024
Copy link
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of ea193ec has failed:

On branch mergify/bp/version-15-hotfix/pr-24411
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit ea193ecd48.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/desk/reportview.py
	modified:   frappe/tests/test_reportview.py
	modified:   pyproject.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/model/db_query.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ankush ankush merged commit ed4e1b3 into version-15-hotfix Mar 27, 2024
18 of 19 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-24411 branch March 27, 2024 10:03
frappe-pr-bot pushed a commit that referenced this pull request Apr 2, 2024
# [15.20.0](v15.19.1...v15.20.0) (2024-04-02)

### Bug Fixes

* advertise insights to system manager only ([7046320](7046320))
* cint -> avoid precision loss if already integer ([#25735](#25735)) ([#25737](#25737)) ([6c822e0](6c822e0))
* **enqueue:** pass the original method argument here ([#25722](#25722)) ([2c14450](2c14450)), closes [/github.com/frappe/frappe/blob/87d121f47a4afc507442a97bf1854bb3d17f42c6/frappe/email/doctype/email_queue/email_queue.py#L735-L736](https://github.com//github.com/frappe/frappe/blob/87d121f47a4afc507442a97bf1854bb3d17f42c6/frappe/email/doctype/email_queue/email_queue.py/issues/L735-L736)
* **event:** clear message after handling exception ([eb9e88e](eb9e88e))
* fieldname extraction (backport [#24411](#24411)) ([#25670](#25670)) ([ed4e1b3](ed4e1b3)), closes [#22892](#22892)
* incorrect status on data import (backport [#25660](#25660)) ([#25703](#25703)) ([0165c75](0165c75))
* incorrect UI icon for desc sort ([#25687](#25687)) ([#25689](#25689)) ([f7f2849](f7f2849))
* invalid filter on email acccount ([#25674](#25674)) ([#25676](#25676)) ([c15b47a](c15b47a))
* let's colored tags in listview ([#25552](#25552)) ([4e17959](4e17959))
* make ads translatable ([217ef0b](217ef0b))
* make insights ad translatable ([43e6734](43e6734))
* message update in custom app if is_standard ([#25754](#25754)) ([86ad2e6](86ad2e6))
* non-html notifications from files ([a35e9ba](a35e9ba))
* preserve original error message ([#25682](#25682)) ([#25685](#25685)) ([3d364b7](3d364b7))
* reserved keywords as col name ([#25718](#25718)) ([#25726](#25726)) ([fca1c1a](fca1c1a))
* **restore:** check backup directory and bench directory if we can't find the file ([e6e4258](e6e4258))
* translatable web footer ([99bbd94](99bbd94))
* Use CssParser to correctly pass options to wkhtmltopdf ([e9811ea](e9811ea))
* Use doctype setting to set auto-extracted file as private (backport [#24828](#24828)) ([#25673](#25673)) ([14ccbe7](14ccbe7))

### Features

* allow skipping msgprint ([59813db](59813db)), closes [/github.com/frappe/frappe/blob/version-15/frappe/desk/doctype/event/event.py#L398](https://github.com//github.com/frappe/frappe/blob/version-15/frappe/desk/doctype/event/event.py/issues/L398)
* **customize_form:** allow setting `creation` as a default sort field ([#25760](#25760)) ([d540c72](d540c72))
* **notification:** specify message type (html, md, txt) ([e9a8a14](e9a8a14))

### Reverts

* Revert "fix: message update in custom app if is_standard (#25754)" (#25767) ([f5a17f7](f5a17f7)), closes [#25754](#25754) [#25767](#25767)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.20.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants