🐛 fix: allow rewrite all argument

Author: ProgramRipper

nonebot_plugin_orm/__init__.py

@@ -100,7 +100,10 @@ def _init_orm():
     _init_engines()
     _init_table()
     _session_factory = sa_async.async_sessionmaker(
-        _engines[""], binds=_binds, **plugin_config.sqlalchemy_session_options
+        **{
+            **dict(bind=_engines[""], binds=_binds),
+            **plugin_config.sqlalchemy_session_options,
+        }
     )
 
 

nonebot_plugin_orm/config.py

@@ -26,7 +26,7 @@ class Config(BaseModel, arbitrary_types_allowed=True):
     alembic_version_locations: Union[
         str, os.PathLike, Dict[str, os.PathLike], None
     ] = None
-    alembic_context: Dict[str, Any] = {"render_as_batch": True}
+    alembic_context: Dict[str, Any] = {}
     alembic_startup_check: bool = True
 
 

nonebot_plugin_orm/migrate.py

@@ -107,15 +107,19 @@ def __init__(
             stdout,
             cmd_opts,
             {
-                "script_location": script_location,
-                "prepend_sys_path": ".",
-                "revision_environment": "true",
-                "version_path_separator": "os",
+                **{
+                    "script_location": script_location,
+                    "prepend_sys_path": ".",
+                    "revision_environment": "true",
+                    "version_path_separator": "os",
+                },
                 **config_args,
             },
             {
-                "engines": _engines,
-                "metadatas": _metadatas,
+                **{
+                    "engines": _engines,
+                    "metadatas": _metadatas,
+                },
                 **attributes,
             },
         )

nonebot_plugin_orm/templates/generic/env.py

@@ -35,11 +35,15 @@ def run_migrations_offline() -> None:
     """
 
     context.configure(
-        url=engine.url,
-        target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
-        **plugin_config.alembic_context,
+        **{
+            **dict(
+                url=engine.url,
+                dialect_opts={"paramstyle": "named"},
+                target_metadata=target_metadata,
+                literal_binds=True,
+            ),
+            **plugin_config.alembic_context,
+        }
     )
 
     with context.begin_transaction():
@@ -48,9 +52,15 @@ def run_migrations_offline() -> None:
 
 def do_run_migrations(connection: Connection) -> None:
     context.configure(
-        connection=connection,
-        target_metadata=target_metadata,
-        **plugin_config.alembic_context,
+        **{
+            **dict(
+                connection=connection,
+                render_as_batch=True,
+                target_metadata=target_metadata,
+                include_object=no_drop_table,
+            ),
+            **plugin_config.alembic_context,
+        }
     )
 
     with context.begin_transaction():

nonebot_plugin_orm/templates/multidb/env.py

@@ -53,12 +53,16 @@ def run_migrations_offline() -> None:
         file_ = f"{name}.sql"
         with open(file_, "w") as buffer:
             context.configure(
-                url=engine.url,
-                output_buffer=buffer,
-                target_metadata=target_metadatas["name"],
-                literal_binds=True,
-                dialect_opts={"paramstyle": "named"},
-                **plugin_config.alembic_context,
+                **{
+                    **dict(
+                        url=engine.url,
+                        dialect_opts={"paramstyle": "named"},
+                        output_buffer=buffer,
+                        target_metadata=target_metadatas["name"],
+                        literal_binds=True,
+                    ),
+                    **plugin_config.alembic_context,
+                }
             )
             with context.begin_transaction():
                 context.run_migrations(name=name)
@@ -78,12 +82,17 @@ def process_revision_directives(_, __, directives: list[MigrationScript]) -> Non
 
 def do_run_migrations(conn: Connection, name: str, metadata: MetaData) -> None:
     context.configure(
-        connection=conn,
-        upgrade_token=f"{name}_upgrades",
-        downgrade_token=f"{name}_downgrades",
-        target_metadata=metadata,
-        process_revision_directives=process_revision_directives,
-        **plugin_config.alembic_context,
+        **{
+            **dict(
+                connection=conn,
+                render_as_batch=True,
+                target_metadata=metadata,
+                include_object=no_drop_table,
+                upgrade_token=f"{name}_upgrades",
+                downgrade_token=f"{name}_downgrades",
+            ),
+            **plugin_config.alembic_context,
+        }
     )
     context.run_migrations(name=name)