vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Deprecate setup help database APIs

Browse source 
APIs have been unused since ~v4/6? Don't see any need to keep them in.
This commit is contained in:
Gavin D'souza 2022-08-12 12:52:19 +05:30
parent a84a67482f
commit 91a47c2602
3 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frappe/database/__init__.py
View file

@ -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)

17
frappe/database/mariadb/setup_db.py
View file

@ -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)

9
frappe/database/postgres/setup_db.py
View file

@ -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: