From cd0abf65a5d9204667172d9d64d2db1a4938a761 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 11 Jan 2023 14:54:38 +0000 Subject: [PATCH] db: migration to remove field --- ...ove_managing_organisation_id_from_schemes.rb | 12 ++++++++++++ db/schema.rb | 17 +++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20230111134640_remove_managing_organisation_id_from_schemes.rb diff --git a/db/migrate/20230111134640_remove_managing_organisation_id_from_schemes.rb b/db/migrate/20230111134640_remove_managing_organisation_id_from_schemes.rb new file mode 100644 index 000000000..097865aaf --- /dev/null +++ b/db/migrate/20230111134640_remove_managing_organisation_id_from_schemes.rb @@ -0,0 +1,12 @@ +class RemoveManagingOrganisationIdFromSchemes < ActiveRecord::Migration[7.0] + + def up + change_table :schemes, bulk: true do |t| + t.remove :managing_organisation_id + end + end + + def down + add_reference :schemes, :managing_organisation_id, foreign_key: { to_table: :organisations } + end +end diff --git a/db/schema.rb b/db/schema.rb index 31f16f79d..3c174df36 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_01_09_160738) do +ActiveRecord::Schema[7.0].define(version: 2023_01_11_134640) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -421,6 +421,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do t.string "relat5" t.string "relat6" t.integer "hb" + t.string "sex4" + t.string "sex5" + t.string "sex6" t.integer "savings_value_check" t.integer "deposit_value_check" t.integer "frombeds" @@ -457,20 +460,17 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do t.integer "hhregres" t.integer "hhregresstill" t.integer "proplen" + t.integer "mscharge_known" + t.decimal "mscharge", precision: 10, scale: 2 t.integer "prevten" t.integer "mortgageused" t.integer "wchair" t.integer "armedforcesspouse" - t.integer "mscharge_known" - t.decimal "mscharge", precision: 10, scale: 2 - t.string "sex4" - t.string "sex5" - t.string "sex6" - t.integer "mortlen" t.datetime "hodate", precision: nil t.integer "hoday" t.integer "homonth" t.integer "hoyear" + t.integer "mortlen" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" @@ -500,13 +500,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do t.string "intended_stay" t.datetime "end_date" t.integer "has_other_client_group" - t.bigint "managing_organisation_id" t.string "arrangement_type" t.string "old_id" t.string "old_visible_id" t.integer "total_units" t.boolean "confirmed" - t.index ["managing_organisation_id"], name: "index_schemes_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_schemes_on_owning_organisation_id" end @@ -571,7 +569,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do add_foreign_key "organisation_relationships", "organisations", column: "child_organisation_id" add_foreign_key "organisation_relationships", "organisations", column: "parent_organisation_id" add_foreign_key "sales_logs", "organisations", column: "owning_organisation_id", on_delete: :cascade - add_foreign_key "schemes", "organisations", column: "managing_organisation_id" add_foreign_key "schemes", "organisations", column: "owning_organisation_id", on_delete: :cascade add_foreign_key "users", "organisations", on_delete: :cascade end