From 7228937213a4fd78744defd17a5fdf5a41a2a165 Mon Sep 17 00:00:00 2001 From: compwron Date: Mon, 5 Feb 2024 23:35:20 -0800 Subject: [PATCH] make bin/setup run without error --- .../20230729145310_add_reference_learning_hour_types.rb | 3 ++- db/schema.rb | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/migrate/20230729145310_add_reference_learning_hour_types.rb b/db/migrate/20230729145310_add_reference_learning_hour_types.rb index 0805cebb83..c6ef20f01b 100644 --- a/db/migrate/20230729145310_add_reference_learning_hour_types.rb +++ b/db/migrate/20230729145310_add_reference_learning_hour_types.rb @@ -2,6 +2,7 @@ class AddReferenceLearningHourTypes < ActiveRecord::Migration[7.0] disable_ddl_transaction! def change - add_reference :learning_hours, :learning_hour_type, validate: false, index: {algorithm: :concurrently} + # add_reference :learning_hours, :learning_hour_type, validate: false, index: {algorithm: :concurrently} + add_reference :learning_hours, :learning_hour_type, index: {algorithm: :concurrently} end end diff --git a/db/schema.rb b/db/schema.rb index 53af7a751b..8dbade45f9 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_11_25_150721) do +ActiveRecord::Schema[7.1].define(version: 2023_11_25_150721) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -395,7 +395,6 @@ create_table "learning_hours", force: :cascade do |t| t.bigint "user_id", null: false - t.integer "learning_type", default: 5 t.string "name", null: false t.integer "duration_minutes", null: false t.integer "duration_hours", null: false @@ -648,7 +647,7 @@ add_foreign_key "patch_notes", "patch_note_groups" add_foreign_key "patch_notes", "patch_note_types" add_foreign_key "placement_types", "casa_orgs" - add_foreign_key "placements", "casa_cases" + add_foreign_key "placements", "casa_cases", validate: false add_foreign_key "placements", "placement_types" add_foreign_key "placements", "users", column: "creator_id" add_foreign_key "preference_sets", "users"