diff --git a/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/down.sql b/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/down.sql new file mode 100644 index 0000000000..cb8c228fd7 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/down.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN has_watermark BOOLEAN NOT NULL DEFAULT FALSE + AFTER checksum_sha2; diff --git a/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/up.sql b/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/up.sql new file mode 100644 index 0000000000..15b7dbb8c0 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0000_alter_media_files_drop_has_watermark/up.sql @@ -0,0 +1,10 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +-- NB: MySQL 8.0.29+ performs DROP COLUMN with ALGORITHM=INSTANT (metadata-only). +-- On older versions this is an INPLACE table rebuild that still permits +-- concurrent reads and writes. No ALGORITHM clause so the server picks the +-- best available. +ALTER TABLE media_files + DROP COLUMN has_watermark; diff --git a/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/down.sql b/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/down.sql new file mode 100644 index 0000000000..fcae17743e --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/down.sql @@ -0,0 +1,10 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN is_in_aws BOOLEAN NOT NULL DEFAULT FALSE + AFTER maybe_public_bucket_extension; + +ALTER TABLE media_files + ADD INDEX index_is_in_aws (is_in_aws); diff --git a/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/up.sql b/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/up.sql new file mode 100644 index 0000000000..1b99d53329 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0001_alter_media_files_drop_is_in_aws/up.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + DROP INDEX index_is_in_aws, + DROP COLUMN is_in_aws; diff --git a/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/down.sql b/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/down.sql new file mode 100644 index 0000000000..2e6edd45a4 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/down.sql @@ -0,0 +1,9 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +-- NB: anchored to maybe_public_bucket_extension (not is_in_aws) so this works +-- whether or not the is_in_aws drop migration has been reverted yet. +ALTER TABLE media_files + ADD COLUMN is_not_in_gcp BOOLEAN NOT NULL DEFAULT FALSE + AFTER maybe_public_bucket_extension; diff --git a/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/up.sql b/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/up.sql new file mode 100644 index 0000000000..7f04a4b2e8 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0002_alter_media_files_drop_is_not_in_gcp/up.sql @@ -0,0 +1,6 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + DROP COLUMN is_not_in_gcp; diff --git a/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/down.sql b/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/down.sql new file mode 100644 index 0000000000..198523d4da --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/down.sql @@ -0,0 +1,10 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN nsfw_status VARCHAR(32) NOT NULL DEFAULT 'unknown' + AFTER maybe_scene_source_media_file_token; + +ALTER TABLE media_files + ADD INDEX index_nsfw_status (nsfw_status); diff --git a/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/up.sql b/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/up.sql new file mode 100644 index 0000000000..13ce19f376 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014458-0003_alter_media_files_drop_nsfw_status/up.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + DROP INDEX index_nsfw_status, + DROP COLUMN nsfw_status; diff --git a/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/down.sql b/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/down.sql new file mode 100644 index 0000000000..a7e82689b9 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/down.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN is_batch_generated BOOLEAN NOT NULL DEFAULT FALSE + AFTER maybe_origin_filename; diff --git a/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/up.sql b/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/up.sql new file mode 100644 index 0000000000..510900a474 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014459-0000_alter_media_files_drop_is_batch_generated/up.sql @@ -0,0 +1,6 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + DROP COLUMN is_batch_generated; diff --git a/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/down.sql b/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/down.sql new file mode 100644 index 0000000000..124f0f4900 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/down.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN maybe_media_subtype VARCHAR(32) DEFAULT NULL + AFTER media_class; diff --git a/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/up.sql b/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/up.sql new file mode 100644 index 0000000000..c07856e5a3 --- /dev/null +++ b/_database/sql/migrations/2026-07-09-014459-0001_alter_media_files_drop_maybe_media_subtype/up.sql @@ -0,0 +1,6 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + DROP COLUMN maybe_media_subtype; diff --git a/_database/sql/migrations_squashed/media_files.sql b/_database/sql/migrations_squashed/media_files.sql index 24494d8637..eb9f995ce3 100644 --- a/_database/sql/migrations_squashed/media_files.sql +++ b/_database/sql/migrations_squashed/media_files.sql @@ -99,12 +99,6 @@ CREATE TABLE media_files ( -- The original filename of the media (if uploaded by a user) maybe_origin_filename VARCHAR(255) DEFAULT NULL, - -- TODO: Remove after `maybe_batch_token` gains use. - -- Whether this media file was generated as part of a batch - -- If so, we can look up the batch in a separate query/call to the `batch_generations` table. - -- We won't hold the batch token in this table since it'll be very sparsely populated. - is_batch_generated BOOLEAN NOT NULL DEFAULT FALSE, - -- If the media file is generated as part of a batch, this designates the batch. maybe_batch_token VARCHAR(32) DEFAULT NULL, @@ -138,9 +132,6 @@ CREATE TABLE media_files ( -- The token is a media file token. maybe_scene_source_media_file_token VARCHAR(32) DEFAULT NULL, - -- A flag for NSFW status. - nsfw_status VARCHAR(32) NOT NULL DEFAULT "unknown", - -- ========== MEDIA DETAILS ========== -- Type of media file: @@ -171,16 +162,6 @@ CREATE TABLE media_files ( -- * 'dimensional' for a variety of 3d types media_class VARCHAR(16) NOT NULL DEFAULT "unknown", - -- DEPRECATED / DO NOT USE. THIS FIELD IS NO LONGER RELEVANT. - -- A media file's possible subtype. Typically used for Storyteller Studio. - -- * 'mixamo' for mixamo animations (eg. for BVH, GLB, FBX, etc. files) - -- * 'mocap_net' for mocapnet animations (eg. for BVH files) - -- * 'scene' - -- * 'character' - -- * 'animation' - -- DO NOT USE THE `maybe_media_subtype` FIELD! - maybe_media_subtype VARCHAR(32) DEFAULT NULL, - -- The file's mime type. maybe_mime_type VARCHAR(32) DEFAULT NULL, @@ -227,10 +208,6 @@ CREATE TABLE media_files ( -- and produces different lengths output depending on the choice of algorithm. checksum_sha2 CHAR(64) NOT NULL, - -- Whether the image or video has a visible watermark. - -- If so, we may not need to add a watermark downstream in further processing steps. - has_watermark BOOLEAN NOT NULL DEFAULT FALSE, - -- Tracks the thumbnail algorithm/type used for this media file. -- NULL = no thumbnail generated yet. -- 1 = video thumbnail. @@ -259,13 +236,6 @@ CREATE TABLE media_files ( -- `[{maybe_public_bucket_prefix}]{public_bucket_directory_hash}[{maybe_public_bucket_extension}]` maybe_public_bucket_extension VARCHAR(16) DEFAULT NULL, - -- This is a migration flag that denotes whether this media file is stored in AWS. - -- If not, it's stored in GCP. - is_in_aws BOOLEAN NOT NULL DEFAULT false, - - -- This is a migration flag that denotes that weight is not stored in GCP. - is_not_in_gcp BOOLEAN NOT NULL DEFAULT false, - -- NB: Removed, since this can be derived. -- The directory this media is uploaded to will be exclusive for this file. -- Only this given record will live in this bucket, but the directory may include @@ -351,13 +321,11 @@ CREATE TABLE media_files ( KEY index_is_user_upload (is_user_upload), KEY index_is_intermediate_system_file (is_intermediate_system_file), KEY index_maybe_scene_source_media_file_token (maybe_scene_source_media_file_token), - KEY index_nsfw_status (nsfw_status), KEY index_media_type (media_type), KEY index_media_class (media_class), KEY index_maybe_engine_category (maybe_engine_category), KEY fk_maybe_prompt_token (maybe_prompt_token), KEY index_checksum_sha2 (checksum_sha2), - KEY index_is_in_aws (is_in_aws), KEY fk_maybe_creator_user_token (maybe_creator_user_token), KEY fk_maybe_mod_user_token (maybe_mod_user_token), KEY index_creator_ip_address (creator_ip_address),