Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/db/post_migrate/20230529183648_remove_temporary_billable_index.rb b/db/post_migrate/20230529183648_remove_temporary_billable_index.rb
new file mode 100644
index 00000000000..88940aad968
--- /dev/null
+++ b/db/post_migrate/20230529183648_remove_temporary_billable_index.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class RemoveTemporaryBillableIndex < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'migrate_index_users_for_active_billable_users'
+  def up
+    remove_concurrent_index_by_name :users, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :users, :id,
+      name: INDEX_NAME,
+      where: "((state)::text = 'active'::text) " \
+             "AND (user_type IS NULL OR user_type = 0 OR user_type = ANY (ARRAY[0, 6, 4, 13])) " \
+             "AND (user_type IS NULL OR user_type = 0 OR user_type = ANY (ARRAY[0, 4, 5]))"
+  end
+end