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.

Sign up for GitHub

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: fix the limit and offset issue #12

Merged
merged 2 commits into from
Sep 23, 2024
Merged

fix: fix the limit and offset issue #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29cbd08
fix: fix the limit and offset issue
VishvParikh Sep 16, 2024
39a693f
fix : fix the syntax of the item query sql
VishvParikh Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions erpnext/controllers/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
columns += ", " + ", ".join(extra_searchfields)

if "description" in searchfields:
columns += """, if(length(tabItem.description) > 40, \
concat(substr(tabItem.description, 1, 40), "..."), description) as description"""
columns += """, (case when length(`tabItem`.description) > 40 then concat(substring(`tabItem`.description from 1 for 40), '...') else`tabItem`.description end) as description"""

searchfields = searchfields + [
field
Expand Down Expand Up @@ -200,25 +199,25 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
description_cond = ""
if frappe.db.count(doctype, cache=True) < 50000:
# scan description only if items are less than 50000
description_cond = "or tabItem.description LIKE %(txt)s"
description_cond = "or `tabItem`.description LIKE %(txt)s"

return frappe.db.sql(
"""select
tabItem.name {columns}
from tabItem
where tabItem.docstatus < 2
and tabItem.disabled=0
and tabItem.has_variants=0
and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
and ({scond} or tabItem.item_code IN (select parent from `tabItem Barcode` where barcode LIKE %(txt)s)
`tabItem`.name {columns}
from `tabItem`
where `tabItem`.docstatus < 2
and `tabItem`.disabled=0
and `tabItem`.has_variants=0
and (`tabItem`.end_of_life > %(today)s or `tabItem`.end_of_life is null)
and ({scond} or `tabItem`.item_code IN (select parent from `tabItem Barcode` where barcode LIKE %(txt)s)
{description_cond})
{fcond} {mcond}
order by
if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
if(locate(%(_txt)s, item_name), locate(%(_txt)s, item_name), 99999),
(case when locate(%(_txt)s, name) > 0 then locate(%(_txt)s, name) else 99999 end),
(case when locate(%(_txt)s, item_name) > 0 then locate(%(_txt)s, item_name) else 99999 end),
idx desc,
name, item_name
limit %(start)s, %(page_len)s """.format(
limit %(page_len)s offset %(start)s""".format(
columns=columns,
scond=searchfields,
fcond=get_filters_cond(doctype, filters, conditions).replace("%", "%%"),
Expand Down
Loading