refactor: add in a fallback to use db name as db user name
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
parent
ed05acd3d0
commit
d1906b3c16
2 changed files with 3 additions and 4 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue