From 91a47c26027f518aec06c5ec43b5081deda74f46 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 12 Aug 2022 12:52:19 +0530 Subject: [PATCH] fix: Deprecate setup help database APIs APIs have been unused since ~v4/6? Don't see any need to keep them in. --- frappe/database/__init__.py | 13 ------------- frappe/database/mariadb/setup_db.py | 17 ----------------- frappe/database/postgres/setup_db.py | 9 --------- 3 files changed, 39 deletions(-) diff --git a/frappe/database/__init__.py b/frappe/database/__init__.py index 423442d344..d1b7729fee 100644 --- a/frappe/database/__init__.py +++ b/frappe/database/__init__.py @@ -54,16 +54,3 @@ def get_db(host=None, user=None, password=None, port=None, read_only=False): return frappe.database.mariadb.database.MariaDBDatabase( host, user, password, port=port, read_only=read_only ) - - -def setup_help_database(help_db_name): - import frappe - - if frappe.conf.db_type == "postgres": - import frappe.database.postgres.setup_db - - return frappe.database.postgres.setup_db.setup_help_database(help_db_name) - else: - import frappe.database.mariadb.setup_db - - return frappe.database.mariadb.setup_db.setup_help_database(help_db_name) diff --git a/frappe/database/mariadb/setup_db.py b/frappe/database/mariadb/setup_db.py index ef246712b1..392421bc7c 100644 --- a/frappe/database/mariadb/setup_db.py +++ b/frappe/database/mariadb/setup_db.py @@ -63,23 +63,6 @@ def setup_database(force, source_sql, verbose, no_mariadb_socket=False): bootstrap_database(db_name, verbose, source_sql) -def setup_help_database(help_db_name): - dbman = DbManager(get_root_connection(frappe.flags.root_login, frappe.flags.root_password)) - dbman.drop_database(help_db_name) - - # make database - if not help_db_name in dbman.get_database_list(): - try: - dbman.create_user(help_db_name, help_db_name) - except Exception as e: - # user already exists - if e.args[0] != 1396: - raise - dbman.create_database(help_db_name) - dbman.grant_all_privileges(help_db_name, help_db_name) - dbman.flush_privileges() - - def drop_user_and_database(db_name, root_login, root_password): frappe.local.db = get_root_connection(root_login, root_password) dbman = DbManager(frappe.local.db) diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index 7eee8081c0..ff14510c9c 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -75,15 +75,6 @@ def import_db_from_sql(source_sql=None, verbose=False): ) -def setup_help_database(help_db_name): - root_conn = get_root_connection(frappe.flags.root_login, frappe.flags.root_password) - root_conn.sql(f"DROP DATABASE IF EXISTS `{help_db_name}`") - root_conn.sql(f"DROP USER IF EXISTS {help_db_name}") - root_conn.sql(f"CREATE DATABASE `{help_db_name}`") - root_conn.sql(f"CREATE user {help_db_name} password '{help_db_name}'") - root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(help_db_name)) - - def get_root_connection(root_login=None, root_password=None): if not frappe.local.flags.root_connection: if not root_login: