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 #24411

Merged
merged 9 commits into from
Mar 20, 2024
Merged

fix: fieldname extraction #24411

merged 9 commits into from
Mar 20, 2024

Conversation

ankush
Copy link
Member

@ankush ankush commented Jan 17, 2024

Re of #22892

TODO:

  • Handle edge case where column names are reserved SQL terms

@ankush ankush requested review from a team and akhilnarang and removed request for a team January 17, 2024 07:16
@ankush ankush added the squash label Jan 17, 2024
Copy link

codecov bot commented Jan 17, 2024

Codecov Report

Attention: Patch coverage is 89.28571% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 61.30%. Comparing base (cc2c39d) to head (fa99f77).

❗ Current head fa99f77 differs from pull request most recent head f642b18. Consider uploading reports for the commit f642b18 to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #24411      +/-   ##
===========================================
- Coverage    70.97%   61.30%   -9.68%     
===========================================
  Files          512      786     +274     
  Lines        45123    75054   +29931     
  Branches         0     6424    +6424     
===========================================
+ Hits         32026    46009   +13983     
- Misses       13097    24752   +11655     
- Partials         0     4293    +4293     
Flag Coverage Δ
server-ui 27.09% <67.85%> (?)
ui-tests 48.90% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

@ankush ankush marked this pull request as draft January 17, 2024 11:36
@stale stale bot added the inactive label Feb 16, 2024
@frappe frappe deleted a comment from stale bot Feb 20, 2024
@stale stale bot removed the inactive label Feb 20, 2024
@ankush ankush added the Skip CI Doesn't run Ci for this PR. label Feb 20, 2024
@ankush ankush marked this pull request as ready for review February 22, 2024 10:40
@ankush ankush removed the Skip CI Doesn't run Ci for this PR. label Feb 22, 2024
@ankush ankush force-pushed the field_extraction branch 2 times, most recently from 6e7d76c to 404d1fd Compare February 22, 2024 10:41
frappe/desk/reportview.py Outdated Show resolved Hide resolved
frappe/desk/reportview.py Show resolved Hide resolved
frappe/model/db_query.py Outdated Show resolved Hide resolved
frappe/model/db_query.py Outdated Show resolved Hide resolved
@ankush ankush marked this pull request as draft February 22, 2024 12:11
Copy link

stale bot commented Mar 20, 2024

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Mar 20, 2024
@ankush ankush added the hotfix label Mar 20, 2024
@ankush ankush marked this pull request as ready for review March 20, 2024 07:28
Verbose outut is MASSIVE and unreadable.
@ankush ankush enabled auto-merge March 20, 2024 08:55
@ankush ankush added the defer backport Backports for some PR are deferred for a week or two to test them properly before releasing label Mar 20, 2024
@ankush ankush merged commit ea0b266 into frappe:develop Mar 20, 2024
19 of 23 checks passed
@ankush ankush deleted the field_extraction branch March 20, 2024 11:13
@ankush ankush added backport version-15-hotfix Backport the PR to v15 and removed defer backport Backports for some PR are deferred for a week or two to test them properly before releasing labels Mar 27, 2024
ankush added a commit that referenced this pull request Mar 27, 2024
* Revert "Revert "fix: search_link fails when txt contains parentheses (#22892)""

This reverts commit c0cf13b.

(cherry picked from commit ea193ec)

# Conflicts:
#	frappe/model/db_query.py

* Revert "Revert "perf: cache fieldname extraction""

This reverts commit ffe84c9.

(cherry picked from commit 414b1be)

* fix: avoid parsing reserved keywords and simple strings

(cherry picked from commit 3facad0)

* fix: remove unnecessary dummy column

(cherry picked from commit cc4e628)

* fix: only trim tab if it starts with tab

(cherry picked from commit 5eca52b)

* refactor: duplicate check for *

(cherry picked from commit 0656742)

* test: add test for searching with paren

(cherry picked from commit fbaa254)

* ci: group output and limit diff

Verbose outut is MASSIVE and unreadable.

(cherry picked from commit 33547a6)

* fix: invalid select star expansions

(cherry picked from commit f642b18)

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
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)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 11, 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

3 participants