From b54a8458d5029b3494165b7430e21b3ae34ecc0c Mon Sep 17 00:00:00 2001 From: hellekin Date: Fri, 22 Jan 2021 05:32:15 +0100 Subject: Upgrade Rails and add StimulusJS support --- db/migrate/20210111142117_remove_agency_roles.rb | 5 +++ ..._create_active_storage_tables.active_storage.rb | 36 ++++++++++++++++ ..._name_to_active_storage_blobs.active_storage.rb | 18 ++++++++ ...ctive_storage_variant_records.active_storage.rb | 12 ++++++ db/schema.rb | 48 ++++++++++++++++++++-- 5 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20210111142117_remove_agency_roles.rb create mode 100644 db/migrate/20210121192037_create_active_storage_tables.active_storage.rb create mode 100644 db/migrate/20210121192038_add_service_name_to_active_storage_blobs.active_storage.rb create mode 100644 db/migrate/20210121192039_create_active_storage_variant_records.active_storage.rb (limited to 'db') diff --git a/db/migrate/20210111142117_remove_agency_roles.rb b/db/migrate/20210111142117_remove_agency_roles.rb new file mode 100644 index 0000000..5a4b37f --- /dev/null +++ b/db/migrate/20210111142117_remove_agency_roles.rb @@ -0,0 +1,5 @@ +class RemoveAgencyRoles < ActiveRecord::Migration[6.0] + def change + remove_column :agencies, :roles + end +end diff --git a/db/migrate/20210121192037_create_active_storage_tables.active_storage.rb b/db/migrate/20210121192037_create_active_storage_tables.active_storage.rb new file mode 100644 index 0000000..8779826 --- /dev/null +++ b/db/migrate/20210121192037_create_active_storage_tables.active_storage.rb @@ -0,0 +1,36 @@ +# This migration comes from active_storage (originally 20170806125915) +class CreateActiveStorageTables < ActiveRecord::Migration[5.2] + def change + create_table :active_storage_blobs do |t| + t.string :key, null: false + t.string :filename, null: false + t.string :content_type + t.text :metadata + t.string :service_name, null: false + t.bigint :byte_size, null: false + t.string :checksum, null: false + t.datetime :created_at, null: false + + t.index [ :key ], unique: true + end + + create_table :active_storage_attachments do |t| + t.string :name, null: false + t.references :record, null: false, polymorphic: true, index: false + t.references :blob, null: false + + t.datetime :created_at, null: false + + t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + + create_table :active_storage_variant_records do |t| + t.belongs_to :blob, null: false, index: false + t.string :variation_digest, null: false + + t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end +end diff --git a/db/migrate/20210121192038_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20210121192038_add_service_name_to_active_storage_blobs.active_storage.rb new file mode 100644 index 0000000..9967a13 --- /dev/null +++ b/db/migrate/20210121192038_add_service_name_to_active_storage_blobs.active_storage.rb @@ -0,0 +1,18 @@ +# This migration comes from active_storage (originally 20190112182829) +class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] + def up + unless column_exists?(:active_storage_blobs, :service_name) + add_column :active_storage_blobs, :service_name, :string + + if configured_service = ActiveStorage::Blob.service.name + ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) + end + + change_column :active_storage_blobs, :service_name, :string, null: false + end + end + + def down + remove_column :active_storage_blobs, :service_name + end +end diff --git a/db/migrate/20210121192039_create_active_storage_variant_records.active_storage.rb b/db/migrate/20210121192039_create_active_storage_variant_records.active_storage.rb new file mode 100644 index 0000000..a286269 --- /dev/null +++ b/db/migrate/20210121192039_create_active_storage_variant_records.active_storage.rb @@ -0,0 +1,12 @@ +# This migration comes from active_storage (originally 20191206030411) +class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] + def change + create_table :active_storage_variant_records do |t| + t.belongs_to :blob, null: false, index: false + t.string :variation_digest, null: false + + t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end +end diff --git a/db/schema.rb b/db/schema.rb index fa53f85..c97f290 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2,23 +2,50 @@ # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. # -# This file is the source Rails uses to define your schema when running `rails -# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to # be faster and is potentially less error prone than running all of your # migrations from scratch. Old migrations may fail to apply correctly if those # migrations use external dependencies or application code. # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_11_10_225447) do +ActiveRecord::Schema.define(version: 2021_01_21_192039) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "active_storage_attachments", force: :cascade do |t| + t.string "name", null: false + t.string "record_type", null: false + t.bigint "record_id", null: false + t.bigint "blob_id", null: false + t.datetime "created_at", null: false + t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true + end + + create_table "active_storage_blobs", force: :cascade do |t| + t.string "key", null: false + t.string "filename", null: false + t.string "content_type" + t.text "metadata" + t.bigint "byte_size", null: false + t.string "checksum", null: false + t.datetime "created_at", null: false + t.string "service_name", null: false + t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true + end + + create_table "active_storage_variant_records", force: :cascade do |t| + t.bigint "blob_id", null: false + t.string "variation_digest", null: false + t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true + end + create_table "agencies", force: :cascade do |t| t.bigint "agent_id", null: false t.bigint "user_id", null: false - t.integer "roles", limit: 2, default: 0, null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.index ["agent_id", "user_id"], name: "index_agencies_on_agent_id_and_user_id", unique: true @@ -55,6 +82,15 @@ ActiveRecord::Schema.define(version: 2020_11_10_225447) do t.bigint "section_id", null: false end + create_table "map_taxonomies", force: :cascade do |t| + t.bigint "map_id", null: false + t.bigint "taxonomy_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["map_id"], name: "index_map_taxonomies_on_map_id" + t.index ["taxonomy_id"], name: "index_map_taxonomies_on_taxonomy_id" + end + create_table "maps", force: :cascade do |t| t.uuid "uuid", null: false t.decimal "latitude", precision: 9, scale: 7 @@ -118,9 +154,13 @@ ActiveRecord::Schema.define(version: 2020_11_10_225447) do t.index ["external_id"], name: "index_users_on_external_id", unique: true end + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" + add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "agencies", "agents" add_foreign_key "agencies", "users" add_foreign_key "categories", "taxonomies" + add_foreign_key "map_taxonomies", "maps" + add_foreign_key "map_taxonomies", "taxonomies" add_foreign_key "maps", "taxonomies" add_foreign_key "resources", "agents" add_foreign_key "sections", "categories" -- cgit v1.2.3