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

fix(db_type)

Browse source
This commit is contained in:
Rushabh Mehta 2019-05-24 12:06:39 +05:30
parent 1c893e44c0
commit 17c43b4e1d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/database/__init__.py
View file

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

2
frappe/installer.py
View file

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