chore(backend,infra): resolve template update conflicts, import check knows the watcher and the api login
This commit is contained in:
1 parent
5fb8f8a534
commit
56146e4e8d
27 files changed
+27
-82
No files matched your search
@@ -16,13 +16,12 @@ if config.config_file_name is not None:
|
||||
target_metadata = SQLModel.metadata
|
||||
|
||||
|
||||
<<<<<<< before updating
|
||||
def _async_url() -> str:
|
||||
return env.db.connection_url.replace("postgresql://", "postgresql+asyncpg://", 1)
|
||||
=======
|
||||
|
||||
|
||||
def include_name(name: str | None, type_: str, _parents: object) -> bool:
|
||||
return not (type_ == "table" and name is not None and name.startswith("taskiq_"))
|
||||
>>>>>>> after updating
|
||||
|
||||
|
||||
def run_migrations_offline() -> None:
|
||||
@@ -37,17 +36,12 @@ def run_migrations_offline() -> None:
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
<<<<<<< before updating
|
||||
def _do_run_migrations(connection) -> None: # noqa: ANN001
|
||||
context.configure(connection=connection, target_metadata=target_metadata)
|
||||
=======
|
||||
def do_run_migrations(connection: Connection) -> None:
|
||||
context.configure(
|
||||
connection=connection,
|
||||
target_metadata=target_metadata,
|
||||
include_name=include_name,
|
||||
)
|
||||
>>>>>>> after updating
|
||||
with context.begin_transaction():
|
||||
context.run_migrations()
|
||||
|
||||
|
||||
Reference in new issue
Block a user