From ea7fbb2c10752db929fc038069884f92e0172533 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 8 Sep 2022 17:04:06 +0530 Subject: [PATCH] refactor: remove dead flag db.read_only This was added in last DB refactor but it does nothing, it was probably supposed to do something with the connection pool but to best of my knowledge "read only" is not a property of a connection. It can be achieved with users who only have read access, that however isn't implemented anywhere. Removing this for now. --- frappe/__init__.py | 4 +--- frappe/database/__init__.py | 10 +++------- frappe/database/database.py | 2 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 11f27e6930..a1e661dff0 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -285,9 +285,7 @@ def connect_replica(): user = local.conf.replica_db_name password = local.conf.replica_db_password - local.replica_db = get_db( - host=local.conf.replica_host, user=user, password=password, port=port, read_only=True - ) + local.replica_db = get_db(host=local.conf.replica_host, user=user, password=password, port=port) # swap db connections local.primary_db = local.db diff --git a/frappe/database/__init__.py b/frappe/database/__init__.py index d1b7729fee..76ad24b6e6 100644 --- a/frappe/database/__init__.py +++ b/frappe/database/__init__.py @@ -39,18 +39,14 @@ def drop_user_and_database(db_name, root_login=None, root_password=None): ) -def get_db(host=None, user=None, password=None, port=None, read_only=False): +def get_db(host=None, user=None, password=None, port=None): import frappe if frappe.conf.db_type == "postgres": import frappe.database.postgres.database - return frappe.database.postgres.database.PostgresDatabase( - host, user, password, port=port, read_only=read_only - ) + return frappe.database.postgres.database.PostgresDatabase(host, user, password, port=port) else: import frappe.database.mariadb.database - return frappe.database.mariadb.database.MariaDBDatabase( - host, user, password, port=port, read_only=read_only - ) + return frappe.database.mariadb.database.MariaDBDatabase(host, user, password, port=port) diff --git a/frappe/database/database.py b/frappe/database/database.py index 7324a08a26..9c4627e1a2 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -83,14 +83,12 @@ class Database: ac_name=None, use_default=0, port=None, - read_only=False, ): self.setup_type_map() self.host = host or frappe.conf.db_host or "127.0.0.1" self.port = port or frappe.conf.db_port or "" self.user = user or frappe.conf.db_name self.db_name = frappe.conf.db_name - self.read_only = read_only # Uses READ ONLY connection if set self._conn = None if ac_name: