From 1c94cec17ea933bb6477df09e24d8b5be6ca15d1 Mon Sep 17 00:00:00 2001 From: Ted Date: Mon, 11 Jul 2022 14:57:19 +0100 Subject: [PATCH] removed dependent: :destroy from organisation.rb --- app/models/organisation.rb | 4 ++-- db/schema.rb | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/models/organisation.rb b/app/models/organisation.rb index f27f0019b..d06393fe9 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -1,7 +1,7 @@ class Organisation < ApplicationRecord has_many :users, dependent: :destroy - has_many :owned_case_logs, class_name: "CaseLog", foreign_key: "owning_organisation_id", dependent: :destroy - has_many :managed_case_logs, class_name: "CaseLog", foreign_key: "managing_organisation_id", dependent: :destroy + has_many :owned_case_logs, class_name: "CaseLog", foreign_key: "owning_organisation_id" + has_many :managed_case_logs, class_name: "CaseLog", foreign_key: "managing_organisation_id" has_many :data_protection_confirmations has_many :organisation_rent_periods has_many :owned_schemes, class_name: "Scheme", foreign_key: "stock_owning_organisation_id", dependent: :destroy diff --git a/db/schema.rb b/db/schema.rb index 62044426f..4c0b5d775 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: 2022_07_04_135746) do +ActiveRecord::Schema[7.0].define(version: 2022_07_07_133909) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -191,19 +191,21 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_04_135746) do t.integer "joint" t.bigint "created_by_id" t.integer "illness_type_0" - t.integer "retirement_value_check" t.integer "tshortfall_known" t.integer "sheltered" + t.integer "retirement_value_check" t.integer "pregnancy_value_check" t.integer "hhtype" t.integer "new_old" t.integer "vacdays" t.bigint "scheme_id" t.bigint "location_id" + t.bigint "organisations_id" t.index ["created_by_id"], name: "index_case_logs_on_created_by_id" t.index ["location_id"], name: "index_case_logs_on_location_id" t.index ["managing_organisation_id"], name: "index_case_logs_on_managing_organisation_id" t.index ["old_id"], name: "index_case_logs_on_old_id", unique: true + t.index ["organisations_id"], name: "index_case_logs_on_organisations_id" t.index ["owning_organisation_id"], name: "index_case_logs_on_owning_organisation_id" t.index ["scheme_id"], name: "index_case_logs_on_scheme_id" end @@ -253,7 +255,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_04_135746) do create_table "logs_exports", force: :cascade do |t| t.datetime "created_at", default: -> { "CURRENT_TIMESTAMP" } - t.datetime "started_at", null: false + t.datetime "started_at", precision: nil, null: false t.integer "base_number", default: 1, null: false t.integer "increment_number", default: 1, null: false t.boolean "empty_export", default: false, null: false @@ -352,10 +354,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_04_135746) do t.datetime "confirmed_at", precision: nil t.datetime "confirmation_sent_at", precision: nil t.string "unconfirmed_email" + t.bigint "organisations_id" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true t.index ["encrypted_otp_secret_key"], name: "index_users_on_encrypted_otp_secret_key", unique: true t.index ["organisation_id"], name: "index_users_on_organisation_id" + t.index ["organisations_id"], name: "index_users_on_organisations_id" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true end @@ -371,8 +375,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_07_04_135746) do end add_foreign_key "case_logs", "locations" + add_foreign_key "case_logs", "organisations", column: "organisations_id" add_foreign_key "case_logs", "schemes" add_foreign_key "locations", "schemes" add_foreign_key "schemes", "organisations" add_foreign_key "schemes", "organisations", column: "stock_owning_organisation_id" + add_foreign_key "users", "organisations", column: "organisations_id" end