From 13296f3955cbc8a4f695863357de6668148c9dc6 Mon Sep 17 00:00:00 2001 From: pabois <pierreandre.boissinot@noesya.coop> Date: Fri, 10 Mar 2023 16:21:48 +0100 Subject: [PATCH] schema --- db/schema.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 338a1b39f..040c76bc8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -214,7 +214,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_09_131421) do t.index ["communication_website_post_id", "communication_website_category_id"], name: "post_category" end -<<<<<<< HEAD create_table "communication_website_connections", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.uuid "university_id", null: false t.uuid "website_id", null: false @@ -231,9 +230,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_09_131421) do end create_table "communication_website_git_files", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| -======= - create_table "communication_website_git_files", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t| ->>>>>>> main t.string "previous_path" t.string "about_type", null: false t.uuid "about_id", null: false @@ -1033,6 +1029,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_09_131421) do add_foreign_key "communication_website_categories", "education_programs", column: "program_id" add_foreign_key "communication_website_categories", "languages" add_foreign_key "communication_website_categories", "universities" + add_foreign_key "communication_website_connections", "communication_websites", column: "website_id" + add_foreign_key "communication_website_connections", "universities" add_foreign_key "communication_website_git_files", "communication_websites", column: "website_id" add_foreign_key "communication_website_imported_authors", "communication_website_imported_websites", column: "website_id" add_foreign_key "communication_website_imported_authors", "universities" -- GitLab