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

feat: Added support for table_field.fieldname and tests

Browse source
This commit is contained in:
Aradhya 2022-11-03 03:56:59 +05:30
parent 88d506864b
commit e1719fd30c
2 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
frappe/database/query.py
View file

@ -553,18 +553,14 @@ class Engine:
alias = None
if " as " in field:
field, alias = field.split(" as ")
self.fieldname, linked_fieldname = field.split(".")
linked_field = frappe.get_meta(doctype, cached=True).get_field(self.fieldname)
try:
self.linked_doctype = linked_field.options
except AttributeError:
return fields
field = f"`tab{self.linked_doctype}`.`{linked_fieldname}`"
if alias:
field = f"{field} as {alias}"
_fields.append(field)
fieldname, linked_fieldname = field.split(".")
linked_doctype = frappe.get_meta(doctype).get_field(fieldname).options
return _fields
field = f"`tab{linked_doctype}`.`{linked_fieldname}`"
if alias:
field = f"{field} {alias}"
_fields.append(field)
return _fields
def sanitize_fields(self, fields: str | list | tuple):
is_mariadb = frappe.db.db_type == "mariadb"
@ -584,11 +580,11 @@ class Engine:
return fields
def get_list_fields(self, fields: list) -> list:
def get_list_fields(self, table: str, fields: list) -> list:
updated_fields = []
if issubclass(type(fields), Criterion) or "*" in fields:
return fields
# fields = self.get_fieldnames_from_child_table(doctype=table, fields=fields)
fields = self.get_fieldnames_from_child_table(doctype=table, fields=fields)
for field in fields:
if not isinstance(field, Criterion) and field:
if " as " in field:
@ -616,7 +612,7 @@ class Engine:
fields = Field(fields).as_(reference)
return fields
def set_fields(self, fields, **kwargs) -> list:
def set_fields(self, table: str, fields, **kwargs) -> list:
fields = kwargs.get("pluck") if kwargs.get("pluck") else fields or "name"
fields = self.sanitize_fields(fields)
if isinstance(fields, list) and None in fields and Field not in fields:
@ -644,7 +640,7 @@ class Engine:
if is_str:
fields = self.get_string_fields(fields)
if not is_str and fields:
fields = self.get_list_fields(fields)
fields = self.get_list_fields(table, fields)
# Need to check instance again since fields modified.
if not isinstance(fields, (list, tuple, set)):
@ -707,8 +703,9 @@ class Engine:
fields = [_update_pypika_fields(field) for field in fields]
if len(self.tables) > 1:
parent_table = self.tables.pop(table)
for child_table in self.tables.values():
parent_table = self.tables[table]
child_tables = list(self.tables.values())[1:]
for child_table in child_tables:
criterion = self.join_child_tables(
criterion,
join_type=join_type,
@ -731,8 +728,8 @@ class Engine:
self.linked_doctype = None
self.fieldname = None
fields = self.set_fields(fields, **kwargs)
criterion = self.build_conditions(table, filters, **kwargs)
fields = self.set_fields(table, fields, **kwargs)
join_type = kwargs.get("join").replace(" ", "_") if kwargs.get("join") else "left_join"
criterion, fields = self.join(
criterion=criterion, fields=fields, table=table, join_type=join_type

21
frappe/tests/test_query.py
View file

@ -241,12 +241,8 @@ class TestQuery(FrappeTestCase):
"Note",
filters={"name": "Test Note Title"},
fields=["name", "`tabNote Seen By`.`user` as seen_by"],
).run(as_dict=1),
frappe.get_list(
"Note",
filters={"name": "Test Note Title"},
fields=["name", "`tabNote Seen By`.`user` as seen_by"],
),
).get_sql(),
"SELECT `tabNote`.`name`,`tabNote Seen By`.`user` seen_by FROM `tabNote` LEFT JOIN `tabNote Seen By` ON `tabNote Seen By`.`parent`=`tabNote`.`name` AND `tabNote Seen By`.`parenttype`='Note' WHERE `tabNote`.`name`='Test Note Title'",
)
self.assertEqual(
@ -254,12 +250,17 @@ class TestQuery(FrappeTestCase):
"Note",
filters={"name": "Test Note Title"},
fields=["name", "`tabNote Seen By`.`user` as seen_by", "`tabNote Seen By`.`idx` as idx"],
).run(as_dict=1),
frappe.get_list(
).get_sql(),
"SELECT `tabNote`.`name`,`tabNote Seen By`.`user` seen_by,`tabNote Seen By`.`idx` idx FROM `tabNote` LEFT JOIN `tabNote Seen By` ON `tabNote Seen By`.`parent`=`tabNote`.`name` AND `tabNote Seen By`.`parenttype`='Note' WHERE `tabNote`.`name`='Test Note Title'",
)
self.assertEqual(
frappe.qb.engine.get_query(
"Note",
filters={"name": "Test Note Title"},
fields=["name", "`tabNote Seen By`.`user` as seen_by", "`tabNote Seen By`.`idx` as idx"],
),
fields=["name", "seen_by.user as seen_by", "`tabNote Seen By`.`idx` as idx"],
).get_sql(),
"SELECT `tabNote`.`name`,`tabNote Seen By`.`user` seen_by,`tabNote Seen By`.`idx` idx FROM `tabNote` LEFT JOIN `tabNote Seen By` ON `tabNote Seen By`.`parent`=`tabNote`.`name` AND `tabNote Seen By`.`parenttype`='Note' WHERE `tabNote`.`name`='Test Note Title'",
)
@run_only_if(db_type_is.MARIADB)