From 17c43b4e1d2506e5b1498e52f3aa6c81277d67be Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 24 May 2019 12:06:39 +0530 Subject: [PATCH] fix(db_type) --- frappe/database/__init__.py | 8 ++++---- frappe/installer.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/database/__init__.py b/frappe/database/__init__.py index 3301784b5a..9d05223044 100644 --- a/frappe/database/__init__.py +++ b/frappe/database/__init__.py @@ -8,7 +8,7 @@ from __future__ import unicode_literals def setup_database(force, source_sql=None, verbose=None): import frappe - if frappe.db.db_type == 'postgres': + if frappe.conf.db_type == 'postgres': import frappe.database.postgres.setup_db return frappe.database.postgres.setup_db.setup_database(force, source_sql, verbose) else: @@ -17,7 +17,7 @@ def setup_database(force, source_sql=None, verbose=None): def drop_user_and_database(db_name, root_login=None, root_password=None): import frappe - if frappe.db.db_type == 'postgres': + if frappe.conf.db_type == 'postgres': pass else: import frappe.database.mariadb.setup_db @@ -25,7 +25,7 @@ def drop_user_and_database(db_name, root_login=None, root_password=None): def get_db(host=None, user=None, password=None, port=None): import frappe - if frappe.db.db_type == 'postgres': + if frappe.conf.db_type == 'postgres': import frappe.database.postgres.database return frappe.database.postgres.database.PostgresDatabase(host, user, password, port=port) else: @@ -34,7 +34,7 @@ def get_db(host=None, user=None, password=None, port=None): def setup_help_database(help_db_name): import frappe - if frappe.db.db_type == 'postgres': + 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: diff --git a/frappe/installer.py b/frappe/installer.py index c01cee269e..4c97ffd8fc 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -24,7 +24,7 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N db_type=None): if not db_type: - db_type = frappe.db.db_type or 'mariadb' + db_type = frappe.conf.db_type or 'mariadb' make_conf(db_name, site_config=site_config, db_type=db_type)