mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-23 10:03:36 +08:00
d6e6c3990a
- convert_metadata_to_rows returns [] for None values instead of an all-null row - Remove dead None branch from _scalar_to_row - Simplify null filter in common.py to just check for row absence - Add CHECK constraint ck_asset_reference_meta_has_value to model and migration 0003 Amp-Thread-ID: https://ampcode.com/threads/T-019cef4e-5240-7749-bb25-1f17fcf9c09c Co-authored-by: Amp <amp@ampcode.com>
91 lines
3.0 KiB
Python
91 lines
3.0 KiB
Python
"""
|
|
Add system_metadata and job_id columns to asset_references.
|
|
Change preview_id FK from assets.id to asset_references.id.
|
|
|
|
Revision ID: 0003_add_metadata_job_id
|
|
Revises: 0002_merge_to_asset_references
|
|
Create Date: 2026-03-09
|
|
"""
|
|
|
|
from alembic import op
|
|
import sqlalchemy as sa
|
|
|
|
from app.database.models import NAMING_CONVENTION
|
|
|
|
revision = "0003_add_metadata_job_id"
|
|
down_revision = "0002_merge_to_asset_references"
|
|
branch_labels = None
|
|
depends_on = None
|
|
|
|
|
|
def upgrade() -> None:
|
|
with op.batch_alter_table("asset_references") as batch_op:
|
|
batch_op.add_column(
|
|
sa.Column("system_metadata", sa.JSON(), nullable=True)
|
|
)
|
|
batch_op.add_column(
|
|
sa.Column("job_id", sa.String(length=36), nullable=True)
|
|
)
|
|
|
|
# Change preview_id FK from assets.id to asset_references.id (self-ref).
|
|
# Existing values are asset-content IDs that won't match reference IDs,
|
|
# so null them out first.
|
|
op.execute("UPDATE asset_references SET preview_id = NULL WHERE preview_id IS NOT NULL")
|
|
with op.batch_alter_table(
|
|
"asset_references", naming_convention=NAMING_CONVENTION
|
|
) as batch_op:
|
|
batch_op.drop_constraint(
|
|
"fk_asset_references_preview_id_assets", type_="foreignkey"
|
|
)
|
|
batch_op.create_foreign_key(
|
|
"fk_asset_references_preview_id_asset_references",
|
|
"asset_references",
|
|
["preview_id"],
|
|
["id"],
|
|
ondelete="SET NULL",
|
|
)
|
|
batch_op.create_index(
|
|
"ix_asset_references_preview_id", ["preview_id"]
|
|
)
|
|
|
|
# Purge any all-null meta rows before adding the constraint
|
|
op.execute(
|
|
"DELETE FROM asset_reference_meta"
|
|
" WHERE val_str IS NULL AND val_num IS NULL AND val_bool IS NULL AND val_json IS NULL"
|
|
)
|
|
with op.batch_alter_table(
|
|
"asset_reference_meta", naming_convention=NAMING_CONVENTION
|
|
) as batch_op:
|
|
batch_op.create_check_constraint(
|
|
"ck_asset_reference_meta_has_value",
|
|
"val_str IS NOT NULL OR val_num IS NOT NULL OR val_bool IS NOT NULL OR val_json IS NOT NULL",
|
|
)
|
|
|
|
|
|
def downgrade() -> None:
|
|
with op.batch_alter_table(
|
|
"asset_reference_meta", naming_convention=NAMING_CONVENTION
|
|
) as batch_op:
|
|
batch_op.drop_constraint(
|
|
"ck_asset_reference_meta_has_value", type_="check"
|
|
)
|
|
|
|
with op.batch_alter_table(
|
|
"asset_references", naming_convention=NAMING_CONVENTION
|
|
) as batch_op:
|
|
batch_op.drop_index("ix_asset_references_preview_id")
|
|
batch_op.drop_constraint(
|
|
"fk_asset_references_preview_id_asset_references", type_="foreignkey"
|
|
)
|
|
batch_op.create_foreign_key(
|
|
"fk_asset_references_preview_id_assets",
|
|
"assets",
|
|
["preview_id"],
|
|
["id"],
|
|
ondelete="SET NULL",
|
|
)
|
|
|
|
with op.batch_alter_table("asset_references") as batch_op:
|
|
batch_op.drop_column("job_id")
|
|
batch_op.drop_column("system_metadata")
|