Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ruoyi-fastapi-backend/alembic/env.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import asyncio
import os
from collections.abc import Iterable
from collections.abc import Iterable, MutableMapping
from logging.config import fileConfig
from typing import Literal

from alembic import context
from alembic.migration import MigrationContext
Expand Down Expand Up @@ -64,6 +65,15 @@ def run_migrations_offline() -> None:


def do_run_migrations(connection: Connection) -> None:
def include_name(
name: str | None,
type_: Literal['schema', 'table', 'column', 'index', 'unique_constraint', 'foreign_key_constraint'],
parent_names: MutableMapping[Literal['schema_name', 'table_name', 'schema_qualified_table_name'], str | None],
) -> bool:
if type_ == 'table':
return name in target_metadata.tables
return True

def process_revision_directives(
context: MigrationContext,
revision: str | Iterable[str | None] | Iterable[str],
Expand All @@ -87,6 +97,7 @@ def process_revision_directives(
compare_type=True,
compare_server_default=True,
transaction_per_migration=True,
include_name=include_name,
process_revision_directives=process_revision_directives,
)

Expand Down
22 changes: 1 addition & 21 deletions ruoyi-fastapi-backend/module_admin/entity/do/job_do.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
from datetime import datetime

from sqlalchemy import CHAR, DOUBLE, BigInteger, Column, DateTime, Float, Index, LargeBinary, String, Unicode
from sqlalchemy import CHAR, BigInteger, Column, DateTime, String

from config.database import Base
from config.env import DataBaseConfig
from utils.common_util import SqlalchemyUtil


class SysJob(Base):
Expand Down Expand Up @@ -58,21 +56,3 @@ class SysJobLog(Base):
status = Column(CHAR(1), nullable=True, server_default='0', comment='执行状态(0正常 1失败)')
exception_info = Column(String(2000), nullable=True, server_default="''", comment='异常信息')
create_time = Column(DateTime, nullable=True, default=datetime.now(), comment='创建时间')


class ApschedulerJobs(Base):
"""
定时任务调度任务表
"""

__tablename__ = 'apscheduler_jobs'

id = Column(Unicode(191), primary_key=True, nullable=False)
next_run_time = Column(
DOUBLE if DataBaseConfig.db_type == 'mysql' else Float(25),
nullable=True,
server_default=SqlalchemyUtil.get_server_default_null(DataBaseConfig.db_type, False),
)
job_state = Column(LargeBinary, nullable=False)

idx_sys_logininfor_s = Index('ix_apscheduler_jobs_next_run_time', next_run_time)