diff --git a/src/common/database/database.py b/src/common/database/old/database.py similarity index 100% rename from src/common/database/database.py rename to src/common/database/old/database.py diff --git a/src/common/database/db_batch_scheduler.py b/src/common/database/old/db_batch_scheduler.py similarity index 100% rename from src/common/database/db_batch_scheduler.py rename to src/common/database/old/db_batch_scheduler.py diff --git a/src/common/database/db_migration.py b/src/common/database/old/db_migration.py similarity index 100% rename from src/common/database/db_migration.py rename to src/common/database/old/db_migration.py diff --git a/src/common/database/sqlalchemy_database_api.py b/src/common/database/old/sqlalchemy_database_api.py similarity index 100% rename from src/common/database/sqlalchemy_database_api.py rename to src/common/database/old/sqlalchemy_database_api.py diff --git a/src/common/database/sqlalchemy_init.py b/src/common/database/old/sqlalchemy_init.py similarity index 100% rename from src/common/database/sqlalchemy_init.py rename to src/common/database/old/sqlalchemy_init.py diff --git a/src/common/database/sqlalchemy_models.py b/src/common/database/old/sqlalchemy_models.py similarity index 100% rename from src/common/database/sqlalchemy_models.py rename to src/common/database/old/sqlalchemy_models.py diff --git a/src/plugins/built_in/napcat_adapter_plugin/src/database.py b/src/plugins/built_in/napcat_adapter_plugin/src/database.py index 652f7100a..d3cc7e116 100644 --- a/src/plugins/built_in/napcat_adapter_plugin/src/database.py +++ b/src/plugins/built_in/napcat_adapter_plugin/src/database.py @@ -18,7 +18,8 @@ from typing import List, Optional, Sequence from sqlalchemy import BigInteger, Column, Index, Integer, UniqueConstraint, select from sqlalchemy.ext.asyncio import AsyncSession -from src.common.database.sqlalchemy_models import Base, get_db_session +from src.common.database.core.models import Base +from src.common.database.core import get_db_session from src.common.logger import get_logger logger = get_logger("napcat_adapter") diff --git a/src/schedule/database.py b/src/schedule/database.py index 72c017c82..ef281976c 100644 --- a/src/schedule/database.py +++ b/src/schedule/database.py @@ -3,7 +3,8 @@ from sqlalchemy import delete, func, select, update -from src.common.database.sqlalchemy_models import MonthlyPlan, get_db_session +from src.common.database.core.models import MonthlyPlan +from src.common.database.core import get_db_session from src.common.logger import get_logger from src.config.config import global_config