Merge branch 'dev' of gitlab-devt.yced.com.cn:lei_y601/sqlbot_agent into dev
# Conflicts: # main_service.py # service/cus_vanna_srevice.py # util/load_ddl_doc.py
This commit is contained in:
		| @@ -1,5 +1,4 @@ | ||||
| from email.policy import default | ||||
| import dmPython | ||||
| import logging | ||||
|  | ||||
| from logging_config import LOGGING_CONFIG | ||||
| @@ -21,12 +20,15 @@ def connect_database(vn): | ||||
|                             port=int(config('MYSQL_DATABASE_PORT', default=3306)), | ||||
|                             user=config('MYSQL_DATABASE_USER', default=''), | ||||
|                             password=config('MYSQL_DATABASE_PASSWORD', default=''), | ||||
|                             dbname=config('MYSQL_DATABASE_DBNAME', default='')) | ||||
|                             database=config('MYSQL_DATABASE_DBNAME', default='')) | ||||
|     elif db_type == 'dameng': | ||||
|         vn.connect_to_dameng( ) | ||||
|     elif db_type == 'postgresql': | ||||
|         # 待补充 | ||||
|         pass | ||||
|         vn.connect_to_dameng( | ||||
|             host=config('DAMENG_DATABASE_HOST', default=''), | ||||
|             port=config('DAMENG_DATABASE_PORT', default=3306), | ||||
|             user=config('DAMENG_DATABASE_USER', default=''), | ||||
|             password=config('DAMENG_DATABASE_PASSWORD', default=''), | ||||
|         ) | ||||
|     else: | ||||
|         pass | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 yujj128
					yujj128