From 246f705c7342f15aadc5a5796c1c0af5fcf9511b Mon Sep 17 00:00:00 2001 From: Cindy Halim Date: Tue, 16 Jul 2024 15:32:16 -0400 Subject: [PATCH 1/2] Drop use_web_ide_extension_marketplace column --- ...move_use_web_ide_extension_marketplace_column.rb | 13 +++++++++++++ db/schema_migrations/20240716185821 | 1 + db/structure.sql | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 db/post_migrate/20240716185821_remove_use_web_ide_extension_marketplace_column.rb create mode 100644 db/schema_migrations/20240716185821 diff --git a/db/post_migrate/20240716185821_remove_use_web_ide_extension_marketplace_column.rb b/db/post_migrate/20240716185821_remove_use_web_ide_extension_marketplace_column.rb new file mode 100644 index 00000000000000..db0451c6900af1 --- /dev/null +++ b/db/post_migrate/20240716185821_remove_use_web_ide_extension_marketplace_column.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveUseWebIdeExtensionMarketplaceColumn < Gitlab::Database::Migration[2.2] + milestone '17.4' + + def up + remove_column :user_preferences, :use_web_ide_extension_marketplace + end + + def down + add_column :user_preferences, :use_web_ide_extension_marketplace, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20240716185821 b/db/schema_migrations/20240716185821 new file mode 100644 index 00000000000000..c8e9c459efa65d --- /dev/null +++ b/db/schema_migrations/20240716185821 @@ -0,0 +1 @@ +5df92567ec8e612679f2c4793ca1fd45b7019482ef1b950219ed11386353dd21 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index d73e1efba9df6c..d02a6d7dc58c48 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18873,10 +18873,9 @@ CREATE TABLE user_preferences ( keyboard_shortcuts_enabled boolean DEFAULT true NOT NULL, time_display_format smallint DEFAULT 0 NOT NULL, home_organization_id bigint, - use_web_ide_extension_marketplace boolean DEFAULT false NOT NULL, + extensions_marketplace_opt_in_status smallint DEFAULT 0 NOT NULL, early_access_program_participant boolean DEFAULT false NOT NULL, early_access_program_tracking boolean DEFAULT false NOT NULL, - extensions_marketplace_opt_in_status smallint DEFAULT 0 NOT NULL, organization_groups_projects_sort text, organization_groups_projects_display smallint DEFAULT 0 NOT NULL, CONSTRAINT check_1d670edc68 CHECK ((time_display_relative IS NOT NULL)), -- GitLab From 091266b8a094fe3494b66a90f7c66df9bda3e18b Mon Sep 17 00:00:00 2001 From: Cindy Halim Date: Thu, 1 Aug 2024 17:00:45 -0400 Subject: [PATCH 2/2] Update ordering of col in structure.sql --- db/structure.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/structure.sql b/db/structure.sql index d02a6d7dc58c48..bb3904ef03ae11 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18873,9 +18873,9 @@ CREATE TABLE user_preferences ( keyboard_shortcuts_enabled boolean DEFAULT true NOT NULL, time_display_format smallint DEFAULT 0 NOT NULL, home_organization_id bigint, - extensions_marketplace_opt_in_status smallint DEFAULT 0 NOT NULL, early_access_program_participant boolean DEFAULT false NOT NULL, early_access_program_tracking boolean DEFAULT false NOT NULL, + extensions_marketplace_opt_in_status smallint DEFAULT 0 NOT NULL, organization_groups_projects_sort text, organization_groups_projects_display smallint DEFAULT 0 NOT NULL, CONSTRAINT check_1d670edc68 CHECK ((time_display_relative IS NOT NULL)), -- GitLab