'commit'
This commit is contained in:
14
DbKit/Db.py
14
DbKit/Db.py
@@ -92,13 +92,21 @@ class Db:
|
||||
Args:
|
||||
db_url: 数据库连接URL,优先级高于初始化时提供的URL
|
||||
"""
|
||||
if self.engine:
|
||||
return
|
||||
|
||||
# 确定使用的数据库连接URL
|
||||
final_url = db_url or self.db_url
|
||||
if not final_url:
|
||||
# 如果没有提供URL,使用配置文件中的参数构建连接URL
|
||||
from Config import POSTGRES_HOST, POSTGRES_PORT, POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DATABASE
|
||||
# 转换为异步连接URL
|
||||
final_url = f"postgresql+asyncpg://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DATABASE}"
|
||||
try:
|
||||
from Config.Config import DB_URL
|
||||
final_url = DB_URL
|
||||
except ImportError:
|
||||
# 兼容旧配置或Postgres配置
|
||||
from Config.Config import POSTGRES_HOST, POSTGRES_PORT, POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DATABASE
|
||||
# 转换为异步连接URL
|
||||
final_url = f"postgresql+asyncpg://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DATABASE}"
|
||||
else:
|
||||
# 如果是同步URL,转换为异步URL
|
||||
if final_url.startswith("postgresql://"):
|
||||
|
||||
Reference in New Issue
Block a user