From d1906b3c16ce382e9a33744d2d391fc396dde849 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Mon, 11 Dec 2023 12:46:15 +0530 Subject: [PATCH] refactor: add in a fallback to use db name as db user name Signed-off-by: Akhil Narang --- frappe/database/database.py | 4 ++-- frappe/installer.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 3f2c614b26..7d94b55b68 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -80,7 +80,7 @@ class Database: self.setup_type_map() self.host = host or frappe.conf.db_host self.port = port or frappe.conf.db_port - self.user = user or frappe.conf.db_user + self.user = user or frappe.conf.db_user or frappe.conf.db_name self.cur_db_name = frappe.conf.db_name self._conn = None @@ -583,7 +583,7 @@ class Database: """ out = None if cache and isinstance(filters, str) and ( - doctype, filters, fieldname) in self.value_cache: + doctype, filters, fieldname) in self.value_cache: return self.value_cache[(doctype, filters, fieldname)] if distinct: diff --git a/frappe/installer.py b/frappe/installer.py index 7dc6143799..2f7138cb48 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -585,8 +585,7 @@ def make_site_config( if db_port: site_config["db_port"] = db_port - if db_user: - site_config["db_user"] = db_user + site_config["db_user"] = db_user or db_name with open(site_file, "w") as f: f.write(json.dumps(site_config, indent=1, sort_keys=True))