a1ba7969e1
Adjust to use `ON CONFLICT` in a similar manner as the others
```
File "apps/frappe/frappe/model/rename_doc.py", line 192, in rename_doc
update_user_settings(old, new, link_fields)
~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
File "apps/frappe/frappe/model/rename_doc.py", line 276, in update_user_settings
sync_user_settings()
~~~~~~~~~~~~~~~~~~^^
File "apps/frappe/frappe/model/utils/user_settings.py", line 52, in sync_user_settings
frappe.db.multisql(
^^^^^^^^^^^^^^^^^^^
...<12 lines>...
as_dict=1,
File "apps/frappe/frappe/database/database.py", line 1416, in multisql
return self.sql(query, values, **kwargs)
~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
File "apps/frappe/frappe/database/sqlite/database.py", line 454, in sql
return super().sql(*args, **kwargs)
~~~~~~~~~~~^^^^^^^^^^^^^^^^^
File "apps/frappe/frappe/database/database.py", line 272, in sql
self.execute_query(query, values)
~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^
File "apps/frappe/frappe/database/sqlite/database.py", line 443, in execute_query
return self._cursor.execute(query, values or ())
~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^
sqlite3.ProgrammingError: Incorrect number of bindings supplied. The current statement uses 3, and there are 4 supplied.
```
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
108 lines
3.2 KiB
Python
108 lines
3.2 KiB
Python
# Settings saved per user basis
|
|
# such as page_limit, filters, last_view
|
|
|
|
import json
|
|
|
|
import frappe
|
|
from frappe import safe_decode
|
|
|
|
# dict for mapping the index and index type for the filters of different views
|
|
filter_dict = {"doctype": 0, "docfield": 1, "operator": 2, "value": 3}
|
|
|
|
|
|
def get_user_settings(doctype, for_update=False):
|
|
user_settings = frappe.cache.hget("_user_settings", f"{doctype}::{frappe.session.user}")
|
|
|
|
if user_settings is None:
|
|
user_settings = frappe.db.sql(
|
|
"""select data from `__UserSettings`
|
|
where `user`=%s and `doctype`=%s""",
|
|
(frappe.session.user, doctype),
|
|
)
|
|
user_settings = (user_settings and user_settings[0][0]) or "{}"
|
|
|
|
if not for_update:
|
|
update_user_settings(doctype, user_settings, True)
|
|
|
|
return user_settings or "{}"
|
|
|
|
|
|
def update_user_settings(doctype, user_settings, for_update=False):
|
|
"""update user settings in cache"""
|
|
|
|
if for_update:
|
|
current = json.loads(user_settings)
|
|
else:
|
|
current = json.loads(get_user_settings(doctype, for_update=True))
|
|
|
|
if isinstance(current, str):
|
|
# corrupt due to old code, remove this in a future release
|
|
current = {}
|
|
|
|
current.update(user_settings)
|
|
|
|
frappe.cache.hset("_user_settings", f"{doctype}::{frappe.session.user}", json.dumps(current))
|
|
|
|
|
|
def sync_user_settings():
|
|
"""Sync from cache to database (called asynchronously via the browser)"""
|
|
for key, data in frappe.cache.hgetall("_user_settings").items():
|
|
key = safe_decode(key)
|
|
doctype, user = key.split("::") # WTF?
|
|
frappe.db.multisql(
|
|
{
|
|
"mariadb": """INSERT INTO `__UserSettings`(`user`, `doctype`, `data`)
|
|
VALUES (%s, %s, %s)
|
|
ON DUPLICATE key UPDATE `data`=%s""",
|
|
"postgres": """INSERT INTO `__UserSettings` (`user`, `doctype`, `data`)
|
|
VALUES (%s, %s, %s)
|
|
ON CONFLICT ("user", "doctype") DO UPDATE SET `data`=%s""",
|
|
"sqlite": """INSERT INTO `__UserSettings` (`user`, `doctype`, `data`)
|
|
VALUES (%s, %s, %s)
|
|
ON CONFLICT (`user`, `doctype`) DO UPDATE SET `data`=%s""",
|
|
},
|
|
(user, doctype, data, data),
|
|
as_dict=1,
|
|
)
|
|
|
|
|
|
@frappe.whitelist()
|
|
def save(doctype, user_settings):
|
|
user_settings = json.loads(user_settings or "{}")
|
|
update_user_settings(doctype, user_settings)
|
|
return user_settings
|
|
|
|
|
|
@frappe.whitelist()
|
|
def get(doctype):
|
|
return get_user_settings(doctype)
|
|
|
|
|
|
def update_user_settings_data(
|
|
user_setting, fieldname, old, new, condition_fieldname=None, condition_values=None
|
|
):
|
|
data = user_setting.get("data")
|
|
if data:
|
|
update = False
|
|
data = json.loads(data)
|
|
for view in ["List", "Gantt", "Kanban", "Calendar", "Image", "Inbox", "Report"]:
|
|
view_settings = data.get(view)
|
|
if view_settings and view_settings.get("filters"):
|
|
view_filters = view_settings.get("filters")
|
|
for view_filter in view_filters:
|
|
if (
|
|
condition_fieldname
|
|
and view_filter[filter_dict[condition_fieldname]] != condition_values
|
|
):
|
|
continue
|
|
if view_filter[filter_dict[fieldname]] == old:
|
|
view_filter[filter_dict[fieldname]] = new
|
|
update = True
|
|
if update:
|
|
frappe.db.sql(
|
|
"update __UserSettings set data=%s where doctype=%s and user=%s",
|
|
(json.dumps(data), user_setting.doctype, user_setting.user),
|
|
)
|
|
|
|
# clear that user settings from the redis cache
|
|
frappe.cache.hset("_user_settings", f"{user_setting.doctype}::{user_setting.user}", None)
|