Backport the EE schema and migrations to CE
This backports all EE schema changes to CE, including EE migrations,
ensuring both use the same schema.
== Updated tests
A spec related to ghost and support bot users had to be modified to make
it pass. The spec in question assumes that the "support_bot" column
exists when defining the spec. In the single codebase setup this is not
the case, as the column is backported in a later migration. Any attempt
to use a different schema version or use of "around" blocks to
conditionally disable specs won't help, as reverting the backport
migration would also drop the "support_bot" column. Removing the
"support_bot" tests entirely appears to be the only solution.
We also need to update some foreign key tests now that we have
backported the EE columns. Fortunately, these changes are very minor.
== Backporting migrations
This commit moves EE specific migrations (except those for the Geo
tracking database) and related files to CE, and also removes any traces
of the ee/db directory.
Some migrations had to be modified or removed, as they no longer work
with the schema being backported. These migrations were all quite old,
so we opted for removing them where modifying them would take too much
time and effort.
Some old migrations were modified in EE, while also existing in CE. In
these cases we took the EE code, and in one case removed them entirely.
It's not worth spending time trying to merge these changes somehow as we
plan to remove old migrations around the release of 12.0, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
2019-04-29 12:16:03 +00:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
|
|
|
|
class RemoveUsersSupportType < ActiveRecord::Migration[5.1]
|
|
|
|
|
include Gitlab::Database::MigrationHelpers
|
|
|
|
|
|
|
|
|
|
DOWNTIME = false
|
|
|
|
|
|
|
|
|
|
INDEX_STATE_INTERNAL_ATTRS = 'index_users_on_state_and_internal_attrs'
|
|
|
|
|
|
|
|
|
|
disable_ddl_transaction!
|
|
|
|
|
|
|
|
|
|
def up
|
|
|
|
|
remove_concurrent_index :users, :state, name: INDEX_STATE_INTERNAL_ATTRS
|
|
|
|
|
remove_concurrent_index :users, :support_bot
|
|
|
|
|
|
|
|
|
|
remove_column :users, :support_bot
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def down
|
2020-03-30 15:07:51 +00:00
|
|
|
add_column :users, :support_bot, :boolean # rubocop:disable Migration/AddColumnsToWideTables
|
Backport the EE schema and migrations to CE
This backports all EE schema changes to CE, including EE migrations,
ensuring both use the same schema.
== Updated tests
A spec related to ghost and support bot users had to be modified to make
it pass. The spec in question assumes that the "support_bot" column
exists when defining the spec. In the single codebase setup this is not
the case, as the column is backported in a later migration. Any attempt
to use a different schema version or use of "around" blocks to
conditionally disable specs won't help, as reverting the backport
migration would also drop the "support_bot" column. Removing the
"support_bot" tests entirely appears to be the only solution.
We also need to update some foreign key tests now that we have
backported the EE columns. Fortunately, these changes are very minor.
== Backporting migrations
This commit moves EE specific migrations (except those for the Geo
tracking database) and related files to CE, and also removes any traces
of the ee/db directory.
Some migrations had to be modified or removed, as they no longer work
with the schema being backported. These migrations were all quite old,
so we opted for removing them where modifying them would take too much
time and effort.
Some old migrations were modified in EE, while also existing in CE. In
these cases we took the EE code, and in one case removed them entirely.
It's not worth spending time trying to merge these changes somehow as we
plan to remove old migrations around the release of 12.0, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
2019-04-29 12:16:03 +00:00
|
|
|
|
|
|
|
|
add_concurrent_index :users, :support_bot
|
|
|
|
|
add_concurrent_index :users, :state,
|
|
|
|
|
name: INDEX_STATE_INTERNAL_ATTRS,
|
|
|
|
|
where: 'ghost <> true AND support_bot <> true'
|
|
|
|
|
end
|
|
|
|
|
end
|