diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 18:08:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 18:08:13 +0300 |
commit | 0a353a9fa386ad60374daa9bad56f41bb5491c33 (patch) | |
tree | 7e51c83535577744e3daccdcd4017069a5d6bb7a /scripts | |
parent | 0c1344a7c19635e387e6f7af20591ad73f46ddff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/decomposition/generate-loose-foreign-key | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key index ad7d6e32aa0..1ea1728732b 100755 --- a/scripts/decomposition/generate-loose-foreign-key +++ b/scripts/decomposition/generate-loose-foreign-key @@ -110,15 +110,12 @@ def add_definition_to_yaml(definition) content = YAML.load_file(Rails.root.join('config/gitlab_loose_foreign_keys.yml')) table_definitions = content[definition.from_table] - # insert new entry at random place to avoid conflicts + # insert new entry in alphabetic order unless table_definitions table_definitions = [] - insert_idx = rand(content.count+1) - # insert at a given index in ordered hash - content = content.to_a - content.insert(insert_idx, [definition.from_table, table_definitions]) - content = content.to_h + content[definition.from_table] = table_definitions + content = content.sort.to_h end on_delete = @@ -217,7 +214,7 @@ def add_test_to_specs(definition) puts "Adding test to #{spec_path}..." spec_test = <<-EOF.strip_heredoc.indent(2) - context 'loose foreign key on #{definition.from_table}.#{definition.column}' do + context 'with loose foreign key on #{definition.from_table}.#{definition.column}' do it_behaves_like 'cleanup by a loose foreign key' do let!(:parent) { create(:#{definition.to_table.singularize}) } let!(:model) { create(:#{definition.from_table.singularize}, #{definition.column.delete_suffix("_id").singularize}: parent) } |