vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: fixed join logic

Browse source
This commit is contained in:
Aradhya 2022-08-11 00:13:07 +05:30
parent 85d1e41738
commit 306e259847
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frappe/database/query.py
View file

@ -9,7 +9,7 @@ from pypika.dialects import MySQLQueryBuilder, PostgreSQLQueryBuilder
import frappe
from frappe import _
from frappe.database.utils import table_from_string
from frappe.database.utils import is_function_object, table_from_string
from frappe.model.db_query import get_timespan_date_range
from frappe.query_builder import Criterion, Field, Order, Table, functions
from frappe.query_builder.functions import Function, SqlFunctions
@ -499,7 +499,6 @@ class Engine:
try:
self.linked_doctype = linked_field.options
except AttributeError:
print("here")
return fields
field = f"`tab{self.linked_doctype}`.`{linked_fieldname}`"
if alias:
@ -590,7 +589,12 @@ class Engine:
join_query = False
if not isinstance(fields, Criterion):
for field in fields:
if ("tab" in str(field)) and (f"`tab{table}`" not in str(field)):
# Only perform this bit if foreign doctype in fields
if (
not is_function_object(field)
and ("tab" in str(field))
and (f"`tab{table}`" not in str(field))
):
join_table = table_from_string(str(field))
if self.fieldname:
criterion = criterion.left_join(join_table).on(
@ -604,9 +608,7 @@ class Engine:
if join_query:
for field in fields:
if not (
getattr(field, "__module__", None) == "pypika.functions" or isinstance(field, Function)
):
if not is_function_object(field):
field = field if isinstance(field, str) else field.get_sql()
if "tab" not in str(field):
fields[fields.index(field)] = getattr(frappe.qb.DocType(table), field)
@ -615,16 +617,6 @@ class Engine:
field.args[0] = getattr(frappe.qb.DocType(table), field.args[0].get_sql())
fields[fields.index(field)] = field
# if self.linked_doctype and self.fieldname and not join_query:
# for field in fields:
# if "tab" not in str(field):
# fields[fields.index(field)] = PseudoColumn(f"`tab{table}`.`{field.get_sql()}`")
# self.linked_doctype = frappe.qb.DocType(self.linked_doctype)
# criterion = criterion.left_join(self.linked_doctype).on(
# getattr(self.linked_doctype, "name") == getattr(frappe.qb.DocType(table), self.fieldname)
# )
# join_query = True
join = kwargs.get("join").replace(" ", "_") if kwargs.get("join") else "left_join"
if len(self.tables) > 1:

5
frappe/database/utils.py
View file

@ -7,6 +7,7 @@ from types import NoneType
import frappe
from frappe.query_builder.builder import MariaDB, Postgres
from frappe.query_builder.functions import Function
if typing.TYPE_CHECKING:
from frappe.query_builder import DocType
@ -30,6 +31,10 @@ def table_from_string(table: str) -> "DocType":
return frappe.qb.DocType(table_name=table_name)
def is_function_object(field: str) -> bool:
return getattr(field, "__module__", None) == "pypika.functions" or isinstance(field, Function)
class LazyString:
def _setup(self) -> None:
raise NotImplementedError