From c2ed5c284151a008378f8cc54196e4a101312c91 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 10 Feb 2022 14:09:15 -0600 Subject: [PATCH] uploads: make upload_media_assets.media_asset_id nullable. Make upload_media_assets.media_asset_id nullable in order to support multi-file uploads. The media asset will be null while the image is still being downloaded from the source. --- app/models/upload_media_asset.rb | 2 +- ...157_set_media_asset_to_nullable_on_upload_media_assets.rb | 5 +++++ db/structure.sql | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20220210200157_set_media_asset_to_nullable_on_upload_media_assets.rb diff --git a/app/models/upload_media_asset.rb b/app/models/upload_media_asset.rb index 3f78e1d4c..fc7d5bc03 100644 --- a/app/models/upload_media_asset.rb +++ b/app/models/upload_media_asset.rb @@ -2,7 +2,7 @@ class UploadMediaAsset < ApplicationRecord belongs_to :upload - belongs_to :media_asset + belongs_to :media_asset, optional: true enum status: { pending: 0, diff --git a/db/migrate/20220210200157_set_media_asset_to_nullable_on_upload_media_assets.rb b/db/migrate/20220210200157_set_media_asset_to_nullable_on_upload_media_assets.rb new file mode 100644 index 000000000..d0a7d74fc --- /dev/null +++ b/db/migrate/20220210200157_set_media_asset_to_nullable_on_upload_media_assets.rb @@ -0,0 +1,5 @@ +class SetMediaAssetToNullableOnUploadMediaAssets < ActiveRecord::Migration[7.0] + def change + change_column_null :upload_media_assets, :media_asset_id, true + end +end diff --git a/db/structure.sql b/db/structure.sql index ad313168e..572ad32b1 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1915,7 +1915,7 @@ CREATE TABLE public.upload_media_assets ( created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, upload_id bigint NOT NULL, - media_asset_id bigint NOT NULL, + media_asset_id bigint, status integer DEFAULT 0 NOT NULL, source_url character varying DEFAULT ''::character varying NOT NULL, error character varying @@ -5776,6 +5776,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220203040648'), ('20220204075610'), ('20220207195123'), -('20220210171310'); +('20220210171310'), +('20220210200157');