From fb8565001f22eb7822491530d9c97d23fc9077df Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 13 Apr 2023 15:13:50 +0100 Subject: [PATCH] Update schema to have merge_request_organisations --- db/migrate/20230412111338_add_merge_requests_table.rb | 1 - db/migrate/20230413135407_add_merge_organisations.rb | 9 +++++++++ db/schema.rb | 10 ++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20230413135407_add_merge_organisations.rb diff --git a/db/migrate/20230412111338_add_merge_requests_table.rb b/db/migrate/20230412111338_add_merge_requests_table.rb index ee588b81e..79f68de80 100644 --- a/db/migrate/20230412111338_add_merge_requests_table.rb +++ b/db/migrate/20230412111338_add_merge_requests_table.rb @@ -2,7 +2,6 @@ class AddMergeRequestsTable < ActiveRecord::Migration[7.0] def change create_table :merge_requests do |t| t.integer :requesting_organisation_id - t.integer :merging_organisation_ids, array: true t.timestamps end end diff --git a/db/migrate/20230413135407_add_merge_organisations.rb b/db/migrate/20230413135407_add_merge_organisations.rb new file mode 100644 index 000000000..97178f973 --- /dev/null +++ b/db/migrate/20230413135407_add_merge_organisations.rb @@ -0,0 +1,9 @@ +class AddMergeOrganisations < ActiveRecord::Migration[7.0] + def change + create_table :merge_request_organisations do |t| + t.integer :merge_request_id, foreign_key: true + t.integer :merging_organisation_id, foreign_key: true + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 7113f240a..6c16aec2a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do +ActiveRecord::Schema[7.0].define(version: 2023_04_13_135407) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -354,9 +354,15 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do t.string "collection" end + create_table "merge_request_organisations", force: :cascade do |t| + t.integer "merge_request_id" + t.integer "merging_organisation_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "merge_requests", force: :cascade do |t| t.integer "requesting_organisation_id" - t.integer "merging_organisation_ids", array: true t.datetime "created_at", null: false t.datetime "updated_at", null: false end