style: removed frappe.db.sql comments

This commit is contained in:
Aradhya-Tripathi 2021-07-28 13:48:01 +05:30
parent 538ef2168b
commit 84ff1d0af9
41 changed files with 18 additions and 195 deletions

View file

@ -44,6 +44,5 @@ def clear_activity_logs(days=None):
if not days:
days = 90
# frappe.db.delete("Activity Log", filters={"creation": ("<", ["NOW()", "-", f"INTERVAL {days} DAY"])})
frappe.db.sql("""delete from `tabActivity Log` where \
creation< (NOW() - INTERVAL '{0}' DAY)""".format(days))

View file

@ -32,10 +32,6 @@ def update_feed(doc, method=None):
"reference_name": name,
"link_doctype": feed.link_doctype
})
# frappe.db.sql("""delete from `tabActivity Log`
# where
# reference_doctype=%s and reference_name=%s
# and link_doctype=%s""", (doctype, name,feed.link_doctype))
frappe.get_doc({
"doctype": "Activity Log",
"reference_doctype": doctype,

View file

@ -35,7 +35,6 @@ class DomainSettings(Document):
def remove_role(role):
frappe.db.delete("Has Role", {"role": role})
# frappe.db.sql('delete from `tabHas Role` where role=%s', role)
frappe.set_value('Role', role, 'disabled', 1)
for domain in all_domains:

View file

@ -20,5 +20,4 @@ def set_old_logs_as_seen():
def clear_error_logs():
'''Flush all Error Logs'''
frappe.only_for('System Manager')
frappe.db.delete("Error Log")
# frappe.db.sql('''DELETE FROM `tabError Log`''')
frappe.db.delete("Error Log")

View file

@ -13,7 +13,6 @@ class LogSettings(Document):
self.clear_email_queue()
def clear_error_logs(self):
# frappe.db.delete("Error Log", {"creation": ("<", ["NOW()", "-", f"INTERVAL {self.clear_error_log_after} DAY"])})
frappe.db.sql(""" DELETE FROM `tabError Log`
WHERE `creation` < (NOW() - INTERVAL '{0}' DAY)
""".format(self.clear_error_log_after))

View file

@ -87,9 +87,6 @@ class TestReport(unittest.TestCase):
"parent": frappe.session.user,
"role": "Test Has Role"
})
# frappe.db.sql("""delete from `tabHas Role` where parent = %s
# and role = 'Test Has Role'""", frappe.session.user, auto_commit=1)
if not frappe.db.exists('Role', 'Test Has Role'):
role = frappe.get_doc({
'doctype': 'Role',

View file

@ -39,7 +39,6 @@ class Role(Document):
def remove_roles(self):
frappe.db.delete("Has Role", {"role": self.name})
# frappe.db.sql("delete from `tabHas Role` where role = %s", self.name)
frappe.clear_cache()
def on_update(self):

View file

@ -109,13 +109,10 @@ class ScheduledJobType(Document):
return 'long' if ('Long' in self.frequency) else 'default'
def on_trash(self):
frappe.db.delete("Scheduled Job Log", {
"scheduled_job_type": self.name
})
# frappe.db.sql('delete from `tabScheduled Job Log` where scheduled_job_type=%s', self.name)
@frappe.whitelist()
def execute_event(doc: str):
frappe.only_for("System Manager")

View file

@ -367,25 +367,15 @@ class User(Document):
frappe.local.login_manager.logout(user=self.name)
frappe.db.delete("ToDo", {"owner": self.name})
# frappe.db.sql("""DELETE FROM `tabToDo` WHERE `owner`=%s""", (self.name,))
frappe.db.sql("""UPDATE `tabToDo` SET `assigned_by`=NULL WHERE `assigned_by`=%s""",
(self.name,))
# delete events
frappe.db.delete("Event", {"owner": self.name, "event_type": "Private"})
# frappe.db.sql("""delete from `tabEvent` where owner=%s
# and event_type='Private'""", (self.name,))
# delete shares
frappe.db.delete("DocShare", {"user": self.name})
# frappe.db.sql("""delete from `tabDocShare` where user=%s""", self.name)
# delete messages
# frappe.db.delete("Communication", {
# "reference_doctype": "User",
# "communication_type": ("in", ("Chat", "Notification")),
# })
frappe.db.sql("""delete from `tabCommunication`
where communication_type in ('Chat', 'Notification')
and reference_doctype='User'

View file

@ -17,12 +17,6 @@ class TestUserPermission(unittest.TestCase):
"nested_doc_user@example.com"))
})
# frappe.db.sql("""DELETE FROM `tabUser Permission`
# WHERE `user` in (
# 'test_bulk_creation_update@example.com',
# 'test_user_perm1@example.com',
# 'nested_doc_user@example.com')""")
# frappe.delete_doc_if_exists("DocType", "Person")
frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabPerson`")
frappe.delete_doc_if_exists("DocType", "Doc A")
frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabDoc A`")

View file

@ -186,7 +186,6 @@ def clear_user_permissions(user, for_doctype):
"user": user,
"allow": for_doctype
})
# frappe.db.sql('DELETE FROM `tabUser Permission` WHERE `user`=%s AND `allow`=%s', (user, for_doctype))
frappe.clear_cache()
return total
@ -244,13 +243,6 @@ def remove_applicable(perm_applied_docs, user, doctype, docname):
"allow": doctype,
"for_value": docname
})
#
# frappe.db.sql("""DELETE FROM `tabUser Permission`
# WHERE `user`=%s
# AND `applicable_for`=%s
# AND `allow`=%s
# AND `for_value`=%s
# """, (user, applicable_for, doctype, docname))
def remove_apply_to_all(user, doctype, docname):
frappe.db.delete("User Permission", {
@ -259,12 +251,6 @@ def remove_apply_to_all(user, doctype, docname):
"allow": doctype,
"for_value": docname
})
# frappe.db.sql("""DELETE from `tabUser Permission`
# WHERE `user`=%s
# AND `apply_to_all_doctypes`=1
# AND `allow`=%s
# AND `for_value`=%s
# """,(user, doctype, docname))
def update_applicable(already_applied, to_apply, user, doctype, docname):
for applied in already_applied:
@ -276,10 +262,3 @@ def update_applicable(already_applied, to_apply, user, doctype, docname):
"allow": doctype,
"for_value": docname
})
# frappe.db.sql("""DELETE FROM `tabUser Permission`
# WHERE `user`=%s
# AND `applicable_for`=%s
# AND `allow`=%s
# AND `for_value`=%s
# """,(user, applied, doctype, docname))

View file

@ -92,14 +92,14 @@ def update(doctype, role, permlevel, ptype, value=None):
"""Update role permission params
Args:
doctype (str): Name of the DocType to update params for
role (str): Role to be updated for, eg "Website Manager".
permlevel (int): perm level the provided rule applies to
ptype (str): permission type, example "read", "delete", etc.
value (None, optional): value for ptype, None indicates False
doctype (str): Name of the DocType to update params for
role (str): Role to be updated for, eg "Website Manager".
permlevel (int): perm level the provided rule applies to
ptype (str): permission type, example "read", "delete", etc.
value (None, optional): value for ptype, None indicates False
Returns:
str: Refresh flag is permission is updated successfully
str: Refresh flag is permission is updated successfully
"""
frappe.only_for("System Manager")
out = update_permission_property(doctype, role, permlevel, ptype, value)
@ -114,7 +114,6 @@ def remove(doctype, role, permlevel):
frappe.db.delete("Custom DocPerm", {
"name": name
})
# frappe.db.sql('delete from `tabCustom DocPerm` where name=%s', name)
if not frappe.get_all('Custom DocPerm', dict(parent=doctype)):
frappe.throw(_('There must be atleast one permission rule.'), title=_('Cannot Remove'))

View file

@ -89,12 +89,6 @@ class CustomField(Document):
"doc_type": self.dt,
"field_name": self.fieldname
})
# frappe.db.sql("""\
# DELETE FROM `tabProperty Setter`
# WHERE doc_type = %s
# AND field_name = %s""",
# (self.dt, self.fieldname))
frappe.clear_cache(doctype=self.dt)
def validate_insert_after(self, meta):

View file

@ -24,9 +24,7 @@ class CustomizeForm(Document):
"doctype": "Customize Form"
})
frappe.db.delete("Customize Form Field")
# frappe.db.sql("delete from tabSingles where doctype='Customize Form'")
# frappe.db.sql("delete from `tabCustomize Form Field`")
@frappe.whitelist()
def fetch_to_customize(self):
self.clear_existing_doc()

View file

@ -128,11 +128,6 @@ def set_default(key, value, parent, parenttype="__default"):
"defkey": key,
"parent": parent
})
# frappe.db.sql("""
# delete from
# `tabDefaultValue`
# where
# defkey=%s and parent=%s""", (key, parent))
if value != None:
add_default(key, value, parent)
else:

View file

@ -65,7 +65,6 @@ class TestDashboardChart(unittest.TestCase):
frappe.delete_doc('Dashboard Chart', 'Test Empty Dashboard Chart')
frappe.db.delete("Error Log")
# frappe.db.sql('delete from `tabError Log`')
frappe.get_doc(dict(
doctype = 'Dashboard Chart',
@ -96,7 +95,6 @@ class TestDashboardChart(unittest.TestCase):
frappe.delete_doc('Dashboard Chart', 'Test Empty Dashboard Chart 2')
frappe.db.delete("Error Log")
# frappe.db.sql('delete from `tabError Log`')
# create one data point
frappe.get_doc(dict(doctype = 'Error Log', creation = '2018-06-01 00:00:00')).insert()

View file

@ -200,7 +200,6 @@ def set_desktop_icons(visible_list, ignore_duplicate=True):
frappe.db.delete("Desktop Icon", {
"standard": 0
})
# frappe.db.sql('delete from `tabDesktop Icon` where standard=0')
# set standard as blocked and hidden if setting first active domain
if not frappe.flags.keep_desktop_icons:

View file

@ -341,11 +341,9 @@ def delete_events(ref_type, ref_name, delete_event=False):
frappe.db.delete("Event", {
"name": participation.parent
})
# frappe.db.sql("DELETE FROM `tabEvent` WHERE `name` = %(name)s", {'name': participation.parent})
frappe.db.delete("Event Participants", {
"name": participation.name
})
# frappe.db.sql("DELETE FROM `tabEvent Participants ` WHERE `name` = %(name)s", {'name': participation.name})
# Close events if ends_on or repeat_till is less than now_datetime
def set_status_of_events():

View file

@ -35,13 +35,4 @@ def flush_old_route_records():
frappe.db.delete("Route History", {
"modified": last_record_to_keep[0].modified,
"user": user
})
# frappe.db.sql('''
# DELETE
# FROM `tabRoute History`
# WHERE `modified` <= %(modified)s and `user`=%(modified)s
# ''', {
# "modified": last_record_to_keep[0].modified,
# "user": user
# })
})

View file

@ -127,7 +127,6 @@ def delete_tags_for_document(doc):
"document_type": doc.doctype,
"document_name": doc.name
})
# frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s""", (doc.doctype, doc.name))
def update_tags(doc, tags):
"""
@ -170,7 +169,6 @@ def delete_tag_for_document(dt, dn, tag):
"document_name": dn,
"tag": tag
})
# frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s AND tag=%s""", (dt, dn, tag))
@frappe.whitelist()
def get_documents_for_tag(tag):

View file

@ -44,12 +44,6 @@ class ToDo(Document):
"link_doctype": self.doctype,
"link_name": self.name
})
# frappe.db.sql("""
# delete from `tabCommunication Link`
# where link_doctype=%(doctype)s and link_name=%(name)s""", {
# "doctype": self.doctype, "name": self.name
# })
self.update_in_reference()
def add_assign_comment(self, text, comment_type):

View file

@ -12,6 +12,4 @@ class UnhandledEmail(Document):
def remove_old_unhandled_emails():
frappe.db.delete("Unhandled Email", {
"creation": ("<", frappe.utils.add_days(frappe.utils.nowdate(), -30))
})
# frappe.db.sql("""DELETE FROM `tabUnhandled Email`
# WHERE creation < %s""", frappe.utils.add_days(frappe.utils.nowdate(), -30))
})

View file

@ -156,11 +156,6 @@ def delete_fields(args_dict, delete=0):
"parent": dt,
"fieldname": ("in", fields)
})
# frappe.db.sql("""
# DELETE FROM `tabDocField`
# WHERE parent='%s' AND fieldname IN (%s)
# """ % (dt, ", ".join(["'{}'".format(f) for f in fields])))
# Delete the data/column only if delete is specified
if not delete:
continue
@ -170,10 +165,6 @@ def delete_fields(args_dict, delete=0):
"doctype": dt,
"field": ("in", fields)
})
# frappe.db.sql("""
# DELETE FROM `tabSingles`
# WHERE doctype='%s' AND field IN (%s)
# """ % (dt, ", ".join("'{}'".format(f) for f in fields)))
else:
existing_fields = frappe.db.multisql({
"mariadb": "DESC `tab%s`" % dt,

View file

@ -82,14 +82,6 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
frappe.db.delete("__global_search", {
"doctype": name
})
# frappe.db.sql("delete from `tabCustom Field` where dt = %s", name)
# frappe.db.sql("delete from `tabClient Script` where dt = %s", name)
# frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", name)
# frappe.db.sql("delete from `tabReport` where ref_doctype=%s", name)
# frappe.db.sql("delete from `tabCustom DocPerm` where parent=%s", name)
# frappe.db.sql("delete from `__global_search` where doctype=%s", name)
delete_from_table(doctype, name, ignore_doctypes, None)
if frappe.conf.developer_mode and not doc.custom and not (
@ -183,13 +175,10 @@ def delete_from_table(doctype, name, ignore_doctypes, doc):
frappe.db.delete("Singles", {
"doctype": name
})
# frappe.db.sql("delete from `tabSingles` where `doctype`=%s", name)
else:
frappe.db.delete(doctype, {
"name": name
})
# frappe.db.sql("delete from `tab{0}` where `name`=%s".format(doctype), name)
# get child tables
if doc:
tables = [d.options for d in doc.meta.get_table_fields()]
@ -367,9 +356,7 @@ def clear_timeline_references(link_doctype, link_name):
"link_doctype": link_doctype,
"link_name": link_name
})
# frappe.db.sql("""DELETE FROM `tabCommunication Link`
# WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name))
def insert_feed(doc):
if (
frappe.flags.in_install

View file

@ -395,11 +395,6 @@ class Document(BaseDocument):
"parenttype": self.doctype,
"parentfield": fieldname
})
# frappe.db.sql("""delete from `tab{0}` where parent=%s
# and parenttype=%s and parentfield=%s""".format(df.options),
# (self.name, self.doctype, fieldname))
def get_doc_before_save(self):
return getattr(self, '_doc_before_save', None)
@ -460,7 +455,6 @@ class Document(BaseDocument):
frappe.db.delete("Singles", {
"doctype": self.doctype
})
# frappe.db.sql("""delete from `tabSingles` where doctype=%s""", self.doctype)
for field, value in d.items():
if field != "doctype":
frappe.db.sql("""insert into `tabSingles` (doctype, field, value)

View file

@ -31,8 +31,6 @@ def execute():
frappe.db.delete("Property Setter", {
"name": prop.name
})
# frappe.db.sql('DELETE FROM `tabProperty Setter` WHERE `name`=%s', prop.name)
meta = frappe.get_meta(doctype.name)
for df in meta.fields:
@ -56,6 +54,4 @@ def execute():
frappe.db.delete("Custom Field", {
"name": cf.name
})
# frappe.db.sql('DELETE FROM `tabCustom Field` WHERE name=%s', cf.name)
meta.save()

View file

@ -19,5 +19,4 @@ def execute():
frappe.db.delete("Singles", {
"doctype": "Stripe Settings"
})
# frappe.db.sql("""DELETE FROM tabSingles WHERE doctype='Stripe Settings'""")
})

View file

@ -4,8 +4,4 @@ import frappe
def execute():
frappe.db.delete("DocType", {
"name": "Feedback Request"
})
# frappe.db.sql('''
#DELETE from `tabDocType`
#WHERE name = 'Feedback Request'
# ''')
})

View file

@ -10,9 +10,4 @@ def execute():
frappe.db.delete("Property Setter", {
"property": "read_only_onload"
})
# frappe.db.sql('''
# DELETE from `tabProperty Setter`
# WHERE property = 'read_only_onload'
# ''')
})

View file

@ -15,9 +15,6 @@ def execute():
frappe.db.delete("Series", {
"name": row.name
})
# frappe.db.sql('delete from `tabSeries` where name = %(key)s', {
# 'key': row.name
# })
if row.current:
frappe.db.sql('insert into `tabSeries`(`name`, `current`) values (%(name)s, %(current)s)', row)
frappe.db.commit()

View file

@ -31,5 +31,4 @@ def execute():
# clean up
frappe.db.delete("Communication", {
"communication_type": "Comment"
})
# frappe.db.sql("delete from `tabCommunication` where communication_type = 'Comment'")
})

View file

@ -15,9 +15,8 @@ def execute():
frappe.db.delete("Singles", {
"doctype": "Twilio Settings"
})
# frappe.db.sql("delete from `tabSingles` where `doctype`=%s", 'Twilio Settings')
def twilio_settings_doctype_in_integrations() -> bool:
"""Check Twilio Settings doctype exists in integrations module or not.
"""
return frappe.db.exists("DocType", {'name': 'Twilio Settings', 'module': 'Integrations'})
return frappe.db.exists("DocType", {'name': 'Twilio Settings', 'module': 'Integrations'})

View file

@ -520,8 +520,6 @@ def reset_perms(doctype):
delete_notification_count_for(doctype)
frappe.db.delete("Custom DocPerm", {"parent": doctype})
# frappe.db.sql("""delete from `tabCustom DocPerm` where parent=%s""", doctype)
def get_linked_doctypes(dt):
return list(set([dt] + [d.options for d in
frappe.get_meta(dt).get("fields", {

View file

@ -84,7 +84,6 @@ def delete_session(sid=None, user=None, reason="Session Expired"):
logout_feed(user, reason)
frappe.db.delete("Sessions", {"sid": sid})
# frappe.db.sql("""delete from tabSessions where sid=%s""", sid)
frappe.db.commit()
def clear_all_sessions(reason=None):

View file

@ -177,8 +177,6 @@ def collect_error_snapshots():
def clear_old_snapshots():
"""Clear snapshots that are older than a month"""
# frappe.db.delete("Error Snapshot", filters={"creation": ("<", ["NOW()", "-", f"INTERVAL '1' MONTH"])})
frappe.db.sql("""delete from `tabError Snapshot`
where creation < (NOW() - INTERVAL '1' MONTH)""")

View file

@ -24,8 +24,6 @@ def reset():
:return:
"""
frappe.db.delete("__global_search")
# frappe.db.sql('DELETE FROM `__global_search`')
def get_doctypes_with_global_search(with_child_tables=True):
"""
@ -150,10 +148,6 @@ def delete_global_search_records_for_doctype(doctype):
frappe.db.delete("__global_search", {
"doctype": doctype
})
# frappe.db.sql('''DELETE
# FROM `__global_search`
# WHERE doctype = %s''', doctype, as_dict=True)
def get_selected_fields(meta, global_search_fields):
fieldnames = [df.fieldname for df in global_search_fields]
@ -403,18 +397,11 @@ def delete_for_document(doc):
been deleted
:param doc: Deleted document
"""
frappe.db.delete("__global_search", {
"doctype": doc.doctype,
"name": doc.name
})
# frappe.db.sql('''DELETE
# FROM `__global_search`
# WHERE doctype = %s
# AND name = %s''', (doc.doctype, doc.name), as_dict=True)
@frappe.whitelist()
def search(text, start=0, limit=20, doctype=""):
"""

View file

@ -113,8 +113,6 @@ def before_tests():
frappe.db.delete("Custom Field")
frappe.db.delete("Event")
# frappe.db.sql("delete from `tabCustom Field`")
# frappe.db.sql("delete from `tabEvent`")
frappe.db.commit()
frappe.clear_cache()

View file

@ -71,11 +71,6 @@ def remove_encrypted_password(doctype, name, fieldname='password'):
"fieldname": fieldname
})
# frappe.db.sql(
# 'DELETE FROM `__Auth` WHERE doctype = %s and name = %s and fieldname = %s',
# values=[doctype, name, fieldname]
# )
def check_password(user, pwd, doctype='User', fieldname='password', delete_tracker_cache=True):
'''Checks if user and password are correct, else raises frappe.AuthenticationError'''
@ -140,8 +135,6 @@ def delete_all_passwords_for(doctype, name):
"doctype": doctype,
"name": name
})
# frappe.db.sql("""delete from `__Auth` where `doctype`=%(doctype)s and `name`=%(name)s""",
# { 'doctype': doctype, 'name': name })
except Exception as e:
if not frappe.db.is_missing_column(e):
raise

View file

@ -15,5 +15,4 @@ def clear_custom_fields(doctype):
frappe.db.delete("Custom Field", {
"dt": doctype
})
# frappe.db.sql('delete from `tabCustom Field` where dt=%s', doctype)
frappe.clear_cache(doctype=doctype)

View file

@ -323,11 +323,6 @@ class PersonalDataDeletionRequest(Document):
def remove_unverified_record():
# frappe.db.delete("Personal Data Deletion Request", {
# "status": "Pending Verification",
# "creation": ("<", ["Now()", "-", "INTERVAL 7 DAY"])
# })
frappe.db.sql(
"""
DELETE FROM `tabPersonal Data Deletion Request`

View file

@ -139,10 +139,7 @@ def clear_old_workflow_actions(doc, user=None):
"user": ("!=", user),
"status": "Open"
})
# frappe.db.sql("""DELETE FROM `tabWorkflow Action`
# WHERE `reference_doctype`=%s AND `reference_name`=%s AND `user`!=%s AND `status`='Open'""",
# (doc.get('doctype'), doc.get('name'), user))
def update_completed_workflow_actions(doc, user=None):
user = user if user else frappe.session.user
frappe.db.sql("""UPDATE `tabWorkflow Action` SET `status`='Completed', `completed_by`=%s
@ -263,10 +260,6 @@ def clear_workflow_actions(doctype, name):
"reference_doctype": doctype,
"reference_name": name
})
# frappe.db.sql('''delete from `tabWorkflow Action`
# where reference_doctype=%s and reference_name=%s''',
# (doctype, name))
def get_doc_workflow_state(doc):
workflow_name = get_workflow_name(doc.get('doctype'))
workflow_state_field = get_workflow_state_field(workflow_name)