fix: migration again

This commit is contained in:
bennykok 2024-01-26 11:58:16 +08:00
parent cc03c780e8
commit e95811474e
5 changed files with 268 additions and 1564 deletions

View File

@ -1,7 +0,0 @@
DO $$ BEGIN
CREATE TYPE "model_type" AS ENUM('checkpoint', 'lora', 'embedding', 'vae');
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."checkpoints" ADD COLUMN "model_type" "model_type" NOT NULL;

View File

@ -1,3 +1,9 @@
DO $$ BEGIN
CREATE TYPE "model_type" AS ENUM('checkpoint', 'lora', 'embedding', 'vae');
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."checkpoints" RENAME TO "models";--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."checkpoint_volume" RENAME TO "user_volume";--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."models" RENAME COLUMN "checkpoint_volume_id" TO "user_volume_id";--> statement-breakpoint
@ -7,7 +13,7 @@ ALTER TABLE "comfyui_deploy"."models" DROP CONSTRAINT "checkpoints_checkpoint_vo
--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."user_volume" DROP CONSTRAINT "checkpoint_volume_user_id_users_id_fk";
--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."models" ALTER COLUMN "model_type" SET DEFAULT 'checkpoint';--> statement-breakpoint
ALTER TABLE "comfyui_deploy"."models" ADD COLUMN "model_type" "model_type" DEFAULT 'checkpoint' NOT NULL;--> statement-breakpoint
DO $$ BEGIN
ALTER TABLE "comfyui_deploy"."models" ADD CONSTRAINT "models_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE no action ON UPDATE no action;
EXCEPTION

View File

@ -1,5 +1,5 @@
{
"id": "ca4e598d-4205-4e48-a5d2-4202d38a8b5c",
"id": "dd44755e-6a0d-4259-a920-c907b5edf078",
"prevId": "4bbd69a1-bb1f-467b-a6d8-8412142c4c32",
"version": "5",
"dialect": "pg",
@ -142,256 +142,6 @@
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"checkpoints": {
"name": "checkpoints",
"schema": "comfyui_deploy",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"org_id": {
"name": "org_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"checkpoint_volume_id": {
"name": "checkpoint_volume_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"model_name": {
"name": "model_name",
"type": "text",
"primaryKey": false,
"notNull": false
},
"folder_path": {
"name": "folder_path",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_id": {
"name": "civitai_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_version_id": {
"name": "civitai_version_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_url": {
"name": "civitai_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_download_url": {
"name": "civitai_download_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_model_response": {
"name": "civitai_model_response",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"hf_url": {
"name": "hf_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"s3_url": {
"name": "s3_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"client_url": {
"name": "client_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"is_public": {
"name": "is_public",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
},
"status": {
"name": "status",
"type": "resource_upload",
"primaryKey": false,
"notNull": true,
"default": "'started'"
},
"upload_machine_id": {
"name": "upload_machine_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"upload_type": {
"name": "upload_type",
"type": "model_upload_type",
"primaryKey": false,
"notNull": true
},
"model_type": {
"name": "model_type",
"type": "model_type",
"primaryKey": false,
"notNull": true
},
"error_log": {
"name": "error_log",
"type": "text",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {
"checkpoints_user_id_users_id_fk": {
"name": "checkpoints_user_id_users_id_fk",
"tableFrom": "checkpoints",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"checkpoints_checkpoint_volume_id_checkpoint_volume_id_fk": {
"name": "checkpoints_checkpoint_volume_id_checkpoint_volume_id_fk",
"tableFrom": "checkpoints",
"tableTo": "checkpoint_volume",
"columnsFrom": [
"checkpoint_volume_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"checkpoint_volume": {
"name": "checkpoint_volume",
"schema": "comfyui_deploy",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"org_id": {
"name": "org_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"volume_name": {
"name": "volume_name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"disabled": {
"name": "disabled",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
}
},
"indexes": {},
"foreignKeys": {
"checkpoint_volume_user_id_users_id_fk": {
"name": "checkpoint_volume_user_id_users_id_fk",
"tableFrom": "checkpoint_volume",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"deployments": {
"name": "deployments",
"schema": "comfyui_deploy",
@ -664,6 +414,187 @@
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"models": {
"name": "models",
"schema": "comfyui_deploy",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"org_id": {
"name": "org_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"user_volume_id": {
"name": "user_volume_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"model_name": {
"name": "model_name",
"type": "text",
"primaryKey": false,
"notNull": false
},
"folder_path": {
"name": "folder_path",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_id": {
"name": "civitai_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_version_id": {
"name": "civitai_version_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_url": {
"name": "civitai_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_download_url": {
"name": "civitai_download_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"civitai_model_response": {
"name": "civitai_model_response",
"type": "jsonb",
"primaryKey": false,
"notNull": false
},
"hf_url": {
"name": "hf_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"s3_url": {
"name": "s3_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"client_url": {
"name": "client_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"is_public": {
"name": "is_public",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
},
"status": {
"name": "status",
"type": "resource_upload",
"primaryKey": false,
"notNull": true,
"default": "'started'"
},
"upload_machine_id": {
"name": "upload_machine_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"upload_type": {
"name": "upload_type",
"type": "model_upload_type",
"primaryKey": false,
"notNull": true
},
"model_type": {
"name": "model_type",
"type": "model_type",
"primaryKey": false,
"notNull": true,
"default": "'checkpoint'"
},
"error_log": {
"name": "error_log",
"type": "text",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {
"models_user_id_users_id_fk": {
"name": "models_user_id_users_id_fk",
"tableFrom": "models",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"models_user_volume_id_user_volume_id_fk": {
"name": "models_user_volume_id_user_volume_id_fk",
"tableFrom": "models",
"tableTo": "user_volume",
"columnsFrom": [
"user_volume_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"subscription_status": {
"name": "subscription_status",
"schema": "comfyui_deploy",
@ -807,6 +738,76 @@
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"user_volume": {
"name": "user_volume",
"schema": "comfyui_deploy",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"org_id": {
"name": "org_id",
"type": "text",
"primaryKey": false,
"notNull": false
},
"volume_name": {
"name": "volume_name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"disabled": {
"name": "disabled",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
}
},
"indexes": {},
"foreignKeys": {
"user_volume_user_id_users_id_fk": {
"name": "user_volume_user_id_users_id_fk",
"tableFrom": "user_volume",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"users": {
"name": "users",
"schema": "comfyui_deploy",
@ -1282,7 +1283,12 @@
},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
"tables": {
"\"comfyui_deploy\".\"checkpoints\"": "\"comfyui_deploy\".\"models\"",
"\"comfyui_deploy\".\"checkpoint_volume\"": "\"comfyui_deploy\".\"user_volume\""
},
"columns": {
"\"comfyui_deploy\".\"models\".\"checkpoint_volume_id\"": "\"comfyui_deploy\".\"models\".\"user_volume_id\""
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -306,15 +306,8 @@
{
"idx": 43,
"version": "5",
"when": 1706225960550,
"tag": "0043_dapper_santa_claus",
"breakpoints": true
},
{
"idx": 44,
"version": "5",
"when": 1706240032837,
"tag": "0044_hot_wiccan",
"when": 1706241449348,
"tag": "0043_wealthy_nicolaos",
"breakpoints": true
}
]