Commit a52cbf6b authored by Stan Hu's avatar Stan Hu

Fix migration failure when groups are missing route

When a Group is missing a route, the migration failed previously with a
`Invalid single-table inheritance type` error. To fix this, we can
disable STI for the migration class because we don't need to know about
the type to do this migration. Besides, currently Group is the only type
used in the type column.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58714
parent 2ad5b30b
---
title: Fix migration failure when groups are missing route
merge_request: 29022
author:
type: fixed
...@@ -98,6 +98,7 @@ class GenerateMissingRoutes < ActiveRecord::Migration[4.2] ...@@ -98,6 +98,7 @@ class GenerateMissingRoutes < ActiveRecord::Migration[4.2]
class Namespace < ActiveRecord::Base class Namespace < ActiveRecord::Base
self.table_name = 'namespaces' self.table_name = 'namespaces'
self.inheritance_column = :_type_disabled
include EachBatch include EachBatch
include GenerateMissingRoutes::Routable include GenerateMissingRoutes::Routable
......
...@@ -8,7 +8,7 @@ describe GenerateMissingRoutes, :migration do ...@@ -8,7 +8,7 @@ describe GenerateMissingRoutes, :migration do
let(:routes) { table(:routes) } let(:routes) { table(:routes) }
it 'creates routes for projects without a route' do it 'creates routes for projects without a route' do
namespace = namespaces.create!(name: 'GitLab', path: 'gitlab') namespace = namespaces.create!(name: 'GitLab', path: 'gitlab', type: 'Group')
routes.create!( routes.create!(
path: 'gitlab', path: 'gitlab',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment